aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2011-08-16 11:38:23 +0800
committerDanielle Madeley <danielle.madeley@collabora.co.uk>2011-08-16 11:38:23 +0800
commit6cf57d879945059cd974a3ee6d02d81edff47438 (patch)
tree04ba16a72ba34bfa0b4cee7788c2db2b5a70a43e /src
parentd5024011258a052ea3b88e95d0098f3901bb98cc (diff)
downloadgsoc2013-empathy-6cf57d879945059cd974a3ee6d02d81edff47438.tar
gsoc2013-empathy-6cf57d879945059cd974a3ee6d02d81edff47438.tar.gz
gsoc2013-empathy-6cf57d879945059cd974a3ee6d02d81edff47438.tar.bz2
gsoc2013-empathy-6cf57d879945059cd974a3ee6d02d81edff47438.tar.lz
gsoc2013-empathy-6cf57d879945059cd974a3ee6d02d81edff47438.tar.xz
gsoc2013-empathy-6cf57d879945059cd974a3ee6d02d81edff47438.tar.zst
gsoc2013-empathy-6cf57d879945059cd974a3ee6d02d81edff47438.zip
Make WebKit compulsory
It is now required for the log viewer, furthermore it will be required once we remove non-adium themes.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am5
-rw-r--r--src/empathy-preferences.c7
2 files changed, 1 insertions, 11 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 2a34494eb..bcf17de31 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
@@ -206,7 +204,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 9db4739d6..9c737b991 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"
@@ -828,17 +825,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++) {
@@ -849,7 +843,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,