Another way to fix Gnome bug #613272. This puts the Advanced expander content for each of the problem protocols in a scrolled window, instead of the entire Details section.

2 files changed, 95 insertions, 112 deletions

diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 8b91d7b57..8e85a3653 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -2066,9 +2066,7 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog)
   gtk_window_set_title (GTK_WINDOW (dialog), _("Messaging and VoIP Accounts"));
   gtk_window_set_role (GTK_WINDOW (dialog), "accounts");
 
-  /* this suggested height is so that it doesn't display the vertical scroll bar
-   * in the right scrolled window unless it really needs to */
-  gtk_window_set_default_size (GTK_WINDOW (dialog), 780, 400);
+  gtk_window_set_default_size (GTK_WINDOW (dialog), 640, -1);
 
   gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
 
diff --git a/src/empathy-accounts-dialog.ui b/src/empathy-accounts-dialog.ui
index db5ec0cf1..40851ed77 100644
--- a/src/empathy-accounts-dialog.ui
+++ b/src/empathy-accounts-dialog.ui
@@ -44,7 +44,7 @@
                 <property name="homogeneous">True</property>
                 <child>
                   <object class="GtkButton" id="button_add">
-                    <property name="label" translatable="yes">_Add&#x2026;</property>
+                    <property name="label" translatable="yes">_Add…</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -75,7 +75,7 @@
             </child>
             <child>
               <object class="GtkButton" id="button_import">
-                <property name="label" translatable="yes">_Import&#x2026;</property>
+                <property name="label" translatable="yes">_Import…</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
@@ -99,124 +99,109 @@
       </packing>
     </child>
     <child>
-      <object class="GtkScrolledWindow" id="sw_details">
+      <object class="GtkVBox" id="vbox214">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="hscrollbar_policy">automatic</property>
-        <property name="vscrollbar_policy">automatic</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">18</property>
         <child>
-          <object class="GtkViewport" id="viewport_details">
+          <object class="GtkHBox" id="hbox_protocol">
             <property name="visible">True</property>
-            <property name="resize_mode">queue</property>
-            <property name="shadow_type">none</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkLabel" id="label_protocol">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Protocol:</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkVBox" id="vbox_details">
+            <property name="visible">True</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">18</property>
             <child>
-              <object class="GtkVBox" id="vbox214">
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkAlignment" id="alignment_infobar">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
-                <property name="spacing">18</property>
                 <child>
-                  <object class="GtkHBox" id="hbox_protocol">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="label_protocol">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Protocol:</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
+                  <placeholder/>
                 </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkAlignment" id="alignment_settings">
+                <property name="visible">True</property>
+                <property name="top_padding">6</property>
+                <property name="left_padding">20</property>
                 <child>
-                  <object class="GtkVBox" id="vbox_details">
-                    <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">18</property>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="alignment_infobar">
-                        <property name="visible">True</property>
-                        <child>
-                          <placeholder/>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="alignment_settings">
-                        <property name="visible">True</property>
-                        <property name="top_padding">6</property>
-                        <property name="left_padding">20</property>
-                        <child>
-                          <placeholder/>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
+                  <placeholder/>
                 </child>
+              </object>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkFrame" id="frame_no_protocol">
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
+            <child>
+              <object class="GtkAlignment" id="alignment21">
+                <property name="visible">True</property>
+                <property name="top_padding">6</property>
+                <property name="left_padding">12</property>
                 <child>
-                  <object class="GtkFrame" id="frame_no_protocol">
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <object class="GtkAlignment" id="alignment21">
-                        <property name="visible">True</property>
-                        <property name="top_padding">6</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkLabel" id="label2">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">To add a new account, you first have to install a backend for each protocol you want to use.</property>
-                            <property name="wrap">True</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label_no_protocol">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">No protocol installed</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                    </child>
+                  <object class="GtkLabel" id="label2">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">To add a new account, you first have to install a backend for each protocol you want to use.</property>
+                    <property name="wrap">True</property>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
                 </child>
               </object>
             </child>
+            <child type="label">
+              <object class="GtkLabel" id="label_no_protocol">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">No protocol installed</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </object>
+            </child>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
         </child>
       </object>
       <packing>
@@ -224,12 +209,12 @@
       </packing>
     </child>
   </object>
-  <object class="GtkImage" id="add_image">
-    <property name="visible">True</property>
-    <property name="stock">gtk-add</property>
-  </object>
   <object class="GtkImage" id="remove_image">
     <property name="visible">True</property>
     <property name="stock">gtk-remove</property>
   </object>
+  <object class="GtkImage" id="add_image">
+    <property name="visible">True</property>
+    <property name="stock">gtk-add</property>
+  </object>
 </interface>