From 6cf57d879945059cd974a3ee6d02d81edff47438 Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Tue, 16 Aug 2011 13:38:23 +1000 Subject: Make WebKit compulsory It is now required for the log viewer, furthermore it will be required once we remove non-adium themes. --- libempathy-gtk/Makefile.am | 37 ++++++++++------------------------ libempathy-gtk/empathy-log-window.c | 1 - libempathy-gtk/empathy-theme-manager.c | 21 ------------------- 3 files changed, 11 insertions(+), 48 deletions(-) (limited to 'libempathy-gtk') diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index f12230def..fd895d508 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -14,7 +14,6 @@ AM_CPPFLAGS = \ $(GEOCLUE_CFLAGS) \ $(GEOCODE_CFLAGS) \ $(MEEGO_CFLAGS) \ - $(WEBKIT_CFLAGS) \ $(CHEESE_CFLAGS) \ $(WARN_CFLAGS) \ $(DISABLE_DEPRECATED) @@ -88,7 +87,11 @@ libempathy_gtk_handwritten_source = \ empathy-theme-irc.c \ empathy-theme-manager.c \ empathy-tls-dialog.c \ - empathy-ui-utils.c + empathy-ui-utils.c \ + empathy-plist.c \ + empathy-theme-adium.c \ + empathy-webkit-utils.c \ + $(NULL) libempathy_gtk_headers = \ empathy-account-chooser.h \ @@ -150,7 +153,12 @@ libempathy_gtk_headers = \ empathy-theme-irc.h \ empathy-theme-manager.h \ empathy-tls-dialog.h \ - empathy-ui-utils.h + empathy-ui-utils.h \ + empathy-plist.h \ + empathy-theme-adium.h \ + empathy-webkit-utils.h \ + $(NULL) + libempathy_gtk_la_SOURCES = \ $(libempathy_gtk_handwritten_source) \ @@ -173,7 +181,6 @@ libempathy_gtk_la_LIBADD = \ $(GEOCODE_LIBS) \ $(GCR_LIBS) \ $(MEEGO_LIBS) \ - $(WEBKIT_LIBS) \ $(CHEESE_LIBS) \ $(top_builddir)/libempathy/libempathy.la @@ -276,28 +283,6 @@ EXTRA_DIST += \ empathy-location-manager.h endif -if HAVE_WEBKIT -libempathy_gtk_handwritten_source += \ - empathy-plist.c \ - empathy-theme-adium.c \ - empathy-webkit-utils.c \ - $(NULL) -libempathy_gtk_headers += \ - empathy-plist.h \ - empathy-theme-adium.h \ - empathy-webkit-utils.h \ - $(NULL) -else -EXTRA_DIST += \ - empathy-plist.c \ - empathy-plist.h \ - empathy-theme-adium.c \ - empathy-theme-adium.h \ - empathy-webkit-utils.c \ - empathy-webkit-utils.h \ - $(NULL) -endif - CLEANFILES = \ $(BUILT_SOURCES) \ stamp-empathy-gtk-enum-types.h diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index bbf9e0480..ac05740cf 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -61,7 +61,6 @@ #include "empathy-images.h" #include "empathy-theme-manager.h" #include "empathy-ui-utils.h" -// FIXME: this work forces a dependency on webkit #include "empathy-webkit-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c index 2a6c393f2..c771392b9 100644 --- a/libempathy-gtk/empathy-theme-manager.c +++ b/libempathy-gtk/empathy-theme-manager.c @@ -39,10 +39,7 @@ #include "empathy-chat-text-view.h" #include "empathy-theme-boxes.h" #include "empathy-theme-irc.h" - -#ifdef HAVE_WEBKIT #include "empathy-theme-adium.h" -#endif #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include @@ -56,12 +53,10 @@ typedef struct { guint emit_changed_idle; gboolean in_constructor; -#ifdef HAVE_WEBKIT EmpathyAdiumData *adium_data; gchar *adium_variant; /* list of weakref to EmpathyThemeAdium objects */ GList *adium_views; -#endif } EmpathyThemeManagerPriv; enum { @@ -85,7 +80,6 @@ static gboolean theme_manager_emit_changed_idle_cb (gpointer manager) { EmpathyThemeManagerPriv *priv = GET_PRIV (manager); -#ifdef HAVE_WEBKIT const gchar *adium_path = NULL; if (priv->adium_data) { @@ -94,7 +88,6 @@ theme_manager_emit_changed_idle_cb (gpointer manager) DEBUG ("Emit theme-changed with: name='%s' adium_path='%s' " "adium_variant='%s'", priv->name, adium_path, priv->adium_variant); -#endif /* HAVE_WEBKIT */ g_signal_emit (manager, signals[THEME_CHANGED], 0, NULL); priv->emit_changed_idle = 0; @@ -371,7 +364,6 @@ theme_manager_update_boxes_theme (EmpathyThemeManager *manager, } } -#ifdef HAVE_WEBKIT static EmpathyThemeAdium * theme_manager_create_adium_view (EmpathyThemeManager *manager) { @@ -451,7 +443,6 @@ theme_manager_notify_adium_variant_cb (GSettings *gsettings_chat, priv->adium_variant); } } -#endif /* HAVE_WEBKIT */ EmpathyChatView * empathy_theme_manager_create_view (EmpathyThemeManager *manager) @@ -463,11 +454,9 @@ empathy_theme_manager_create_view (EmpathyThemeManager *manager) DEBUG ("Using theme %s", priv->name); -#ifdef HAVE_WEBKIT if (strcmp (priv->name, "adium") == 0 && priv->adium_data != NULL) { return EMPATHY_CHAT_VIEW (theme_manager_create_adium_view (manager)); } -#endif if (strcmp (priv->name, "classic") == 0) { return EMPATHY_CHAT_VIEW (theme_manager_create_irc_view (manager)); @@ -583,11 +572,9 @@ theme_manager_finalize (GObject *object) clear_list_of_views (&priv->boxes_views); -#ifdef HAVE_WEBKIT clear_list_of_views (&priv->adium_views); g_free (priv->adium_variant); tp_clear_pointer (&priv->adium_data, empathy_adium_data_unref); -#endif G_OBJECT_CLASS (empathy_theme_manager_parent_class)->finalize (object); } @@ -632,7 +619,6 @@ empathy_theme_manager_init (EmpathyThemeManager *manager) EMPATHY_PREFS_CHAT_THEME, manager); -#ifdef HAVE_WEBKIT /* Take the adium path/variant and track changes */ g_signal_connect (priv->gsettings_chat, "changed::" EMPATHY_PREFS_CHAT_ADIUM_PATH, @@ -649,7 +635,6 @@ empathy_theme_manager_init (EmpathyThemeManager *manager) theme_manager_notify_adium_variant_cb (priv->gsettings_chat, EMPATHY_PREFS_CHAT_THEME_VARIANT, manager); -#endif priv->in_constructor = FALSE; } @@ -674,7 +659,6 @@ empathy_theme_manager_get_themes (void) return themes; } -#ifdef HAVE_WEBKIT static void find_themes (GList **list, const gchar *dirpath) { @@ -705,12 +689,10 @@ find_themes (GList **list, const gchar *dirpath) g_error_free (error); } } -#endif /* HAVE_WEBKIT */ GList * empathy_theme_manager_get_adium_themes (void) { -#ifdef HAVE_WEBKIT GList *themes_list = NULL; gchar *userpath = NULL; const gchar *const *paths = NULL; @@ -729,7 +711,4 @@ empathy_theme_manager_get_adium_themes (void) } return themes_list; -#else - return NULL; -#endif /* HAVE_WEBKIT */ } -- cgit v1.2.3