Added a preference in the conf and schema (show contact list in rooms)

diff --git a/data/empathy.schemas.in b/data/empathy.schemas.in
index 81ea5e864ff6e07df5864661d8f124a5b9cf0017..57944b75e6a1c07b870d6b54dffc2697ccf94255 100644 (file)
--- a/data/empathy.schemas.in
+++ b/data/empathy.schemas.in
@@ -288,6 +288,20 @@
          </long>
       </locale>
     </schema>
+    
+    <schema>
+      <key>/schemas/apps/empathy/conversation/show_contacts_in_rooms</key>
+      <applyto>/apps/empathy/conversation/show_contacts_in_rooms</applyto>
+      <owner>empathy</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+         <short>Show contact list in rooms</short>
+         <long>
+         Whether or not to show the contact list in chat rooms.
+         </long>
+      </locale>
+    </schema>
 
     <schema>
       <key>/schemas/apps/empathy/conversation/theme</key>

diff --git a/libempathy-gtk/empathy-conf.h b/libempathy-gtk/empathy-conf.h
index 47949139e67ddbd2ff141e41e9191f9bba674273..e40c2283d834048cc33480afc7196b73ace1d09a 100644 (file)
--- a/libempathy-gtk/empathy-conf.h
+++ b/libempathy-gtk/empathy-conf.h
@@ -59,6 +59,7 @@ struct _EmpathyConfClass {
 #define EMPATHY_PREFS_SOUNDS_CONTACT_LOGOUT        EMPATHY_PREFS_PATH "/sounds/sounds_contact_logout"
 #define EMPATHY_PREFS_POPUPS_WHEN_AVAILABLE        EMPATHY_PREFS_PATH "/notifications/popups_when_available"
 #define EMPATHY_PREFS_CHAT_SHOW_SMILEYS            EMPATHY_PREFS_PATH "/conversation/graphical_smileys"
+#define EMPATHY_PREFS_CHAT_SHOW_CONTACTS_IN_ROOMS  EMPATHY_PREFS_PATH "/conversation/show_contacts_in_rooms"
 #define EMPATHY_PREFS_CHAT_THEME                   EMPATHY_PREFS_PATH "/conversation/theme"
 #define EMPATHY_PREFS_CHAT_ADIUM_PATH              EMPATHY_PREFS_PATH "/conversation/adium_path"
 #define EMPATHY_PREFS_CHAT_SPELL_CHECKER_LANGUAGES EMPATHY_PREFS_PATH "/conversation/spell_checker_languages"

diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 4c88db675b528a258cfa0a11567bf023e2942252..30466193bef71325035601434b909de1c9175ad5 100644 (file)
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -52,6 +52,7 @@ typedef struct {
        GtkWidget *checkbutton_show_avatars;
        GtkWidget *checkbutton_compact_contact_list;
        GtkWidget *checkbutton_show_smileys;
+       GtkWidget *checkbutton_show_contacts_in_rooms;
        GtkWidget *combobox_chat_theme;
        GtkWidget *hbox_adium_theme;
        GtkWidget *filechooserbutton_adium_theme;
@@ -236,6 +237,10 @@ preferences_setup_widgets (EmpathyPreferences *preferences)
        preferences_hookup_toggle_button (preferences,
                                          EMPATHY_PREFS_CHAT_SHOW_SMILEYS,
                                          preferences->checkbutton_show_smileys);
+                                         
+       preferences_hookup_toggle_button (preferences,
+                                         EMPATHY_PREFS_CHAT_SHOW_CONTACTS_IN_ROOMS,
+                                         preferences->checkbutton_show_contacts_in_rooms);
 
        preferences_hookup_radio_button (preferences,
                                         EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM,
@@ -1190,6 +1195,7 @@ empathy_preferences_show (GtkWindow *parent)
                "checkbutton_show_avatars", &preferences->checkbutton_show_avatars,
                "checkbutton_compact_contact_list", &preferences->checkbutton_compact_contact_list,
                "checkbutton_show_smileys", &preferences->checkbutton_show_smileys,
+               "checkbutton_show_contacts_in_rooms", &preferences->checkbutton_show_contacts_in_rooms,
                "combobox_chat_theme", &preferences->combobox_chat_theme,
                "hbox_adium_theme", &preferences->hbox_adium_theme,
                "filechooserbutton_adium_theme", &preferences->filechooserbutton_adium_theme,