Remove obsolete contact-list-{store,view}

[empathy.git] / src / empathy-preferences.c

diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index e593c6f7673f4564a97136db14b26ca919de7a48..6775d4a245bb5f7c88a00e3a5cfe9c3abd57c6ee 100644 (file)
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -39,12 +39,8 @@
 #include <libempathy-gtk/empathy-ui-utils.h>
 #include <libempathy-gtk/empathy-theme-manager.h>
 #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"
 
@@ -86,8 +82,7 @@ struct _EmpathyPreferencesPriv {
        GtkWidget *checkbutton_notifications_contact_signin;
        GtkWidget *checkbutton_notifications_contact_signout;
 
-       GtkWidget *scale_call_volume;
-       GtkWidget *adj_call_volume;
+       GtkWidget *echo_cancellation;
 
        GtkWidget *treeview_spell_checker;
 
@@ -275,9 +270,9 @@ preferences_setup_widgets (EmpathyPreferences *preferences)
                         G_SETTINGS_BIND_DEFAULT);
 
        g_settings_bind (priv->gsettings_call,
-                        EMPATHY_PREFS_CALL_SOUND_VOLUME,
-                        priv->adj_call_volume,
-                        "value",
+                        EMPATHY_PREFS_CALL_ECHO_CANCELLATION,
+                        priv->echo_cancellation,
+                        "active",
                         G_SETTINGS_BIND_DEFAULT);
 
        g_settings_bind (priv->gsettings,
@@ -842,24 +837,23 @@ preferences_theme_variant_notify_cb (GSettings   *gsettings,
        g_free (conf_name);
 }
 
-static void
+/* return TRUE if we added at least one variant */
+static gboolean
 preferences_theme_variants_fill (EmpathyPreferences *preferences,
                                 GHashTable         *info)
 {
        EmpathyPreferencesPriv *priv = GET_PRIV (preferences);
        GtkTreeModel *model;
        GtkListStore *store;
-#ifdef HAVE_WEBKIT
        GPtrArray    *variants;
        const gchar  *default_variant;
        guint         i;
-#endif /* HAVE_WEBKIT */
+       gboolean      result = FALSE;
 
        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++) {
@@ -869,13 +863,16 @@ preferences_theme_variants_fill (EmpathyPreferences *preferences,
                        COL_VARIANT_NAME, name,
                        COL_VARIANT_DEFAULT, !tp_strdiff (name, default_variant),
                        -1);
+
+               result = TRUE;
        }
-#endif /* HAVE_WEBKIT */
 
        /* Select the variant from the GSetting key */
        preferences_theme_variant_notify_cb (priv->gsettings_chat,
                                             EMPATHY_PREFS_CHAT_THEME_VARIANT,
                                             preferences);
+
+       return result;
 }
 
 static void
@@ -943,11 +940,14 @@ preferences_theme_changed_cb (GtkComboBox        *combo,
                                       EMPATHY_PREFS_CHAT_THEME,
                                       name);
                if (is_adium) {
+                       gboolean variant;
+
                        g_settings_set_string (priv->gsettings_chat,
                                               EMPATHY_PREFS_CHAT_ADIUM_PATH,
                                               path);
-                       preferences_theme_variants_fill (preferences, info);
-                       gtk_widget_show (priv->hbox_chat_theme_variant);
+
+                       variant = preferences_theme_variants_fill (preferences, info);
+                       gtk_widget_set_visible (priv->hbox_chat_theme_variant, variant);
                } else {
                        gtk_widget_hide (priv->hbox_chat_theme_variant);
                }
@@ -1099,13 +1099,6 @@ preferences_themes_setup (EmpathyPreferences *preferences)
                          preferences);
 }
 
-static gchar*
-preferences_call_format_volume_cb (GtkScale *scale,
-                                  gdouble value)
-{
-       return g_strdup_printf ("%g%%", value);
-}
-
 static void
 empathy_preferences_response (GtkDialog *widget,
                              gint response)
@@ -1195,8 +1188,7 @@ empathy_preferences_init (EmpathyPreferences *preferences)
                "checkbutton_location_resource_network", &priv->checkbutton_location_resource_network,
                "checkbutton_location_resource_cell", &priv->checkbutton_location_resource_cell,
                "checkbutton_location_resource_gps", &priv->checkbutton_location_resource_gps,
-               "call_volume_scale", &priv->scale_call_volume,
-               "call_volume_adjustment", &priv->adj_call_volume,
+               "call_echo_cancellation", &priv->echo_cancellation,
                NULL);
        g_free (filename);
 
@@ -1221,10 +1213,6 @@ empathy_preferences_init (EmpathyPreferences *preferences)
                          preferences, 0);
        preferences_preview_theme_changed_cb (priv->theme_manager, preferences);
 
-       g_signal_connect (priv->scale_call_volume, "format-value",
-                         G_CALLBACK (preferences_call_format_volume_cb),
-                         preferences);
-
        preferences_themes_setup (preferences);
 
        preferences_setup_widgets (preferences);
@@ -1273,9 +1261,12 @@ empathy_preferences_tab_to_string (EmpathyPreferencesTab tab)
 }
 
 GtkWidget *
-empathy_preferences_new (GtkWindow *parent)
+empathy_preferences_new (GtkWindow *parent,
+                         gboolean  shell_running)
 {
-       GtkWidget *self;
+       GtkWidget              *self;
+       EmpathyPreferencesPriv *priv;
+       GtkWidget              *notif_page;
 
        g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), NULL);
 
@@ -1286,6 +1277,19 @@ empathy_preferences_new (GtkWindow *parent)
                                              parent);
        }
 
+       /* when running in Gnome Shell we must hide these options since they
+        * are meaningless in that context:
+        * - 'Display incoming events in the notification area' (General->Behavior)
+        * - 'Notifications' tab
+        */
+       priv = GET_PRIV (self);
+       if (shell_running) {
+               gtk_widget_hide (priv->checkbutton_events_notif_area);
+               notif_page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook),
+                                                       EMPATHY_PREFERENCES_TAB_NOTIFICATIONS);
+               gtk_widget_hide (notif_page);
+       }
+
        return self;
 }