From b7a0aba3e792edcbd753b721aa9600f56b95a754 Mon Sep 17 00:00:00 2001
From: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Tue, 29 May 2012 17:21:33 +1000
Subject: account-widget: support for account widget generic

---
 libempathy-gtk/empathy-account-widget-generic.ui | 74 +++++++++++++++++++++---
 libempathy-gtk/empathy-account-widget.c          |  6 +-
 2 files changed, 71 insertions(+), 9 deletions(-)

diff --git a/libempathy-gtk/empathy-account-widget-generic.ui b/libempathy-gtk/empathy-account-widget-generic.ui
index 0ddfec689..c37da5e01 100644
--- a/libempathy-gtk/empathy-account-widget-generic.ui
+++ b/libempathy-gtk/empathy-account-widget-generic.ui
@@ -1,16 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkVBox" id="vbox_generic_settings">
     <property name="visible">True</property>
-    <property name="orientation">vertical</property>
+    <property name="can_focus">False</property>
     <property name="spacing">6</property>
     <child>
       <object class="GtkGrid" id="grid_common_settings">
         <property name="visible">True</property>
-        <property name="column_spacing">12</property>
+        <property name="can_focus">False</property>
         <property name="row_spacing">6</property>
+        <property name="column_spacing">12</property>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -24,20 +51,50 @@
         <property name="can_focus">True</property>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow1">
+            <property name="height_request">150</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="hscrollbar_policy">never</property>
-            <property name="vscrollbar_policy">automatic</property>
             <property name="shadow_type">in</property>
             <child>
               <object class="GtkViewport" id="viewport1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="border_width">6</property>
                 <property name="resize_mode">queue</property>
                 <child>
                   <object class="GtkGrid" id="grid_advanced_settings">
                     <property name="visible">True</property>
-                    <property name="column_spacing">12</property>
+                    <property name="can_focus">False</property>
                     <property name="row_spacing">6</property>
+                    <property name="column_spacing">12</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </object>
                 </child>
               </object>
@@ -47,6 +104,7 @@
         <child type="label">
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Advanced</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -55,6 +113,8 @@
         </child>
       </object>
       <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
         <property name="position">1</property>
       </packing>
     </child>
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index 96e6a8868..014d5a3db 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -762,9 +762,11 @@ accounts_widget_generic_setup (EmpathyAccountWidget *self,
         {
           gchar *str;
 
-          str = g_strdup_printf (_("%s:"), param_name_formatted);
+          str = g_strdup_printf (_("%s"), param_name_formatted);
           widget = gtk_label_new (str);
-          gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
+          gtk_misc_set_alignment (GTK_MISC (widget), 1., 0.5);
+          gtk_style_context_add_class (gtk_widget_get_style_context (widget),
+              GTK_STYLE_CLASS_DIM_LABEL);
           g_free (str);
 
           gtk_grid_attach (GTK_GRID (grid_settings),
-- 
cgit v1.2.3