diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2013-08-20 00:07:11 +0800 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2013-08-20 16:06:55 +0800 |
| commit | 8da5fa02e056fb702e9dcc0fee38fa85ef008538 (patch) | |
| tree | d64f94fdb35a443b9c92a79f1e497e9d4923d289 | |
| parent | ceb440fa6973252ad44d6f4913fa1bf22dd58a89 (diff) | |
| download | gsoc2013-empathy-8da5fa02e056fb702e9dcc0fee38fa85ef008538.tar gsoc2013-empathy-8da5fa02e056fb702e9dcc0fee38fa85ef008538.tar.gz gsoc2013-empathy-8da5fa02e056fb702e9dcc0fee38fa85ef008538.tar.bz2 gsoc2013-empathy-8da5fa02e056fb702e9dcc0fee38fa85ef008538.tar.lz gsoc2013-empathy-8da5fa02e056fb702e9dcc0fee38fa85ef008538.tar.xz gsoc2013-empathy-8da5fa02e056fb702e9dcc0fee38fa85ef008538.tar.zst gsoc2013-empathy-8da5fa02e056fb702e9dcc0fee38fa85ef008538.zip | |
preferences: only show autoconnect when shell isn't running
https://bugzilla.gnome.org/show_bug.cgi?id=701392
| -rw-r--r-- | src/empathy-preferences.c | 13 | ||||
| -rw-r--r-- | src/empathy-preferences.ui | 2 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c index 6901aa9c8..b5e02b650 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 a54dcd22d..6e146d35c 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> |