[empathy] Don't try to access empathy_adium_info_* stuff when webkit support is disabled
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Don't try to access empathy_adium_info_* stuff when webkit support is disabled
- Date: Thu, 23 Jun 2011 08:16:28 +0000 (UTC)
commit 5e4bdbca5400a13e65e8b821562e3f8538516272
Author: Marc-Antoine Perennou <Marc-Antoine Perennou com>
Date: Wed Jun 22 21:08:48 2011 +0200
Don't try to access empathy_adium_info_* stuff when webkit support is disabled
empathy-preferences.c:(.text+0x5dc): undefined reference to `empathy_adium_info_get_available_variants'
empathy-preferences.c:(.text+0x5e9): undefined reference to `empathy_adium_info_get_default_variant'
src/empathy-preferences.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 9aa21e8..9db4739 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -828,14 +828,17 @@ 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++) {
@@ -846,6 +849,7 @@ 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,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]