remove deprecated gsettings keys

Those are not supported by the new roster UI and so can be removed.

https://bugzilla.gnome.org/show_bug.cgi?id=677949

2 files changed, 0 insertions, 120 deletions

diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index c72c6ae61..923bef0e9 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -86,7 +86,6 @@ struct _EmpathyPreferencesPriv {
 	GSettings *gsettings_sound;
 	GSettings *gsettings_ui;
 	GSettings *gsettings_logger;
-	GSettings *gsettings_contacts;
 };
 
 static void     preferences_setup_widgets                (EmpathyPreferences      *preferences,
@@ -152,36 +151,6 @@ static SoundEventEntry sound_entries [] = {
 	{ N_("Account disconnected"), EMPATHY_PREFS_SOUNDS_SERVICE_LOGOUT }
 };
 
-static gboolean
-sort_criterium_get_mapping (GValue *value,
-			    GVariant *variant,
-			    gpointer user_data)
-{
-	const char *s = g_variant_get_string (variant, NULL);
-
-	if (!tp_strdiff (s, "state"))
-		g_value_set_boolean (value, TRUE);
-	else if (!tp_strdiff (s, "name"))
-		g_value_set_boolean (value, FALSE);
-	else
-		return FALSE;
-
-	return TRUE;
-}
-
-static GVariant *
-sort_criterium_set_mapping (const GValue *value,
-			    const GVariantType *expected_type,
-			    gpointer user_data)
-{
-	gboolean b = g_value_get_boolean (value);
-
-	if (b)
-		return g_variant_new_string ("state");
-	else
-		return g_variant_new_string ("name");
-}
-
 static void
 preferences_setup_widgets (EmpathyPreferences *preferences,
 			   GtkBuilder *gui)
@@ -210,8 +179,6 @@ preferences_setup_widgets (EmpathyPreferences *preferences,
 
 	BIND_ACTIVE (ui, UI_SHOW_OFFLINE,
 		     "checkbutton_show_offline");
-	BIND_ACTIVE (ui, UI_SHOW_PROTOCOLS,
-		     "checkbutton_show_protocols");
 	BIND_ACTIVE (ui, UI_SEPARATE_CHAT_WINDOWS,
 		     "radiobutton_chats_new_windows");
 	BIND_ACTIVE (ui, UI_EVENTS_NOTIFY_AREA,
@@ -280,16 +247,6 @@ preferences_setup_widgets (EmpathyPreferences *preferences,
 				 		 "checkbutton_autoconnect"),
 			 "active",
 			 G_SETTINGS_BIND_DEFAULT);
-
-	g_settings_bind_with_mapping (priv->gsettings_contacts,
-			 EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM,
-			 gtk_builder_get_object (gui,
-				 		 "radiobutton_sort_by_status"),
-			 "active",
-			 G_SETTINGS_BIND_DEFAULT,
-			 sort_criterium_get_mapping,
-			 sort_criterium_set_mapping,
-			 NULL, NULL);
 }
 
 static void
@@ -1075,7 +1032,6 @@ empathy_preferences_finalize (GObject *self)
 	g_object_unref (priv->gsettings_sound);
 	g_object_unref (priv->gsettings_ui);
 	g_object_unref (priv->gsettings_logger);
-	g_object_unref (priv->gsettings_contacts);
 
 	G_OBJECT_CLASS (empathy_preferences_parent_class)->finalize (self);
 }
@@ -1140,7 +1096,6 @@ empathy_preferences_init (EmpathyPreferences *preferences)
 	priv->gsettings_sound = g_settings_new (EMPATHY_PREFS_SOUNDS_SCHEMA);
 	priv->gsettings_ui = g_settings_new (EMPATHY_PREFS_UI_SCHEMA);
 	priv->gsettings_logger = g_settings_new (EMPATHY_PREFS_LOGGER_SCHEMA);
-	priv->gsettings_contacts = g_settings_new (EMPATHY_PREFS_CONTACTS_SCHEMA);
 
 	/* Create chat theme preview, and track changes */
 	priv->theme_manager = empathy_theme_manager_dup_singleton ();
diff --git a/src/empathy-preferences.ui b/src/empathy-preferences.ui
index a17f00055..4b80b0f95 100644
--- a/src/empathy-preferences.ui
+++ b/src/empathy-preferences.ui
@@ -45,22 +45,6 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="checkbutton_show_protocols">
-                        <property name="label" translatable="yes">Show protocol in avatar</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
                       <object class="GtkCheckButton" id="checkbutton_show_balances">
                         <property name="label" translatable="yes">Show account balances</property>
                         <property name="visible">True</property>
@@ -76,65 +60,6 @@
                         <property name="position">2</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkBox" id="box3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">3</property>
-                        <child>
-                          <object class="GtkLabel" id="label9">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Sort contacts by:</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkRadioButton" id="radiobutton_sort_by_status">
-                            <property name="label" translatable="yes">status</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="xalign">0</property>
-                            <property name="active">True</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkRadioButton" id="radiobutton_sort_by_name">
-                            <property name="label" translatable="yes">name</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="xalign">0</property>
-                            <property name="active">True</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">radiobutton_sort_by_status</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
                   </object>
                 </child>
               </object>