From: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date: Mon, 19 Aug 2013 16:07:11 +0000 (+0200)
Subject: preferences: only show autoconnect when shell isn't running
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=8da5fa02e056fb702e9dcc0fee38fa85ef008538

preferences: only show autoconnect when shell isn't running

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

diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 6901aa9c..b5e02b65 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -56,7 +56,9 @@ static const gchar * empathy_preferences_tabs[] =
 struct _EmpathyPreferencesPriv {
 	GtkWidget *notebook;
 
+	GtkWidget *label_general_behavior;
 	GtkWidget *checkbutton_events_notif_area;
+	GtkWidget *checkbutton_autoconnect;
 
 	GtkWidget *treeview_sounds;
 	GtkWidget *treeview_spell_checker;
@@ -1034,9 +1036,11 @@ empathy_preferences_init (EmpathyPreferences *preferences)
 		"combobox_chat_theme_variant", &priv->combobox_chat_theme_variant,
 		"hbox_chat_theme_variant", &priv->hbox_chat_theme_variant,
 		"sw_chat_theme_preview", &priv->sw_chat_theme_preview,
-		"checkbutton_events_notif_area", &priv->checkbutton_events_notif_area,
 		"treeview_sounds", &priv->treeview_sounds,
 		"treeview_spell_checker", &priv->treeview_spell_checker,
+		"label_general_behavior", &priv->label_general_behavior,
+		"checkbutton_events_notif_area", &priv->checkbutton_events_notif_area,
+		"checkbutton_autoconnect", &priv->checkbutton_autoconnect,
 		NULL);
 	g_free (filename);
 
@@ -1127,12 +1131,19 @@ empathy_preferences_new (GtkWindow *parent,
 
 	/* when running in Gnome Shell we must hide these options since they
 	 * are meaningless in that context:
+	 * - General->Behavior label
 	 * - 'Display incoming events in the notification area' (General->Behavior)
+	 * - 'Automatically connect at startup' (General->Behavior)
 	 * - 'Notifications' tab
 	 */
 	priv = GET_PRIV (self);
 	if (shell_running) {
+		/* Behavior */
+		gtk_widget_hide (priv->label_general_behavior);
 		gtk_widget_hide (priv->checkbutton_events_notif_area);
+		gtk_widget_hide (priv->checkbutton_autoconnect);
+
+		/* Notifications tab */
 		notif_page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook),
 		                                        EMPATHY_PREFERENCES_TAB_NOTIFICATIONS);
 		gtk_widget_hide (notif_page);
diff --git a/src/empathy-preferences.ui b/src/empathy-preferences.ui
index a54dcd22..6e146d35 100644
--- a/src/empathy-preferences.ui
+++ b/src/empathy-preferences.ui
@@ -303,7 +303,7 @@
               </object>
             </child>
             <child type="label">
-              <object class="GtkLabel" id="label612">
+              <object class="GtkLabel" id="label_general_behavior">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Behavior</property>