diff options
Diffstat (limited to 'modules')
50 files changed, 548 insertions, 681 deletions
diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am index fc2a562197..d84247a573 100644 --- a/modules/addressbook/Makefile.am +++ b/modules/addressbook/Makefile.am @@ -19,9 +19,9 @@ module_addressbook_la_CPPFLAGS = \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ $(CHAMPLAIN_CFLAGS) \ - $(GTKHTML_CFLAGS) \ $(LDAP_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) module_addressbook_la_SOURCES = \ evolution-module-addressbook.c \ @@ -64,8 +64,8 @@ module_addressbook_la_LIBADD = \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(CHAMPLAIN_LIBS) \ - $(GTKHTML_LIBS) \ - $(LDAP_LIBS) + $(LDAP_LIBS) \ + $(NULL) module_addressbook_la_LDFLAGS = \ diff --git a/modules/backup-restore/Makefile.am b/modules/backup-restore/Makefile.am index 98d130197f..9dffc4a3df 100644 --- a/modules/backup-restore/Makefile.am +++ b/modules/backup-restore/Makefile.am @@ -14,7 +14,6 @@ module_backup_restore_la_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) \ $(NULL) @@ -33,7 +32,6 @@ module_backup_restore_la_LIBADD = \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) \ $(NULL) module_backup_restore_la_LDFLAGS = \ @@ -53,7 +51,6 @@ evolution_backup_CPPFLAGS = \ -DDBUS_SERVICES_DIR=\"'${datadir}'/dbus-1/services\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ $(NULL) evolution_backup_SOURCES = \ @@ -64,7 +61,6 @@ evolution_backup_LDADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) \ $(NULL) if OS_WIN32 diff --git a/modules/backup-restore/evolution-backup-tool.c b/modules/backup-restore/evolution-backup-tool.c index 4b75f8a790..728b8f96f4 100644 --- a/modules/backup-restore/evolution-backup-tool.c +++ b/modules/backup-restore/evolution-backup-tool.c @@ -101,38 +101,6 @@ static GOptionEntry options[] = { static gboolean check (const gchar *filename, gboolean *is_new_format); -static GString * -replace_string (const gchar *text, - const gchar *find, - const gchar *replace) -{ - const gchar *p, *next; - GString *str; - gint find_len; - - g_return_val_if_fail (text != NULL, NULL); - g_return_val_if_fail (find != NULL, NULL); - g_return_val_if_fail (*find, NULL); - - find_len = strlen (find); - str = g_string_new (""); - - p = text; - while (next = strstr (p, find), next) { - if (p < next) - g_string_append_len (str, p, next - p); - - if (replace && *replace) - g_string_append (str, replace); - - p = next + find_len; - } - - g_string_append (str, p); - - return str; -} - static const gchar * strip_home_dir (const gchar *dir) { @@ -166,11 +134,11 @@ replace_variables (const gchar *str, strip_datadir = strip_home_dir (e_get_user_data_dir ()); strip_configdir = strip_home_dir (e_get_user_config_dir ()); - #define repl(_find, _replace) \ - use = replace_string (res ? res->str : str, _find, _replace); \ - g_return_val_if_fail (use != NULL, NULL); \ - if (res) \ - g_string_free (res, TRUE); \ + #define repl(_find, _replace) \ + use = e_str_replace_string (res ? res->str : str, _find, _replace); \ + g_return_val_if_fail (use != NULL, NULL); \ + if (res) \ + g_string_free (res, TRUE); \ res = use; repl ("$HOME", g_get_home_dir ()); @@ -223,7 +191,7 @@ replace_in_file (const gchar *filename, } if (g_file_get_contents (filename, &content, NULL, &error)) { - GString *str = replace_string (content, find, replace); + GString *str = e_str_replace_string (content, find, replace); if (str) { if (!g_file_set_contents (filename, str->str, -1, &error) && error) { diff --git a/modules/book-config-google/Makefile.am b/modules/book-config-google/Makefile.am index 0de66dc9b5..cdd75f74bb 100644 --- a/modules/book-config-google/Makefile.am +++ b/modules/book-config-google/Makefile.am @@ -6,8 +6,8 @@ module_book_config_google_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-book-config-google\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) module_book_config_google_la_SOURCES = \ evolution-book-config-google.c @@ -16,7 +16,7 @@ module_book_config_google_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) module_book_config_google_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) diff --git a/modules/book-config-ldap/Makefile.am b/modules/book-config-ldap/Makefile.am index aa2bdb8996..7f73e4ca16 100644 --- a/modules/book-config-ldap/Makefile.am +++ b/modules/book-config-ldap/Makefile.am @@ -6,9 +6,9 @@ module_book_config_ldap_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-book-config-ldap\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ $(LDAP_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) module_book_config_ldap_la_SOURCES = \ evolution-book-config-ldap.c \ @@ -19,8 +19,8 @@ module_book_config_ldap_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) \ - $(LDAP_LIBS) + $(LDAP_LIBS) \ + $(NULL) module_book_config_ldap_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) diff --git a/modules/book-config-local/Makefile.am b/modules/book-config-local/Makefile.am index 8c1d26b9ea..f7442bef80 100644 --- a/modules/book-config-local/Makefile.am +++ b/modules/book-config-local/Makefile.am @@ -6,8 +6,8 @@ module_book_config_local_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-book-config-local\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) module_book_config_local_la_SOURCES = \ evolution-book-config-local.c @@ -16,7 +16,7 @@ module_book_config_local_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) module_book_config_local_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) diff --git a/modules/book-config-webdav/Makefile.am b/modules/book-config-webdav/Makefile.am index 25a8f00624..7e95f6ffe1 100644 --- a/modules/book-config-webdav/Makefile.am +++ b/modules/book-config-webdav/Makefile.am @@ -6,8 +6,8 @@ module_book_config_webdav_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-book-config-webdav\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) module_book_config_webdav_la_SOURCES = \ evolution-book-config-webdav.c @@ -16,7 +16,7 @@ module_book_config_webdav_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) module_book_config_webdav_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) diff --git a/modules/cal-config-caldav/Makefile.am b/modules/cal-config-caldav/Makefile.am index 03126c434e..95ffc2a1b9 100644 --- a/modules/cal-config-caldav/Makefile.am +++ b/modules/cal-config-caldav/Makefile.am @@ -6,9 +6,9 @@ module_cal_config_caldav_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-cal-config-caldav\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ $(LIBSOUP_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) module_cal_config_caldav_la_SOURCES = \ evolution-cal-config-caldav.c \ @@ -21,8 +21,8 @@ module_cal_config_caldav_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) \ - $(LIBSOUP_LIBS) + $(LIBSOUP_LIBS) \ + $(NULL) module_cal_config_caldav_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) diff --git a/modules/cal-config-contacts/Makefile.am b/modules/cal-config-contacts/Makefile.am index 4a1e391f88..2c3cc4f908 100644 --- a/modules/cal-config-contacts/Makefile.am +++ b/modules/cal-config-contacts/Makefile.am @@ -6,8 +6,8 @@ module_cal_config_contacts_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-cal-config-contacts\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) module_cal_config_contacts_la_SOURCES = \ evolution-cal-config-contacts.c \ @@ -20,7 +20,7 @@ module_cal_config_contacts_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) module_cal_config_contacts_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) diff --git a/modules/cal-config-google/Makefile.am b/modules/cal-config-google/Makefile.am index 5ebdf56ff0..2f1a3defd6 100644 --- a/modules/cal-config-google/Makefile.am +++ b/modules/cal-config-google/Makefile.am @@ -6,9 +6,9 @@ module_cal_config_google_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-cal-config-google\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ $(GDATA_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) module_cal_config_google_la_SOURCES = \ evolution-cal-config-google.c \ @@ -23,8 +23,8 @@ module_cal_config_google_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) \ - $(GDATA_LIBS) + $(GDATA_LIBS) \ + $(NULL) module_cal_config_google_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) diff --git a/modules/cal-config-local/Makefile.am b/modules/cal-config-local/Makefile.am index 2d4d1a0f98..c503a02734 100644 --- a/modules/cal-config-local/Makefile.am +++ b/modules/cal-config-local/Makefile.am @@ -6,8 +6,8 @@ module_cal_config_local_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-cal-config-local\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) module_cal_config_local_la_SOURCES = \ evolution-cal-config-local.c \ @@ -18,7 +18,7 @@ module_cal_config_local_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) module_cal_config_local_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) diff --git a/modules/cal-config-weather/Makefile.am b/modules/cal-config-weather/Makefile.am index f1a22f0cd9..54c4850393 100644 --- a/modules/cal-config-weather/Makefile.am +++ b/modules/cal-config-weather/Makefile.am @@ -6,9 +6,9 @@ module_cal_config_weather_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-cal-config-weather\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ $(GWEATHER_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) module_cal_config_weather_la_SOURCES = \ evolution-cal-config-weather.c \ @@ -19,8 +19,8 @@ module_cal_config_weather_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) \ - $(GWEATHER_LIBS) + $(GWEATHER_LIBS) \ + $(NULL) module_cal_config_weather_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) diff --git a/modules/cal-config-webcal/Makefile.am b/modules/cal-config-webcal/Makefile.am index 43c0d25402..36cacf6c0e 100644 --- a/modules/cal-config-webcal/Makefile.am +++ b/modules/cal-config-webcal/Makefile.am @@ -6,8 +6,8 @@ module_cal_config_webcal_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-cal-config-webcal\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) module_cal_config_webcal_la_SOURCES = \ evolution-cal-config-webcal.c @@ -16,7 +16,7 @@ module_cal_config_webcal_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) module_cal_config_webcal_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am index 348da1beb7..ce02506534 100644 --- a/modules/calendar/Makefile.am +++ b/modules/calendar/Makefile.am @@ -9,8 +9,8 @@ module_calendar_la_CPPFLAGS = \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) module_calendar_la_SOURCES = \ evolution-module-calendar.c \ @@ -77,7 +77,7 @@ module_calendar_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) module_calendar_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) diff --git a/modules/composer-autosave/Makefile.am b/modules/composer-autosave/Makefile.am index a3c16be5eb..10cae2de7c 100644 --- a/modules/composer-autosave/Makefile.am +++ b/modules/composer-autosave/Makefile.am @@ -1,34 +1,29 @@ -NULL = - module_LTLIBRARIES = module-composer-autosave.la module_composer_autosave_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -I$(top_srcdir) \ - -DG_LOG_DOMAIN=\"evolution-composer-autosave\" \ - $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) \ + $(AM_CPPFLAGS) \ + -I$(top_srcdir) \ + -DG_LOG_DOMAIN=\"evolution-composer-autosave\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ $(NULL) module_composer_autosave_la_SOURCES = \ - evolution-composer-autosave.c \ - e-autosave-utils.c \ - e-autosave-utils.h \ - e-composer-autosave.c \ - e-composer-autosave.h \ - e-composer-registry.c \ - e-composer-registry.h \ - $(NULL) + evolution-composer-autosave.c \ + e-autosave-utils.c \ + e-autosave-utils.h \ + e-composer-autosave.c \ + e-composer-autosave.h \ + e-composer-registry.c \ + e-composer-registry.h module_composer_autosave_la_LIBADD = \ - $(top_builddir)/shell/libevolution-shell.la \ - $(top_builddir)/composer/libevolution-mail-composer.la \ - $(top_builddir)/e-util/libevolution-util.la \ - $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) \ + $(top_builddir)/shell/libevolution-shell.la \ + $(top_builddir)/composer/libevolution-mail-composer.la \ + $(top_builddir)/e-util/libevolution-util.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ $(NULL) module_composer_autosave_la_LDFLAGS = \ diff --git a/modules/composer-autosave/e-composer-autosave.c b/modules/composer-autosave/e-composer-autosave.c index 33d6c0203e..d75532c675 100644 --- a/modules/composer-autosave/e-composer-autosave.c +++ b/modules/composer-autosave/e-composer-autosave.c @@ -125,13 +125,15 @@ composer_autosave_timeout_cb (gpointer user_data) static void composer_autosave_changed_cb (EComposerAutosave *autosave) { - GtkhtmlEditor *editor; + EHTMLEditor *editor; + EHTMLEditorView *view; EExtensible *extensible; extensible = e_extension_get_extensible (E_EXTENSION (autosave)); - editor = GTKHTML_EDITOR (extensible); - autosave->priv->changed = gtkhtml_editor_get_changed (editor); + editor = e_msg_composer_get_editor (E_MSG_COMPOSER (extensible)); + view = e_html_editor_get_view (editor); + autosave->priv->changed = e_html_editor_view_get_changed (view); if (autosave->priv->changed && autosave->priv->timeout_id == 0) { autosave->priv->timeout_id = e_named_timeout_add_seconds ( @@ -164,6 +166,8 @@ composer_autosave_dispose (GObject *object) static void composer_autosave_constructed (GObject *object) { + EHTMLEditor *editor; + EHTMLEditorView *view; EExtensible *extensible; /* Chain up to parent's constructed() method. */ @@ -171,9 +175,11 @@ composer_autosave_constructed (GObject *object) constructed (object); extensible = e_extension_get_extensible (E_EXTENSION (object)); + editor = e_msg_composer_get_editor (E_MSG_COMPOSER (extensible)); + view = e_html_editor_get_view (editor); e_signal_connect_notify_swapped ( - extensible, "notify::changed", + view, "notify::changed", G_CALLBACK (composer_autosave_changed_cb), object); } diff --git a/modules/contact-photos/Makefile.am b/modules/contact-photos/Makefile.am index 100ed9a359..5f2b19dc92 100644 --- a/modules/contact-photos/Makefile.am +++ b/modules/contact-photos/Makefile.am @@ -6,7 +6,6 @@ module_contact_photos_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-contact-photos\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) \ $(NULL) @@ -22,7 +21,6 @@ module_contact_photos_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) \ $(NULL) module_contact_photos_la_LDFLAGS = \ diff --git a/modules/gravatar/Makefile.am b/modules/gravatar/Makefile.am index 874a403d29..4613ea995c 100644 --- a/modules/gravatar/Makefile.am +++ b/modules/gravatar/Makefile.am @@ -6,7 +6,6 @@ module_gravatar_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-gravatar\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) \ $(NULL) @@ -22,7 +21,6 @@ module_gravatar_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) \ $(NULL) module_gravatar_la_LDFLAGS = \ diff --git a/modules/itip-formatter/Makefile.am b/modules/itip-formatter/Makefile.am index 6d7e62ff39..2e1168bdd1 100644 --- a/modules/itip-formatter/Makefile.am +++ b/modules/itip-formatter/Makefile.am @@ -11,8 +11,8 @@ module_itip_formatter_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-module-itip-formatter\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) module_itip_formatter_la_SOURCES = \ e-conflict-search-selector.c \ @@ -38,7 +38,7 @@ module_itip_formatter_la_LIBADD = \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) module_itip_formatter_la_LDFLAGS = \ -avoid-version -module $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) diff --git a/modules/itip-formatter/itip-view.c b/modules/itip-formatter/itip-view.c index f19c418923..64d075e4fa 100644 --- a/modules/itip-formatter/itip-view.c +++ b/modules/itip-formatter/itip-view.c @@ -791,13 +791,7 @@ alarm_check_toggled_cb (WebKitDOMHTMLInputElement *check1, WebKitDOMElement *check2; gchar *id; -#if WEBKIT_CHECK_VERSION(2,2,0) /* XXX should really be (2,1,something) */ - id = webkit_dom_element_get_id ( - WEBKIT_DOM_ELEMENT (check1)); -#else - id = webkit_dom_html_element_get_id ( - WEBKIT_DOM_HTML_ELEMENT (check1)); -#endif + id = webkit_dom_element_get_id (WEBKIT_DOM_ELEMENT (check1)); if (g_strcmp0 (id, CHECKBOX_INHERIT_ALARM)) { check2 = webkit_dom_document_get_element_by_id ( @@ -906,11 +900,7 @@ append_info_item_row (ItipView *view, WEBKIT_DOM_HTML_TABLE_ELEMENT (table), -1, NULL); id = g_strdup_printf ("%s_row_%d", table_id, item->id); -#if WEBKIT_CHECK_VERSION(2,2,0) /* XXX should really be (2,1,something) */ webkit_dom_element_set_id (WEBKIT_DOM_ELEMENT (row), id); -#else - webkit_dom_html_element_set_id (row, id); -#endif g_free (id); switch (item->type) { @@ -932,7 +922,7 @@ append_info_item_row (ItipView *view, } cell = webkit_dom_html_table_row_element_insert_cell ( - (WebKitDOMHTMLTableRowElement *) row, -1, NULL); + WEBKIT_DOM_HTML_TABLE_ROW_ELEMENT (row), -1, NULL); if (icon_name) { WebKitDOMElement *image; @@ -953,7 +943,7 @@ append_info_item_row (ItipView *view, } cell = webkit_dom_html_table_row_element_insert_cell ( - (WebKitDOMHTMLTableRowElement *) row, -1, NULL); + WEBKIT_DOM_HTML_TABLE_ROW_ELEMENT (row), -1, NULL); webkit_dom_html_element_set_inner_html (cell, item->message, NULL); diff --git a/modules/itip-formatter/plugin/Makefile.am b/modules/itip-formatter/plugin/Makefile.am index ac23084824..30c75b83e3 100644 --- a/modules/itip-formatter/plugin/Makefile.am +++ b/modules/itip-formatter/plugin/Makefile.am @@ -10,8 +10,8 @@ liborg_gnome_itip_formatter_la_CPPFLAGS = \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) liborg_gnome_itip_formatter_la_SOURCES = \ config-ui.c \ @@ -30,7 +30,7 @@ liborg_gnome_itip_formatter_la_LIBADD = \ $(top_builddir)/em-format/libevolution-mail-formatter.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) BUILT_SOURCES = $(plugin_DATA) diff --git a/modules/mail-config/Makefile.am b/modules/mail-config/Makefile.am index 1a84b9e16e..c1d9eae2c0 100644 --- a/modules/mail-config/Makefile.am +++ b/modules/mail-config/Makefile.am @@ -8,7 +8,6 @@ module_mail_config_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-mail-config\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) \ $(NULL) @@ -32,7 +31,6 @@ module_mail_config_la_LIBADD = \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) \ $(NULL) module_mail_config_la_LDFLAGS = \ diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am index 595c35743a..770975efd7 100644 --- a/modules/mail/Makefile.am +++ b/modules/mail/Makefile.am @@ -9,8 +9,8 @@ module_mail_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-module-mail\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) module_mail_la_SOURCES = \ evolution-module-mail.c \ @@ -51,7 +51,7 @@ module_mail_la_LIBADD = \ $(libevolution_mail_settings_la) \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) module_mail_la_LDFLAGS = \ -avoid-version -module $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index e74086f204..321e1032e3 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -475,21 +475,26 @@ mail_shell_backend_window_added_cb (GtkApplication *application, EShell *shell = E_SHELL (application); EMailBackend *backend; EMailSession *session; + EHTMLEditor *editor = NULL; const gchar *backend_name; backend = E_MAIL_BACKEND (shell_backend); session = e_mail_backend_get_session (backend); + if (E_IS_MSG_COMPOSER (window)) + editor = e_msg_composer_get_editor (E_MSG_COMPOSER (window)); + + if (E_IS_MAIL_SIGNATURE_EDITOR (window)) + editor = e_mail_signature_editor_get_editor ( + E_MAIL_SIGNATURE_EDITOR (window)); + /* This applies to both the composer and signature editor. */ - if (GTKHTML_IS_EDITOR (window)) { + if (editor != NULL) { + EHTMLEditorView *view; GSettings *settings; - GList *spell_languages; gboolean active = TRUE; - spell_languages = e_load_spell_languages (); - gtkhtml_editor_set_spell_languages ( - GTKHTML_EDITOR (window), spell_languages); - g_list_free (spell_languages); + view = e_html_editor_get_view (editor); settings = g_settings_new ("org.gnome.evolution.mail"); @@ -498,7 +503,7 @@ mail_shell_backend_window_added_cb (GtkApplication *application, g_object_unref (settings); - gtkhtml_editor_set_html_mode (GTKHTML_EDITOR (window), active); + e_html_editor_view_set_html_mode (view, active); } if (E_IS_MSG_COMPOSER (window)) { diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c index aff084d522..14b08300b5 100644 --- a/modules/mail/e-mail-shell-view-private.c +++ b/modules/mail/e-mail-shell-view-private.c @@ -265,8 +265,7 @@ mail_shell_view_mail_display_needs_key (EMailDisplay *mail_display, if (!frame) return FALSE; dom = webkit_web_frame_get_dom_document (frame); - /* intentionally used "static_cast" */ - element = webkit_dom_html_document_get_active_element ((WebKitDOMHTMLDocument *) dom); + element = webkit_dom_html_document_get_active_element (WEBKIT_DOM_HTML_DOCUMENT (dom)); if (element) name = webkit_dom_node_get_node_name (WEBKIT_DOM_NODE (element)); diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h index 2925f4e63c..e42222d8b0 100644 --- a/modules/mail/e-mail-shell-view-private.h +++ b/modules/mail/e-mail-shell-view-private.h @@ -24,7 +24,6 @@ #include "e-mail-shell-view.h" #include <glib/gi18n.h> -#include <gtkhtml/gtkhtml.h> #include <camel/camel-search-private.h> /* for camel_search_word */ #include <mail/e-mail-folder-create-dialog.h> diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c index 3861519509..8ec3f6faf3 100644 --- a/modules/mail/em-composer-prefs.c +++ b/modules/mail/em-composer-prefs.c @@ -34,10 +34,6 @@ #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <gtkhtml/gtkhtml.h> -#include <editor/gtkhtml-spell-language.h> -#include <libedataserver/libedataserver.h> - #include <composer/e-msg-composer.h> #include <shell/e-shell-utils.h> @@ -56,53 +52,6 @@ G_DEFINE_TYPE ( em_composer_prefs, GTK_TYPE_VBOX) -static gboolean -composer_prefs_map_string_to_color (GValue *value, - GVariant *variant, - gpointer user_data) -{ - GdkColor color; - const gchar *string; - gboolean success = FALSE; - - string = g_variant_get_string (variant, NULL); - if (gdk_color_parse (string, &color)) { - g_value_set_boxed (value, &color); - success = TRUE; - } - - return success; -} - -static GVariant * -composer_prefs_map_color_to_string (const GValue *value, - const GVariantType *expected_type, - gpointer user_data) -{ - GVariant *variant; - const GdkColor *color; - - color = g_value_get_boxed (value); - if (color == NULL) { - variant = g_variant_new_string (""); - } else { - gchar *string; - - /* Encode the color manually because CSS styles expect - * color codes as #rrggbb, whereas gdk_color_to_string() - * returns color codes as #rrrrggggbbbb. */ - string = g_strdup_printf ( - "#%02x%02x%02x", - (gint) color->red * 256 / 65536, - (gint) color->green * 256 / 65536, - (gint) color->blue * 256 / 65536); - variant = g_variant_new_string (string); - g_free (string); - } - - return variant; -} - static void composer_prefs_dispose (GObject *object) { @@ -168,7 +117,7 @@ spell_language_save (EMComposerPrefs *prefs) /* Build a list of active spell languages. */ valid = gtk_tree_model_get_iter_first (model, &iter); while (valid) { - const GtkhtmlSpellLanguage *language; + ESpellDictionary *language; gboolean active; gtk_tree_model_get ( @@ -191,36 +140,36 @@ spell_language_save (EMComposerPrefs *prefs) static void spell_setup (EMComposerPrefs *prefs) { - const GList *available_languages; - GList *active_languages; + GList *list, *link; GtkListStore *store; store = GTK_LIST_STORE (prefs->language_model); - available_languages = gtkhtml_spell_language_get_available (); - active_languages = e_load_spell_languages (); + list = e_spell_checker_list_available_dicts (prefs->spell_checker); /* Populate the GtkListStore. */ - while (available_languages != NULL) { - const GtkhtmlSpellLanguage *language; + for (link = list; link != NULL; link = g_list_next (link)) { + ESpellDictionary *dictionary; GtkTreeIter tree_iter; const gchar *name; + const gchar *code; gboolean active; - language = available_languages->data; - name = gtkhtml_spell_language_get_name (language); - active = (g_list_find (active_languages, language) != NULL); + dictionary = E_SPELL_DICTIONARY (link->data); + name = e_spell_dictionary_get_name (dictionary); + code = e_spell_dictionary_get_code (dictionary); + + active = e_spell_checker_get_language_active ( + prefs->spell_checker, code); gtk_list_store_append (store, &tree_iter); gtk_list_store_set ( store, &tree_iter, - 0, active, 1, name, 2, language, -1); - - available_languages = available_languages->next; + 0, active, 1, name, 2, dictionary, -1); } - g_list_free (active_languages); + g_list_free (list); } #define MAIL_SEND_ACCOUNT_OVERRIDE_KEY "sao-mail-send-account-override" @@ -1006,10 +955,15 @@ static EMConfigItem emcp_items[] = { (gchar *) "vboxSpellChecking", emcp_widget_glade }, - { E_CONFIG_PAGE, - (gchar *) "90.accountoverride", - (gchar *) "send-account-override-grid", - emcp_widget_glade } + { E_CONFIG_SECTION_TABLE, + (gchar *) "20.spellcheck/00.languages", + (gchar *) "languages-table", + emcp_widget_glade }, + + { E_CONFIG_SECTION, + (gchar *) "20.spellcheck/00.options", + (gchar *) "spell-options-vbox", + emcp_widget_glade }, }; static void @@ -1051,6 +1005,8 @@ em_composer_prefs_construct (EMComposerPrefs *prefs, prefs->builder = gtk_builder_new (); e_load_ui_builder_definition (prefs->builder, "mail-config.ui"); + prefs->spell_checker = e_spell_checker_new (); + /** @HookPoint-EMConfig: Mail Composer Preferences * @Id: org.gnome.evolution.mail.composerPrefs * @Class: org.gnome.evolution.mail.config:1.0 @@ -1134,6 +1090,12 @@ em_composer_prefs_construct (EMComposerPrefs *prefs, widget, "active", G_SETTINGS_BIND_DEFAULT); + widget = e_builder_get_widget (prefs->builder, "spinWordWrapLength"); + g_settings_bind ( + settings, "composer-word-wrap-length", + widget, "value", + G_SETTINGS_BIND_DEFAULT); + widget = e_builder_get_widget (prefs->builder, "chkOutlookFilenames"); g_settings_bind ( settings, "composer-outlook-filenames", @@ -1193,9 +1155,6 @@ em_composer_prefs_construct (EMComposerPrefs *prefs, view = GTK_TREE_VIEW (widget); store = gtk_list_store_new ( 3, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_POINTER); - g_signal_connect_swapped ( - store, "row-changed", - G_CALLBACK (spell_language_save), prefs); prefs->language_model = GTK_TREE_MODEL (store); gtk_tree_view_set_model (view, prefs->language_model); renderer = gtk_cell_renderer_toggle_new (); @@ -1215,19 +1174,14 @@ em_composer_prefs_construct (EMComposerPrefs *prefs, info_pixmap = e_builder_get_widget (prefs->builder, "pixmapSpellInfo"); gtk_image_set_from_icon_name ( GTK_IMAGE (info_pixmap), - "dialog-information", GTK_ICON_SIZE_BUTTON); - - widget = e_builder_get_widget (prefs->builder, "colorButtonSpellCheckColor"); - g_settings_bind_with_mapping ( - settings, "composer-spell-color", - widget, "color", - G_SETTINGS_BIND_DEFAULT, - composer_prefs_map_string_to_color, - composer_prefs_map_color_to_string, - NULL, (GDestroyNotify) NULL); + GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_BUTTON); spell_setup (prefs); + g_signal_connect_swapped ( + store, "row-changed", + G_CALLBACK (spell_language_save), prefs); + /* Forwards and Replies */ widget = e_builder_get_widget (prefs->builder, "comboboxForwardStyle"); g_settings_bind ( diff --git a/modules/mail/em-composer-prefs.h b/modules/mail/em-composer-prefs.h index cb986f597d..5b72293c9d 100644 --- a/modules/mail/em-composer-prefs.h +++ b/modules/mail/em-composer-prefs.h @@ -23,7 +23,6 @@ #define EM_COMPOSER_PREFS_H #include <gtk/gtk.h> -#include <gtkhtml/gtkhtml.h> #include <shell/e-shell.h> @@ -67,7 +66,9 @@ struct _EMComposerPrefs { GtkComboBox *reply_style; /* Signatures */ - GtkHTML *sig_preview; + EWebViewPreview *sig_preview; + + ESpellChecker *spell_checker; }; struct _EMComposerPrefsClass { diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c index 3e3aa3909c..0e2b11beb5 100644 --- a/modules/mail/em-mailer-prefs.c +++ b/modules/mail/em-mailer-prefs.c @@ -28,7 +28,6 @@ #include "em-mailer-prefs.h" -#include <gtkhtml/gtkhtml-properties.h> #include <libxml/tree.h> #include <shell/e-shell-utils.h> @@ -738,7 +737,7 @@ image_loading_policy_always_cb (GtkToggleButton *toggle_button) g_settings_set_enum ( settings, "image-loading-policy", - E_MAIL_IMAGE_LOADING_POLICY_ALWAYS); + E_IMAGE_LOADING_POLICY_ALWAYS); g_object_unref (settings); } @@ -754,7 +753,7 @@ image_loading_policy_sometimes_cb (GtkToggleButton *toggle_button) g_settings_set_enum ( settings, "image-loading-policy", - E_MAIL_IMAGE_LOADING_POLICY_SOMETIMES); + E_IMAGE_LOADING_POLICY_SOMETIMES); g_object_unref (settings); } @@ -770,7 +769,7 @@ image_loading_policy_never_cb (GtkToggleButton *toggle_button) g_settings_set_enum ( settings, "image-loading-policy", - E_MAIL_IMAGE_LOADING_POLICY_NEVER); + E_IMAGE_LOADING_POLICY_NEVER); g_object_unref (settings); } @@ -1006,7 +1005,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs, prefs->builder, "radImagesNever"); gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON (widget), - val == E_MAIL_IMAGE_LOADING_POLICY_NEVER); + val == E_IMAGE_LOADING_POLICY_NEVER); gtk_widget_set_sensitive (widget, writable); g_signal_connect ( @@ -1017,7 +1016,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs, prefs->builder, "radImagesSometimes"); gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON (widget), - val == E_MAIL_IMAGE_LOADING_POLICY_SOMETIMES); + val == E_IMAGE_LOADING_POLICY_SOMETIMES); gtk_widget_set_sensitive (widget, writable); g_signal_connect ( @@ -1028,7 +1027,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs, prefs->builder, "radImagesAlways"); gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON (widget), - val == E_MAIL_IMAGE_LOADING_POLICY_ALWAYS); + val == E_IMAGE_LOADING_POLICY_ALWAYS); gtk_widget_set_sensitive (widget, writable); g_signal_connect ( diff --git a/modules/mailto-handler/Makefile.am b/modules/mailto-handler/Makefile.am index a4d90d34e8..624ca374a2 100644 --- a/modules/mailto-handler/Makefile.am +++ b/modules/mailto-handler/Makefile.am @@ -6,8 +6,8 @@ module_mailto_handler_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-mailto-handler\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) module_mailto_handler_la_SOURCES = \ evolution-mailto-handler.c @@ -17,7 +17,7 @@ module_mailto_handler_la_LIBADD = \ $(top_builddir)/shell/libevolution-shell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) module_mailto_handler_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) diff --git a/modules/mdn/Makefile.am b/modules/mdn/Makefile.am index 550aa08d83..ba43b997f5 100644 --- a/modules/mdn/Makefile.am +++ b/modules/mdn/Makefile.am @@ -6,8 +6,8 @@ module_mdn_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-mdn\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) module_mdn_la_SOURCES = \ evolution-mdn.c @@ -19,7 +19,7 @@ module_mdn_la_LIBADD = \ $(top_builddir)/shell/libevolution-shell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) module_mdn_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) diff --git a/modules/offline-alert/Makefile.am b/modules/offline-alert/Makefile.am index 68ef0d2620..8a2080315d 100644 --- a/modules/offline-alert/Makefile.am +++ b/modules/offline-alert/Makefile.am @@ -6,8 +6,8 @@ module_offline_alert_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-offline-alert\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) module_offline_alert_la_SOURCES = \ evolution-offline-alert.c @@ -17,7 +17,7 @@ module_offline_alert_la_LIBADD = \ $(top_builddir)/shell/libevolution-shell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) module_offline_alert_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) diff --git a/modules/plugin-lib/Makefile.am b/modules/plugin-lib/Makefile.am index 48506c047d..d94320a7e6 100644 --- a/modules/plugin-lib/Makefile.am +++ b/modules/plugin-lib/Makefile.am @@ -7,8 +7,8 @@ module_plugin_lib_la_CPPFLAGS = \ -DEVOLUTION_PREFIX=\""$(prefix)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) module_plugin_lib_la_SOURCES = \ evolution-module-plugin-lib.c \ @@ -19,7 +19,7 @@ module_plugin_lib_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) module_plugin_lib_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) diff --git a/modules/plugin-manager/Makefile.am b/modules/plugin-manager/Makefile.am index eef64c23a7..c00ce41239 100644 --- a/modules/plugin-manager/Makefile.am +++ b/modules/plugin-manager/Makefile.am @@ -6,8 +6,8 @@ module_plugin_manager_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-plugin-manager\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) module_plugin_manager_la_SOURCES = \ evolution-plugin-manager.c @@ -17,7 +17,7 @@ module_plugin_manager_la_LIBADD = \ $(top_builddir)/shell/libevolution-shell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) module_plugin_manager_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) diff --git a/modules/prefer-plain/Makefile.am b/modules/prefer-plain/Makefile.am index e3b546bb68..9b6c8b352f 100644 --- a/modules/prefer-plain/Makefile.am +++ b/modules/prefer-plain/Makefile.am @@ -9,8 +9,8 @@ module_prefer_plain_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-module-prefer-plain\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) module_prefer_plain_la_SOURCES = \ e-mail-parser-prefer-plain.c \ @@ -26,7 +26,7 @@ module_prefer_plain_la_LIBADD = \ $(top_builddir)/shell/libevolution-shell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) module_prefer_plain_la_LDFLAGS = \ -avoid-version -module $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) diff --git a/modules/prefer-plain/plugin/Makefile.am b/modules/prefer-plain/plugin/Makefile.am index b3179af307..e1f73c6d66 100644 --- a/modules/prefer-plain/plugin/Makefile.am +++ b/modules/prefer-plain/plugin/Makefile.am @@ -9,8 +9,8 @@ liborg_gnome_prefer_plain_la_CPPFLAGS = \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) liborg_gnome_prefer_plain_la_SOURCES = \ config-ui.c @@ -20,7 +20,7 @@ liborg_gnome_prefer_plain_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) $( liborg_gnome_prefer_plain_la_LIBADD = \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) BUILT_SOURCES = $(plugin_DATA) diff --git a/modules/settings/Makefile.am b/modules/settings/Makefile.am index 3c9bdb0327..c03253db9e 100644 --- a/modules/settings/Makefile.am +++ b/modules/settings/Makefile.am @@ -8,7 +8,6 @@ module_settings_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-module-settings\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) \ $(NULL) @@ -46,12 +45,12 @@ module_settings_la_SOURCES = \ e-settings-message-list.h \ e-settings-name-selector-entry.c \ e-settings-name-selector-entry.h \ + e-settings-spell-checker.c \ + e-settings-spell-checker.h \ e-settings-spell-entry.c \ e-settings-spell-entry.h \ e-settings-web-view.c \ e-settings-web-view.h \ - e-settings-web-view-gtkhtml.c \ - e-settings-web-view-gtkhtml.h \ e-settings-weekday-chooser.c \ e-settings-weekday-chooser.h \ $(NULL) @@ -65,7 +64,6 @@ module_settings_la_LIBADD = \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) \ $(NULL) module_settings_la_LDFLAGS = \ diff --git a/modules/settings/e-settings-deprecated.c b/modules/settings/e-settings-deprecated.c index b34e791b0d..d519a91e0e 100644 --- a/modules/settings/e-settings-deprecated.c +++ b/modules/settings/e-settings-deprecated.c @@ -332,7 +332,7 @@ static void settings_deprecated_image_loading_policy_cb (GSettings *settings, const gchar *key) { - EMailImageLoadingPolicy policy; + EImageLoadingPolicy policy; policy = g_settings_get_enum (settings, "image-loading-policy"); e_settings_deprecated_set_int_with_change_test (settings, "load-http-images", policy); diff --git a/modules/settings/e-settings-spell-checker.c b/modules/settings/e-settings-spell-checker.c new file mode 100644 index 0000000000..6e5f0cc843 --- /dev/null +++ b/modules/settings/e-settings-spell-checker.c @@ -0,0 +1,117 @@ +/* + * e-settings-spell-checker.c + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> + * + */ + +#include "e-settings-spell-checker.h" + +#include <e-util/e-util.h> + +#define E_SETTINGS_SPELL_CHECKER_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), E_TYPE_SETTINGS_SPELL_CHECKER, ESettingsSpellCheckerPrivate)) + +struct _ESettingsSpellCheckerPrivate { + gint placeholder; +}; + +G_DEFINE_DYNAMIC_TYPE ( + ESettingsSpellChecker, + e_settings_spell_checker, + E_TYPE_EXTENSION) + +static ESpellChecker * +settings_spell_checker_get_extensible (ESettingsSpellChecker *extension) +{ + EExtensible *extensible; + + extensible = e_extension_get_extensible (E_EXTENSION (extension)); + + return E_SPELL_CHECKER (extensible); +} + +static void +settings_spell_checker_constructed (GObject *object) +{ + ESpellChecker *spell_checker; + GSettings *settings; + gchar **strv; + guint ii; + + /* Chain up to parent's constructed() method. */ + G_OBJECT_CLASS (e_settings_spell_checker_parent_class)-> + constructed (object); + + /* This only initializes the active spell languages, it does not + * write changes back to GSettings. Only the ESpellChecker used + * in Composer Preferences should be doing that. */ + + spell_checker = settings_spell_checker_get_extensible ( + E_SETTINGS_SPELL_CHECKER (object)); + + /* Make sure there are no active languages at this point. */ + g_warn_if_fail ( + e_spell_checker_count_active_languages (spell_checker) == 0); + + settings = g_settings_new ("org.gnome.evolution.mail"); + strv = g_settings_get_strv (settings, "composer-spell-languages"); + g_object_unref (settings); + + g_return_if_fail (strv != NULL); + + for (ii = 0; strv[ii] != NULL; ii++) + e_spell_checker_set_language_active ( + spell_checker, strv[ii], TRUE); + + g_strfreev (strv); +} + +static void +e_settings_spell_checker_class_init (ESettingsSpellCheckerClass *class) +{ + GObjectClass *object_class; + EExtensionClass *extension_class; + + g_type_class_add_private ( + class, sizeof (ESettingsSpellCheckerPrivate)); + + object_class = G_OBJECT_CLASS (class); + object_class->constructed = settings_spell_checker_constructed; + + extension_class = E_EXTENSION_CLASS (class); + extension_class->extensible_type = E_TYPE_SPELL_CHECKER; +} + +static void +e_settings_spell_checker_class_finalize (ESettingsSpellCheckerClass *class) +{ +} + +static void +e_settings_spell_checker_init (ESettingsSpellChecker *extension) +{ + extension->priv = E_SETTINGS_SPELL_CHECKER_GET_PRIVATE (extension); +} + +void +e_settings_spell_checker_type_register (GTypeModule *type_module) +{ + /* XXX G_DEFINE_DYNAMIC_TYPE declares a static type registration + * function, so we have to wrap it with a public function in + * order to register types from a separate compilation unit. */ + e_settings_spell_checker_register_type (type_module); +} + diff --git a/modules/settings/e-settings-spell-checker.h b/modules/settings/e-settings-spell-checker.h new file mode 100644 index 0000000000..3e60cecf06 --- /dev/null +++ b/modules/settings/e-settings-spell-checker.h @@ -0,0 +1,65 @@ +/* + * e-settings-spell-checker.h + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> + * + */ + +#ifndef E_SETTINGS_SPELL_CHECKER_H +#define E_SETTINGS_SPELL_CHECKER_H + +#include <libebackend/libebackend.h> + +/* Standard GObject macros */ +#define E_TYPE_SETTINGS_SPELL_CHECKER \ + (e_settings_spell_checker_get_type ()) +#define E_SETTINGS_SPELL_CHECKER(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST \ + ((obj), E_TYPE_SETTINGS_SPELL_CHECKER, ESettingsSpellChecker)) +#define E_SETTINGS_SPELL_CHECKER_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_CAST \ + ((cls), E_TYPE_SETTINGS_SPELL_CHECKER, ESettingsSpellCheckerClass)) +#define E_IS_SETTINGS_SPELL_CHECKER(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE \ + ((obj), E_TYPE_SETTINGS_SPELL_CHECKER)) +#define E_IS_SETTINGS_SPELL_CHECKER_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_TYPE \ + ((cls), E_TYPE_SETTINGS_SPELL_CHECKER)) +#define E_SETTINGS_SPELL_CHECKER_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS \ + ((obj), E_TYPE_SETTINGS_SPELL_CHECKER, ESettingsSpellCheckerClass)) + +G_BEGIN_DECLS + +typedef struct _ESettingsSpellChecker ESettingsSpellChecker; +typedef struct _ESettingsSpellCheckerClass ESettingsSpellCheckerClass; +typedef struct _ESettingsSpellCheckerPrivate ESettingsSpellCheckerPrivate; + +struct _ESettingsSpellChecker { + EExtension parent; + ESettingsSpellCheckerPrivate *priv; +}; + +struct _ESettingsSpellCheckerClass { + EExtensionClass parent_class; +}; + +GType e_settings_spell_checker_get_type + (void) G_GNUC_CONST; +void e_settings_spell_checker_type_register + (GTypeModule *type_module); + +G_END_DECLS + +#endif /* E_SETTINGS_SPELL_CHECKER_H */ diff --git a/modules/settings/e-settings-web-view-gtkhtml.c b/modules/settings/e-settings-web-view-gtkhtml.c deleted file mode 100644 index 7815eb6a17..0000000000 --- a/modules/settings/e-settings-web-view-gtkhtml.c +++ /dev/null @@ -1,324 +0,0 @@ -/* - * e-settings-web-view-gtkhtml.c - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, see <http://www.gnu.org/licenses/>. - * - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <stdio.h> -#include <string.h> - -#include "e-settings-web-view-gtkhtml.h" - -#include <e-util/e-util.h> - -#define E_SETTINGS_WEB_VIEW_GTKHTML_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_SETTINGS_WEB_VIEW_GTKHTML, ESettingsWebViewGtkHTMLPrivate)) - -struct _ESettingsWebViewGtkHTMLPrivate { - GtkCssProvider *css_provider; - GSettings *settings; - GHashTable *old_values; -}; - -G_DEFINE_DYNAMIC_TYPE ( - ESettingsWebViewGtkHTML, - e_settings_web_view_gtkhtml, - E_TYPE_EXTENSION) - -/* replaces content of color string */ -static void -settings_web_view_gtkhtml_fix_color_string (gchar *color_string) -{ - GdkColor color; - - if (color_string == NULL) - return; - - if (strlen (color_string) < 13) - return; - - if (!gdk_color_parse (color_string, &color)) - return; - - sprintf ( - color_string, "#%02x%02x%02x", - (gint) color.red * 256 / 65536, - (gint) color.green * 256 / 65536, - (gint) color.blue * 256 / 65536); -} - -static void -settings_web_view_gtkhtml_load_style (ESettingsWebViewGtkHTML *extension) -{ - GString *buffer; - gchar *citation_color; - gchar *monospace_font; - gchar *spell_color; - gchar *variable_font; - gboolean custom_fonts; - gboolean mark_citations; - EExtensible *extensible; - GtkStyleContext *style_context; - GSettings *settings; - GError *error = NULL; - - /* Some of our mail and composer preferences are passed down to - * GtkHtml through style properties, unfortunately. This builds - * a style sheet for the EWebView using values from GSettings. */ - - settings = extension->priv->settings; - - custom_fonts = - g_settings_get_boolean (settings, "use-custom-font"); - monospace_font = - g_settings_get_string (settings, "monospace-font"); - variable_font = - g_settings_get_string (settings, "variable-width-font"); - mark_citations = - g_settings_get_boolean (settings, "mark-citations"); - citation_color = - g_settings_get_string (settings, "citation-color"); - spell_color = - g_settings_get_string (settings, "composer-spell-color"); - - buffer = g_string_new ("EWebViewGtkHTML {\n"); - - settings_web_view_gtkhtml_fix_color_string (citation_color); - settings_web_view_gtkhtml_fix_color_string (spell_color); - - if (custom_fonts && variable_font != NULL) - g_string_append_printf ( - buffer, " font: %s;\n", variable_font); - - if (custom_fonts && monospace_font != NULL) - g_string_append_printf ( - buffer, " -GtkHTML-fixed-font-name: '%s';\n", - monospace_font); - - if (mark_citations && citation_color != NULL) - g_string_append_printf ( - buffer, " -GtkHTML-cite-color: %s;\n", - citation_color); - - if (spell_color != NULL) - g_string_append_printf ( - buffer, " -GtkHTML-spell-error-color: %s;\n", - spell_color); - - g_string_append (buffer, "}\n"); - - gtk_css_provider_load_from_data ( - extension->priv->css_provider, - buffer->str, buffer->len, &error); - - if (error != NULL) { - g_warning ("%s", error->message); - g_error_free (error); - } - - g_string_free (buffer, TRUE); - - g_free (monospace_font); - g_free (variable_font); - g_free (citation_color); - g_free (spell_color); - - extensible = e_extension_get_extensible (E_EXTENSION (extension)); - style_context = gtk_widget_get_style_context (GTK_WIDGET (extensible)); - gtk_style_context_invalidate (style_context); -} - -static void -settings_web_view_gtkhtml_changed_cb (GSettings *settings, - const gchar *key, - ESettingsWebViewGtkHTML *extension) -{ - GVariant *new_value, *old_value; - - new_value = g_settings_get_value (settings, key); - old_value = g_hash_table_lookup (extension->priv->old_values, key); - - if (!new_value || !old_value || !g_variant_equal (new_value, old_value)) { - if (new_value) - g_hash_table_insert (extension->priv->old_values, g_strdup (key), new_value); - else - g_hash_table_remove (extension->priv->old_values, key); - - settings_web_view_gtkhtml_load_style (extension); - } else if (new_value) { - g_variant_unref (new_value); - } -} - -static void -settings_web_view_gtkhtml_realize (GtkWidget *widget, - ESettingsWebViewGtkHTML *extension) -{ - GSettings *settings; - - settings = extension->priv->settings; - - g_settings_bind ( - settings, "composer-inline-spelling", - widget, "inline-spelling", - G_SETTINGS_BIND_GET); - - g_settings_bind ( - settings, "composer-magic-links", - widget, "magic-links", - G_SETTINGS_BIND_GET); - - g_settings_bind ( - settings, "composer-magic-smileys", - widget, "magic-smileys", - G_SETTINGS_BIND_GET); - - gtk_style_context_add_provider ( - gtk_widget_get_style_context (widget), - GTK_STYLE_PROVIDER (extension->priv->css_provider), - GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); - - settings_web_view_gtkhtml_load_style (extension); - - /* Reload the style sheet when certain settings change. */ - - g_signal_connect ( - settings, "changed::use-custom-font", - G_CALLBACK (settings_web_view_gtkhtml_changed_cb), - extension); - - g_signal_connect ( - settings, "changed::monospace-font", - G_CALLBACK (settings_web_view_gtkhtml_changed_cb), - extension); - - g_signal_connect ( - settings, "changed::variable-width-font", - G_CALLBACK (settings_web_view_gtkhtml_changed_cb), - extension); - - g_signal_connect ( - settings, "changed::mark-citations", - G_CALLBACK (settings_web_view_gtkhtml_changed_cb), - extension); - - g_signal_connect ( - settings, "changed::citation-color", - G_CALLBACK (settings_web_view_gtkhtml_changed_cb), - extension); - - g_signal_connect ( - settings, "changed::composer-spell-color", - G_CALLBACK (settings_web_view_gtkhtml_changed_cb), - extension); -} - -static void -settings_web_view_gtkhtml_dispose (GObject *object) -{ - ESettingsWebViewGtkHTMLPrivate *priv; - - priv = E_SETTINGS_WEB_VIEW_GTKHTML_GET_PRIVATE (object); - - if (priv->settings != NULL) { - g_signal_handlers_disconnect_by_func ( - priv->settings, - settings_web_view_gtkhtml_changed_cb, object); - } - - if (priv->old_values) { - g_hash_table_destroy (priv->old_values); - priv->old_values = NULL; - } - - g_clear_object (&priv->css_provider); - g_clear_object (&priv->settings); - - /* Chain up to parent's dispose() method. */ - G_OBJECT_CLASS (e_settings_web_view_gtkhtml_parent_class)-> - dispose (object); -} - -static void -settings_web_view_gtkhtml_constructed (GObject *object) -{ - EExtensible *extensible; - - extensible = e_extension_get_extensible (E_EXTENSION (object)); - - /* Wait to bind settings until the EWebView is realized so - * GtkhtmlEditor has a chance to install a GtkHTMLEditorAPI. - * Otherwise our settings will have no effect. */ - - g_signal_connect ( - extensible, "realize", - G_CALLBACK (settings_web_view_gtkhtml_realize), object); - - /* Chain up to parent's constructed() method. */ - G_OBJECT_CLASS (e_settings_web_view_gtkhtml_parent_class)-> - constructed (object); -} - -static void -e_settings_web_view_gtkhtml_class_init (ESettingsWebViewGtkHTMLClass *class) -{ - GObjectClass *object_class; - EExtensionClass *extension_class; - - g_type_class_add_private ( - class, sizeof (ESettingsWebViewGtkHTMLPrivate)); - - object_class = G_OBJECT_CLASS (class); - object_class->dispose = settings_web_view_gtkhtml_dispose; - object_class->constructed = settings_web_view_gtkhtml_constructed; - - extension_class = E_EXTENSION_CLASS (class); - extension_class->extensible_type = E_TYPE_WEB_VIEW_GTKHTML; -} - -static void -e_settings_web_view_gtkhtml_class_finalize (ESettingsWebViewGtkHTMLClass *class) -{ -} - -static void -e_settings_web_view_gtkhtml_init (ESettingsWebViewGtkHTML *extension) -{ - GSettings *settings; - - extension->priv = - E_SETTINGS_WEB_VIEW_GTKHTML_GET_PRIVATE (extension); - - extension->priv->css_provider = gtk_css_provider_new (); - - settings = g_settings_new ("org.gnome.evolution.mail"); - extension->priv->settings = settings; - - extension->priv->old_values = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_variant_unref); -} - -void -e_settings_web_view_gtkhtml_type_register (GTypeModule *type_module) -{ - /* XXX G_DEFINE_DYNAMIC_TYPE declares a static type registration - * function, so we have to wrap it with a public function in - * order to register types from a separate compilation unit. */ - e_settings_web_view_gtkhtml_register_type (type_module); -} - diff --git a/modules/settings/e-settings-web-view-gtkhtml.h b/modules/settings/e-settings-web-view-gtkhtml.h deleted file mode 100644 index 7c406265e4..0000000000 --- a/modules/settings/e-settings-web-view-gtkhtml.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - * e-settings-web-view-gtkhtml.h - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, see <http://www.gnu.org/licenses/>. - * - */ - -#ifndef E_SETTINGS_WEB_VIEW_GTKHTML_H -#define E_SETTINGS_WEB_VIEW_GTKHTML_H - -#include <libebackend/libebackend.h> - -/* Standard GObject macros */ -#define E_TYPE_SETTINGS_WEB_VIEW_GTKHTML \ - (e_settings_web_view_gtkhtml_get_type ()) -#define E_SETTINGS_WEB_VIEW_GTKHTML(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST \ - ((obj), E_TYPE_SETTINGS_WEB_VIEW_GTKHTML, ESettingsWebViewGtkHTML)) -#define E_SETTINGS_WEB_VIEW_GTKHTML_CLASS(cls) \ - (G_TYPE_CHECK_CLASS_CAST \ - ((cls), E_TYPE_SETTINGS_WEB_VIEW_GTKHTML, ESettingsWebViewGtkHTMLClass)) -#define E_IS_SETTINGS_WEB_VIEW_GTKHTML(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE \ - ((obj), E_TYPE_SETTINGS_WEB_VIEW_GTKHTML)) -#define E_IS_SETTINGS_WEB_VIEW_GTKHTML_CLASS(cls) \ - (G_TYPE_CHECK_CLASS_TYPE \ - ((cls), E_TYPE_SETTINGS_WEB_VIEW_GTKHTML)) -#define E_SETTINGS_WEB_VIEW_GTKHTML_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS \ - ((obj), E_TYPE_SETTINGS_WEB_VIEW_GTKHTML, ESettingsWebViewGtkHTMLClass)) - -G_BEGIN_DECLS - -typedef struct _ESettingsWebViewGtkHTML ESettingsWebViewGtkHTML; -typedef struct _ESettingsWebViewGtkHTMLClass ESettingsWebViewGtkHTMLClass; -typedef struct _ESettingsWebViewGtkHTMLPrivate ESettingsWebViewGtkHTMLPrivate; - -struct _ESettingsWebViewGtkHTML { - EExtension parent; - ESettingsWebViewGtkHTMLPrivate *priv; -}; - -struct _ESettingsWebViewGtkHTMLClass { - EExtensionClass parent_class; -}; - -GType e_settings_web_view_gtkhtml_get_type - (void) G_GNUC_CONST; -void e_settings_web_view_gtkhtml_type_register - (GTypeModule *type_module); - -G_END_DECLS - -#endif /* E_SETTINGS_WEB_VIEW_GTKHTML_H */ diff --git a/modules/settings/e-settings-web-view.c b/modules/settings/e-settings-web-view.c index 0867b3c66d..ff804f36b4 100644 --- a/modules/settings/e-settings-web-view.c +++ b/modules/settings/e-settings-web-view.c @@ -31,7 +31,8 @@ ((obj), E_TYPE_SETTINGS_WEB_VIEW, ESettingsWebViewPrivate)) struct _ESettingsWebViewPrivate { - gint placeholder; + GtkCssProvider *css_provider; + GSettings *settings; }; G_DEFINE_DYNAMIC_TYPE ( @@ -39,32 +40,194 @@ G_DEFINE_DYNAMIC_TYPE ( e_settings_web_view, E_TYPE_EXTENSION) +/* replaces content of color string */ static void -settings_web_view_constructed (GObject *object) +settings_web_view_fix_color_string (gchar *color_string) { - GSettings *settings; + GdkColor color; + + if (color_string == NULL) + return; + + if (strlen (color_string) < 13) + return; + + if (!gdk_color_parse (color_string, &color)) + return; + + sprintf ( + color_string, "#%02x%02x%02x", + (gint) color.red * 256 / 65536, + (gint) color.green * 256 / 65536, + (gint) color.blue * 256 / 65536); +} + +static void +settings_web_view_load_style (ESettingsWebView *extension) +{ + GString *buffer; + gchar *citation_color; + gchar *monospace_font; + gchar *variable_font; + gboolean custom_fonts; + gboolean mark_citations; EExtensible *extensible; + GtkStyleContext *style_context; + GSettings *settings; + GError *error = NULL; - extensible = e_extension_get_extensible (E_EXTENSION (object)); + /* Some of our mail and composer preferences are passed down to + * GtkHtml through style properties, unfortunately. This builds + * a style sheet for the EWebView using values from GSettings. */ - settings = g_settings_new ("org.gnome.evolution.mail"); + settings = extension->priv->settings; + + custom_fonts = + g_settings_get_boolean (settings, "use-custom-font"); + monospace_font = + g_settings_get_string (settings, "monospace-font"); + variable_font = + g_settings_get_string (settings, "variable-width-font"); + mark_citations = + g_settings_get_boolean (settings, "mark-citations"); + citation_color = + g_settings_get_string (settings, "citation-color"); + + buffer = g_string_new ("EWebViewGtkHTML {\n"); + + settings_web_view_fix_color_string (citation_color); + + if (custom_fonts && variable_font != NULL) + g_string_append_printf ( + buffer, " font: %s;\n", variable_font); + + if (custom_fonts && monospace_font != NULL) + g_string_append_printf ( + buffer, " -GtkHTML-fixed-font-name: '%s';\n", + monospace_font); + + if (mark_citations && citation_color != NULL) + g_string_append_printf ( + buffer, " -GtkHTML-cite-color: %s;\n", + citation_color); + + g_string_append (buffer, "}\n"); + + gtk_css_provider_load_from_data ( + extension->priv->css_provider, + buffer->str, buffer->len, &error); + + if (error != NULL) { + g_warning ("%s", error->message); + g_error_free (error); + } + + g_string_free (buffer, TRUE); + + g_free (monospace_font); + g_free (variable_font); + g_free (citation_color); + + extensible = e_extension_get_extensible (E_EXTENSION (extension)); + style_context = gtk_widget_get_style_context (GTK_WIDGET (extensible)); + gtk_style_context_invalidate (style_context); +} + +static void +settings_web_view_changed_cb (GSettings *settings, + const gchar *key, + ESettingsWebView *extension) +{ + settings_web_view_load_style (extension); +} + +static void +settings_web_view_realize (GtkWidget *widget, + ESettingsWebView *extension) +{ + GSettings *settings; + + settings = extension->priv->settings; g_settings_bind ( settings, "composer-inline-spelling", - extensible, "inline-spelling", + widget, "inline-spelling", G_SETTINGS_BIND_GET); g_settings_bind ( settings, "composer-magic-links", - extensible, "magic-links", + widget, "magic-links", G_SETTINGS_BIND_GET); g_settings_bind ( settings, "composer-magic-smileys", - extensible, "magic-smileys", + widget, "magic-smileys", G_SETTINGS_BIND_GET); - g_object_unref (settings); + gtk_style_context_add_provider ( + gtk_widget_get_style_context (widget), + GTK_STYLE_PROVIDER (extension->priv->css_provider), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + + settings_web_view_load_style (extension); + + /* Reload the style sheet when certain settings change. */ + + g_signal_connect ( + settings, "changed::use-custom-font", + G_CALLBACK (settings_web_view_changed_cb), extension); + + g_signal_connect ( + settings, "changed::monospace-font", + G_CALLBACK (settings_web_view_changed_cb), extension); + + g_signal_connect ( + settings, "changed::variable-width-font", + G_CALLBACK (settings_web_view_changed_cb), extension); + + g_signal_connect ( + settings, "changed::mark-citations", + G_CALLBACK (settings_web_view_changed_cb), extension); + + g_signal_connect ( + settings, "changed::citation-color", + G_CALLBACK (settings_web_view_changed_cb), extension); +} + +static void +settings_web_view_dispose (GObject *object) +{ + ESettingsWebViewPrivate *priv; + + priv = E_SETTINGS_WEB_VIEW_GET_PRIVATE (object); + + if (priv->settings != NULL) { + g_signal_handlers_disconnect_by_func ( + priv->settings, + settings_web_view_changed_cb, object); + } + + g_clear_object (&priv->css_provider); + g_clear_object (&priv->settings); + + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (e_settings_web_view_parent_class)->dispose (object); +} + +static void +settings_web_view_constructed (GObject *object) +{ + EExtensible *extensible; + + extensible = e_extension_get_extensible (E_EXTENSION (object)); + + /* Wait to bind settings until the EWebView is realized so + * GtkhtmlEditor has a chance to install a GtkHTMLEditorAPI. + * Otherwise our settings will have no effect. */ + + g_signal_connect ( + extensible, "realize", + G_CALLBACK (settings_web_view_realize), object); /* Chain up to parent's constructed() method. */ G_OBJECT_CLASS (e_settings_web_view_parent_class)-> @@ -80,6 +243,7 @@ e_settings_web_view_class_init (ESettingsWebViewClass *class) g_type_class_add_private (class, sizeof (ESettingsWebViewPrivate)); object_class = G_OBJECT_CLASS (class); + object_class->dispose = settings_web_view_dispose; object_class->constructed = settings_web_view_constructed; extension_class = E_EXTENSION_CLASS (class); @@ -94,7 +258,14 @@ e_settings_web_view_class_finalize (ESettingsWebViewClass *class) static void e_settings_web_view_init (ESettingsWebView *extension) { + GSettings *settings; + extension->priv = E_SETTINGS_WEB_VIEW_GET_PRIVATE (extension); + + extension->priv->css_provider = gtk_css_provider_new (); + + settings = g_settings_new ("org.gnome.evolution.mail"); + extension->priv->settings = settings; } void diff --git a/modules/settings/evolution-module-settings.c b/modules/settings/evolution-module-settings.c index af08158dde..88101b56c1 100644 --- a/modules/settings/evolution-module-settings.c +++ b/modules/settings/evolution-module-settings.c @@ -31,9 +31,9 @@ #include "e-settings-meeting-time-selector.h" #include "e-settings-message-list.h" #include "e-settings-name-selector-entry.h" +#include "e-settings-spell-checker.h" #include "e-settings-spell-entry.h" #include "e-settings-web-view.h" -#include "e-settings-web-view-gtkhtml.h" #include "e-settings-weekday-chooser.h" /* Module Entry Points */ @@ -59,9 +59,9 @@ e_module_load (GTypeModule *type_module) e_settings_meeting_time_selector_type_register (type_module); e_settings_message_list_type_register (type_module); e_settings_name_selector_entry_type_register (type_module); + e_settings_spell_checker_type_register (type_module); e_settings_spell_entry_type_register (type_module); e_settings_web_view_type_register (type_module); - e_settings_web_view_gtkhtml_type_register (type_module); e_settings_weekday_chooser_type_register (type_module); } diff --git a/modules/spamassassin/Makefile.am b/modules/spamassassin/Makefile.am index 2ecb217f2c..ae5c32dd8b 100644 --- a/modules/spamassassin/Makefile.am +++ b/modules/spamassassin/Makefile.am @@ -6,8 +6,8 @@ module_spamassassin_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-spamassassin\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) module_spamassassin_la_SOURCES = \ evolution-spamassassin.c @@ -19,7 +19,7 @@ module_spamassassin_la_LIBADD = \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) module_spamassassin_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) diff --git a/modules/startup-wizard/Makefile.am b/modules/startup-wizard/Makefile.am index 68b08f68e2..4bf9971355 100644 --- a/modules/startup-wizard/Makefile.am +++ b/modules/startup-wizard/Makefile.am @@ -8,7 +8,6 @@ module_startup_wizard_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-startup-wizard\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) \ $(NULL) @@ -31,7 +30,6 @@ module_startup_wizard_la_LIBADD = \ $(libevolution_mail_settings_la) \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) \ $(NULL) module_startup_wizard_la_LDFLAGS = \ diff --git a/modules/text-highlight/Makefile.am b/modules/text-highlight/Makefile.am index f105ff78af..ab5df6793c 100644 --- a/modules/text-highlight/Makefile.am +++ b/modules/text-highlight/Makefile.am @@ -7,8 +7,8 @@ module_text_highlight_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-module-text-highlight\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) module_text_highlight_la_SOURCES = \ e-mail-display-popup-text-highlight.c \ @@ -28,7 +28,7 @@ module_text_highlight_la_LIBADD = \ $(top_builddir)/shell/libevolution-shell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) module_text_highlight_la_LDFLAGS = \ -avoid-version -module $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) diff --git a/modules/tnef-attachment/Makefile.am b/modules/tnef-attachment/Makefile.am index 09ff602c99..4ba29db2f7 100644 --- a/modules/tnef-attachment/Makefile.am +++ b/modules/tnef-attachment/Makefile.am @@ -13,9 +13,9 @@ module_tnef_attachment_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-module-tnef-attachment\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ $(TNEF_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) module_tnef_attachment_la_SOURCES = \ e-mail-parser-tnef-attachment.c \ @@ -27,8 +27,8 @@ module_tnef_attachment_la_LIBADD = \ $(top_builddir)/em-format/libevolution-mail-formatter.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) \ - -lytnef + -lytnef \ + $(NULL) module_tnef_attachment_la_LDFLAGS = \ -avoid-version -module $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) diff --git a/modules/vcard-inline/Makefile.am b/modules/vcard-inline/Makefile.am index 22af723783..5f5a6e50f6 100644 --- a/modules/vcard-inline/Makefile.am +++ b/modules/vcard-inline/Makefile.am @@ -7,8 +7,8 @@ module_vcard_inline_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-module-vcard-inline\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) + $(NULL) module_vcard_inline_la_SOURCES = \ e-mail-formatter-vcard.c \ @@ -27,7 +27,7 @@ module_vcard_inline_la_LIBADD = \ $(top_builddir)/addressbook/printing/libecontactprint.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) module_vcard_inline_la_LDFLAGS = \ -avoid-version -module $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) diff --git a/modules/web-inspector/Makefile.am b/modules/web-inspector/Makefile.am index 43615d549b..237121e237 100644 --- a/modules/web-inspector/Makefile.am +++ b/modules/web-inspector/Makefile.am @@ -6,8 +6,8 @@ module_web_inspector_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-web-inspector\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) module_web_inspector_la_SOURCES = \ evolution-web-inspector.c @@ -16,7 +16,7 @@ module_web_inspector_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) module_web_inspector_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) |