diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-08-18 08:10:00 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-08-18 08:10:00 +0800 |
| commit | 2021c145e0c5eb6aa9eda91d58d54b13007113ad (patch) | |
| tree | ab6b5ba09764a785e8c06efae2f69dca111089be /src | |
| parent | d3e8563fe9b3d3c0b5ee5f225964b8078e18d1e6 (diff) | |
| parent | dc7080f5071a9130bbd9288b50f807b41a5f9864 (diff) | |
| download | gsoc2013-empathy-2021c145e0c5eb6aa9eda91d58d54b13007113ad.tar gsoc2013-empathy-2021c145e0c5eb6aa9eda91d58d54b13007113ad.tar.gz gsoc2013-empathy-2021c145e0c5eb6aa9eda91d58d54b13007113ad.tar.bz2 gsoc2013-empathy-2021c145e0c5eb6aa9eda91d58d54b13007113ad.tar.lz gsoc2013-empathy-2021c145e0c5eb6aa9eda91d58d54b13007113ad.tar.xz gsoc2013-empathy-2021c145e0c5eb6aa9eda91d58d54b13007113ad.tar.zst gsoc2013-empathy-2021c145e0c5eb6aa9eda91d58d54b13007113ad.zip | |
Merge branch 'log-window-webview'
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 5 | ||||
| -rw-r--r-- | src/empathy-preferences.c | 7 |
2 files changed, 1 insertions, 11 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index cf5069fc6..0232ffe0a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,7 +16,6 @@ AM_LDFLAGS = -lm AM_CPPFLAGS = \ $(CPPFLAGS_COMMON) \ $(LIBCHAMPLAIN_CFLAGS) \ - $(WEBKIT_CFLAGS) \ $(NULL) LDADD = \ @@ -27,7 +26,7 @@ LDADD = \ $(EMPATHY_LIBS) \ $(YELL_LIBS) \ $(LIBCHAMPLAIN_LIBS) \ - $(WEBKIT_LIBS) + $(NULL) noinst_LTLIBRARIES = libempathy-accounts-common.la @@ -47,7 +46,6 @@ libempathy_accounts_common_la_LIBADD = \ $(EDS_LIBS) \ $(EMPATHY_LIBS) \ $(LIBCHAMPLAIN_LIBS) \ - $(WEBKIT_LIBS) \ $(NULL) if HAVE_CONTROL_CENTER_EMBEDDING @@ -216,7 +214,6 @@ empathy_LDADD = \ $(top_builddir)/extensions/libemp-extensions.la \ $(EMPATHY_LIBS) \ $(LIBCHAMPLAIN_LIBS) \ - $(WEBKIT_LIBS) \ $(NULL) nodist_empathy_SOURCES = $(BUILT_SOURCES) diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c index c7f50dd14..9dc7f58bf 100644 --- a/src/empathy-preferences.c +++ b/src/empathy-preferences.c @@ -41,10 +41,7 @@ #include <libempathy-gtk/empathy-spell.h> #include <libempathy-gtk/empathy-contact-list-store.h> #include <libempathy-gtk/empathy-gtk-enum-types.h> - -#ifdef HAVE_WEBKIT #include <libempathy-gtk/empathy-theme-adium.h> -#endif #include "empathy-preferences.h" @@ -856,17 +853,14 @@ preferences_theme_variants_fill (EmpathyPreferences *preferences, EmpathyPreferencesPriv *priv = GET_PRIV (preferences); GtkTreeModel *model; GtkListStore *store; -#ifdef HAVE_WEBKIT GPtrArray *variants; const gchar *default_variant; guint i; -#endif /* HAVE_WEBKIT */ model = gtk_combo_box_get_model (GTK_COMBO_BOX (priv->combobox_chat_theme_variant)); store = GTK_LIST_STORE (model); gtk_list_store_clear (store); -#ifdef HAVE_WEBKIT variants = empathy_adium_info_get_available_variants (info); default_variant = empathy_adium_info_get_default_variant (info); for (i = 0; i < variants->len; i++) { @@ -877,7 +871,6 @@ preferences_theme_variants_fill (EmpathyPreferences *preferences, COL_VARIANT_DEFAULT, !tp_strdiff (name, default_variant), -1); } -#endif /* HAVE_WEBKIT */ /* Select the variant from the GSetting key */ preferences_theme_variant_notify_cb (priv->gsettings_chat, |