aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-preferences.c
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2007-12-06 23:49:12 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2007-12-06 23:49:12 +0800
commit5cf3bfdf8d8e5d61ce10b2c04e467375ddac7740 (patch)
tree34d7e149e7420388625f53717f95a4c460166191 /libempathy-gtk/empathy-preferences.c
parente0de4a5f2a254beef02021573c57543dfd33311f (diff)
downloadgsoc2013-empathy-5cf3bfdf8d8e5d61ce10b2c04e467375ddac7740.tar
gsoc2013-empathy-5cf3bfdf8d8e5d61ce10b2c04e467375ddac7740.tar.gz
gsoc2013-empathy-5cf3bfdf8d8e5d61ce10b2c04e467375ddac7740.tar.bz2
gsoc2013-empathy-5cf3bfdf8d8e5d61ce10b2c04e467375ddac7740.tar.lz
gsoc2013-empathy-5cf3bfdf8d8e5d61ce10b2c04e467375ddac7740.tar.xz
gsoc2013-empathy-5cf3bfdf8d8e5d61ce10b2c04e467375ddac7740.tar.zst
gsoc2013-empathy-5cf3bfdf8d8e5d61ce10b2c04e467375ddac7740.zip
When NM is in sleeping (=disabled) state, do just like if it was
2007-12-06 Xavier Claessens <xclaesse@gmail.com> * libempathy-gtk/empathy-preferences.c: * libempathy-gtk/empathy-preferences.glade: * libempathy/empathy-idle.c: When NM is in sleeping (=disabled) state, do just like if it was connected. Remove option from preference dialog to disabled NM support because NM can be disabled using nm-applet, but let the option in gconf, it can be useful in case of buggy NM. svn path=/trunk/; revision=469
Diffstat (limited to 'libempathy-gtk/empathy-preferences.c')
-rw-r--r--libempathy-gtk/empathy-preferences.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/libempathy-gtk/empathy-preferences.c b/libempathy-gtk/empathy-preferences.c
index 14ee8f763..a8b52954d 100644
--- a/libempathy-gtk/empathy-preferences.c
+++ b/libempathy-gtk/empathy-preferences.c
@@ -50,7 +50,6 @@ typedef struct {
GtkWidget *combobox_chat_theme;
GtkWidget *checkbutton_theme_chat_room;
GtkWidget *checkbutton_separate_chat_windows;
- GtkWidget *checkbutton_use_nm;
GtkWidget *radiobutton_contact_list_sort_by_name;
GtkWidget *radiobutton_contact_list_sort_by_state;
@@ -179,10 +178,6 @@ preferences_setup_widgets (EmpathyPreferences *preferences)
preferences->checkbutton_separate_chat_windows);
preferences_hookup_toggle_button (preferences,
- EMPATHY_PREFS_USE_NM,
- preferences->checkbutton_use_nm);
-
- preferences_hookup_toggle_button (preferences,
EMPATHY_PREFS_UI_SHOW_AVATARS,
preferences->checkbutton_show_avatars);
@@ -944,7 +939,6 @@ empathy_preferences_show (GtkWindow *parent)
"combobox_chat_theme", &preferences->combobox_chat_theme,
"checkbutton_theme_chat_room", &preferences->checkbutton_theme_chat_room,
"checkbutton_separate_chat_windows", &preferences->checkbutton_separate_chat_windows,
- "checkbutton_use_nm", &preferences->checkbutton_use_nm,
"radiobutton_contact_list_sort_by_name", &preferences->radiobutton_contact_list_sort_by_name,
"radiobutton_contact_list_sort_by_state", &preferences->radiobutton_contact_list_sort_by_state,
"checkbutton_sounds_for_messages", &preferences->checkbutton_sounds_for_messages,