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 3eb9e608dbc49e1f788f64f37b6970795f0a1ef7..6775d4a245bb5f7c88a00e3a5cfe9c3abd57c6ee 100644 (file)
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -39,7 +39,6 @@
 #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>
 #include <libempathy-gtk/empathy-theme-adium.h>
 
@@ -83,8 +82,6 @@ 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;
@@ -272,12 +269,6 @@ preferences_setup_widgets (EmpathyPreferences *preferences)
                         "active",
                         G_SETTINGS_BIND_DEFAULT);
 
-       g_settings_bind (priv->gsettings_call,
-                        EMPATHY_PREFS_CALL_SOUND_VOLUME,
-                        priv->adj_call_volume,
-                        "value",
-                        G_SETTINGS_BIND_DEFAULT);
-
        g_settings_bind (priv->gsettings_call,
                         EMPATHY_PREFS_CALL_ECHO_CANCELLATION,
                         priv->echo_cancellation,
@@ -1108,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)
@@ -1162,8 +1146,6 @@ empathy_preferences_init (EmpathyPreferences *preferences)
        GtkBuilder                *gui;
        gchar                     *filename;
        GtkWidget                 *page;
-       GtkWidget                 *call_volume_scale_box;
-       GtkWidget                 *call_volume_bar_box;
 
        priv = preferences->priv = G_TYPE_INSTANCE_GET_PRIVATE (preferences,
                        EMPATHY_TYPE_PREFERENCES, EmpathyPreferencesPriv);
@@ -1206,10 +1188,6 @@ 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_box", &call_volume_scale_box,
-               "call_volume_bar_box", &call_volume_bar_box,
-               "call_volume_scale", &priv->scale_call_volume,
-               "call_volume_adjustment", &priv->adj_call_volume,
                "call_echo_cancellation", &priv->echo_cancellation,
                NULL);
        g_free (filename);
@@ -1235,15 +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);
-
-#ifndef HAVE_CALL
-       gtk_widget_hide (call_volume_scale_box);
-       gtk_widget_hide (call_volume_bar_box);
-#endif
-
        preferences_themes_setup (preferences);
 
        preferences_setup_widgets (preferences);