factor out start_gnome_contacts()

[empathy.git] / libempathy-gtk / empathy-account-widget-local-xmpp.ui

diff --git a/libempathy-gtk/empathy-account-widget-local-xmpp.ui b/libempathy-gtk/empathy-account-widget-local-xmpp.ui
index ca633309db2f45542ebf7750f6be72776358a1d6..e5fc096701b37e4903feaa2d3405931d249dd331 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-local-xmpp.ui
+++ b/libempathy-gtk/empathy-account-widget-local-xmpp.ui
@@ -7,65 +7,50 @@
     <property name="orientation">vertical</property>
     <property name="spacing">6</property>
     <child>
-      <object class="GtkTable" id="table_common_settings">
+      <object class="GtkGrid" id="grid_common_settings">
         <property name="visible">True</property>
-        <property name="n_rows">3</property>
-        <property name="n_columns">3</property>
         <property name="column_spacing">12</property>
         <property name="row_spacing">6</property>
         <child>
           <object class="GtkEntry" id="entry_nickname">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="invisible_char">&#x25CF;</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="right_attach">3</property>
             <property name="top_attach">2</property>
-            <property name="bottom_attach">3</property>
-            <property name="y_options"></property>
           </packing>
         </child>
         <child>
           <object class="GtkEntry" id="entry_last_name">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="invisible_char">&#x25CF;</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="right_attach">3</property>
             <property name="top_attach">1</property>
-            <property name="bottom_attach">2</property>
-            <property name="y_options"></property>
           </packing>
         </child>
         <child>
           <object class="GtkEntry" id="entry_first_name">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="invisible_char">&#x25CF;</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="right_attach">3</property>
-            <property name="y_options"></property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label_nickname">
             <property name="visible">True</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Nickname:</property>
+            <property name="label" translatable="yes">Nic_kname:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">entry_nickname</property>
           </object>
           <packing>
             <property name="top_attach">2</property>
-            <property name="bottom_attach">3</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"></property>
+            <property name="left_attach">0</property>
           </packing>
         </child>
         <child>
@@ -78,9 +63,7 @@
           </object>
           <packing>
             <property name="top_attach">1</property>
-            <property name="bottom_attach">2</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"></property>
+            <property name="left_attach">0</property>
           </packing>
         </child>
         <child>
@@ -92,8 +75,7 @@
             <property name="mnemonic_widget">entry_first_name</property>
           </object>
           <packing>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"></property>
+            <property name="left_attach">0</property>
           </packing>
         </child>
       </object>
@@ -104,26 +86,21 @@
       </packing>
     </child>
     <child>
-      <object class="GtkExpander" id="expander1">
+      <object class="GtkExpander" id="expander_advanced_settings">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <child>
-          <object class="GtkTable" id="table_advanced_settings">
+          <object class="GtkGrid" id="grid_advanced_settings">
             <property name="visible">True</property>
-            <property name="n_rows">3</property>
-            <property name="n_columns">3</property>
             <property name="column_spacing">12</property>
             <property name="row_spacing">6</property>
             <child>
               <object class="GtkEntry" id="entry_published">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="invisible_char">&#x25CF;</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">3</property>
-                <property name="y_options"></property>
               </packing>
             </child>
             <child>
@@ -135,36 +112,27 @@
                 <property name="mnemonic_widget">entry_published</property>
               </object>
               <packing>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="left_attach">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkEntry" id="entry_jid">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="invisible_char">&#x25CF;</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">3</property>
                 <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="y_options"></property>
               </packing>
             </child>
             <child>
               <object class="GtkEntry" id="entry_email">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="invisible_char">&#x25CF;</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">3</property>
                 <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="y_options"></property>
               </packing>
             </child>
             <child>
@@ -177,24 +145,20 @@
               </object>
               <packing>
                 <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="left_attach">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label_email">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Email:</property>
+                <property name="label" translatable="yes">E-_mail address:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entry_email</property>
               </object>
               <packing>
                 <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="left_attach">0</property>
               </packing>
             </child>
           </object>
@@ -216,4 +180,14 @@
       </packing>
     </child>
   </object>
+  <object class="GtkSizeGroup" id="sg_field_labels">
+    <widgets>
+      <widget name="label_nickname"/>
+      <widget name="label_last_name"/>
+      <widget name="label_first_name"/>
+      <widget name="label_published"/>
+      <widget name="label_jid"/>
+      <widget name="label_email"/>
+    </widgets>
+  </object>
 </interface>