Add preference to show account balances

Set this 'true' by default.

diff --git a/data/org.gnome.Empathy.gschema.xml b/data/org.gnome.Empathy.gschema.xml
index e7d045e8558a8d007fb2305283f3dab0354e48ca..49451979f38ca3389f0172378c8515cd73c4e1e4 100644 (file)
--- a/data/org.gnome.Empathy.gschema.xml
+++ b/data/org.gnome.Empathy.gschema.xml
@@ -60,7 +60,7 @@
       <description>Whether to show protocols for contacts in the contact list.</description>
     </key>
     <key name="show-balance-in-roster" type="b">
-      <default>false</default>
+      <default>true</default>
       <summary>Show Balance in contact list</summary>
       <description>Whether to show account balances in the contact list.</description>
     </key>

diff --git a/libempathy/empathy-gsettings.h b/libempathy/empathy-gsettings.h
index 2863cf9a7920e3b00f963ea343fc39eaddcf9079..4178b6728787835984f6fbdd3be10d1df3825448 100644 (file)
--- a/libempathy/empathy-gsettings.h
+++ b/libempathy/empathy-gsettings.h
@@ -76,6 +76,7 @@ G_BEGIN_DECLS
 #define EMPATHY_PREFS_UI_AVATAR_DIRECTORY          "avatar-directory"
 #define EMPATHY_PREFS_UI_SHOW_AVATARS              "show-avatars"
 #define EMPATHY_PREFS_UI_SHOW_PROTOCOLS            "show-protocols"
+#define EMPATHY_PREFS_UI_SHOW_BALANCES             "show-balance-in-roster"
 #define EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST      "compact-contact-list"
 #define EMPATHY_PREFS_UI_CHAT_WINDOW_PANED_POS     "chat-window-paned-pos"
 #define EMPATHY_PREFS_UI_SHOW_OFFLINE              "show-offline"

diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index e022221910b5794da456f479891ab3e7c066dc11..ee800543055eb220a6c53154befaab82c7380d50 100644 (file)
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -220,6 +220,8 @@ preferences_setup_widgets (EmpathyPreferences *preferences,
                     "radiobutton_normal_size_avatars");
        BIND_ACTIVE (ui, UI_COMPACT_CONTACT_LIST,
                     "radiobutton_compact_size");
+       BIND_ACTIVE (ui, UI_SHOW_BALANCES,
+                    "checkbutton_show_balances");
 
        BIND_ACTIVE (chat, CHAT_SHOW_SMILEYS,
                     "checkbutton_show_smileys");

diff --git a/src/empathy-preferences.ui b/src/empathy-preferences.ui
index 42412393f6043b599428e67aac36bf3eb81dfaf4..a06911fdae51990735067c61168c1c5dc5707366 100644 (file)
--- a/src/empathy-preferences.ui
+++ b/src/empathy-preferences.ui
@@ -60,6 +60,22 @@
                         <property name="position">1</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkCheckButton" id="checkbutton_show_balances">
+                        <property name="label" translatable="yes">Show account balances</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
                     <child>
                       <object class="GtkBox" id="box3">
                         <property name="visible">True</property>
@@ -116,7 +132,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">2</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
@@ -125,12 +141,6 @@
                         <property name="can_focus">False</property>
                         <property name="column_spacing">3</property>
                         <property name="n_columns">2</property>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
                         <child>
                           <object class="GtkLabel" id="label11">
                             <property name="visible">True</property>
@@ -201,11 +211,17 @@
                             <property name="height">1</property>
                           </packing>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">3</property>
+                        <property name="position">4</property>
                       </packing>
                     </child>
                   </object>