fix show_offline gconf key (#616267)

The key is /ui/show_offline not /contacts/show_offline

diff --git a/libempathy-gtk/empathy-conf.h b/libempathy-gtk/empathy-conf.h
index 78d0bbd679ec105e5d046d9a2322cf3aaf561aa5..c418bb116d3d4d99a4fed351b5547b8713bf6ffc 100644 (file)
--- a/libempathy-gtk/empathy-conf.h
+++ b/libempathy-gtk/empathy-conf.h
@@ -76,7 +76,7 @@ struct _EmpathyConfClass {
 #define EMPATHY_PREFS_UI_SHOW_PROTOCOLS            EMPATHY_PREFS_PATH "/ui/show_protocols"
 #define EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST      EMPATHY_PREFS_PATH "/ui/compact_contact_list"
 #define EMPATHY_PREFS_UI_CHAT_WINDOW_PANED_POS     EMPATHY_PREFS_PATH "/ui/chat_window_paned_pos"
-#define EMPATHY_PREFS_CONTACTS_SHOW_OFFLINE        EMPATHY_PREFS_PATH "/contacts/show_offline"
+#define EMPATHY_PREFS_UI_SHOW_OFFLINE              EMPATHY_PREFS_PATH "/ui/show_offline"
 #define EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM      EMPATHY_PREFS_PATH "/contacts/sort_criterium"
 #define EMPATHY_PREFS_HINTS_CLOSE_MAIN_WINDOW      EMPATHY_PREFS_PATH "/hints/close_main_window"
 #define EMPATHY_PREFS_USE_CONN                     EMPATHY_PREFS_PATH "/use_conn"

diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 3d367df68c8fd55fe2b25acb4104ee315fbf7d5d..51d0ec9efd4f665bea97f1fa8f57b65a447678ba 100644 (file)
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -733,7 +733,7 @@ main_window_view_show_offline_cb (GtkToggleAction   *action,
 
        current = gtk_toggle_action_get_active (action);
        empathy_conf_set_bool (empathy_conf_get (),
-                             EMPATHY_PREFS_CONTACTS_SHOW_OFFLINE,
+                             EMPATHY_PREFS_UI_SHOW_OFFLINE,
                              current);
 
        /* Turn off sound just while we alter the contact list. */
@@ -1502,10 +1502,10 @@ empathy_main_window_show (void)
 
        /* Show offline ? */
        empathy_conf_get_bool (conf,
-                             EMPATHY_PREFS_CONTACTS_SHOW_OFFLINE,
+                             EMPATHY_PREFS_UI_SHOW_OFFLINE,
                              &show_offline);
        empathy_conf_notify_add (conf,
-                               EMPATHY_PREFS_CONTACTS_SHOW_OFFLINE,
+                               EMPATHY_PREFS_UI_SHOW_OFFLINE,
                                main_window_notify_show_offline_cb,
                                show_offline_widget);