From 2cf8e876c22f6f7af9aa1701061d2624cbc0b5d3 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 21 Dec 2009 16:23:20 +0000
Subject: [PATCH] remove register radio buttons in the create account frame

They should be part of the account widget as we plan to kill this frame
(#605213).
---
 src/empathy-accounts-dialog.c  |  35 ---------
 src/empathy-accounts-dialog.ui | 130 ++++++++++-----------------------
 2 files changed, 40 insertions(+), 125 deletions(-)

diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 5fb7e0b3..08adadcb 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -96,8 +96,6 @@ typedef struct {
   GtkWidget *hbox_type;
   GtkWidget *button_create;
   GtkWidget *button_back;
-  GtkWidget *radiobutton_reuse;
-  GtkWidget *radiobutton_register;
 
   GtkWidget *image_type;
   GtkWidget *label_name;
@@ -497,22 +495,6 @@ accounts_dialog_protocol_changed_cb (GtkWidget *widget,
       return;
     }
 
-#ifndef HAVE_MOBLIN
-  if (tp_connection_manager_protocol_can_register (proto) && !is_gtalk)
-    {
-      gtk_widget_show (priv->radiobutton_register);
-      gtk_widget_show (priv->radiobutton_reuse);
-    }
-  else
-    {
-      gtk_widget_hide (priv->radiobutton_register);
-      gtk_widget_hide (priv->radiobutton_reuse);
-    }
-#else
-  gtk_widget_hide (priv->radiobutton_register);
-  gtk_widget_hide (priv->radiobutton_reuse);
-#endif
-
   g_object_unref (cm);
 }
 
@@ -537,9 +519,6 @@ accounts_dialog_setup_ui_to_add_account (EmpathyAccountsDialog *dialog)
   else
     gtk_widget_hide (priv->button_back);
 
-  accounts_dialog_protocol_changed_cb (priv->radiobutton_register, dialog);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->radiobutton_reuse),
-      TRUE);
   gtk_combo_box_set_active (GTK_COMBO_BOX (priv->combobox_protocol), 0);
   gtk_widget_grab_focus (priv->combobox_protocol);
 }
@@ -1509,18 +1488,6 @@ accounts_dialog_button_create_clicked_cb (GtkWidget *button,
 
   g_free (str);
 
-#ifndef HAVE_MOBLIN
-  if (tp_connection_manager_protocol_can_register (proto))
-    {
-      gboolean active;
-
-      active = gtk_toggle_button_get_active
-        (GTK_TOGGLE_BUTTON (priv->radiobutton_register));
-      if (active)
-        empathy_account_settings_set_boolean (settings, "register", TRUE);
-    }
-#endif
-
   if (is_gtalk)
     empathy_account_settings_set_icon_name_async (settings, "im-google-talk",
         NULL, NULL);
@@ -1738,8 +1705,6 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog)
       "hbox_type", &priv->hbox_type,
       "button_create", &priv->button_create,
       "button_back", &priv->button_back,
-      "radiobutton_reuse", &priv->radiobutton_reuse,
-      "radiobutton_register", &priv->radiobutton_register,
       "image_type", &priv->image_type,
       "label_name", &priv->label_name,
       "button_add", &priv->button_add,
diff --git a/src/empathy-accounts-dialog.ui b/src/empathy-accounts-dialog.ui
index 83b61ee3..58234a6a 100644
--- a/src/empathy-accounts-dialog.ui
+++ b/src/empathy-accounts-dialog.ui
@@ -105,7 +105,7 @@
                             <property name="selectable">True</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
-                              <attribute name="scale" value="1.200000"/>
+                              <attribute name="scale" value="1,000000"/>
                             </attributes>
                           </object>
                           <packing>
@@ -172,121 +172,71 @@
                         <property name="top_padding">6</property>
                         <property name="left_padding">20</property>
                         <child>
-                          <object class="GtkVBox" id="vbox216">
+                          <object class="GtkHBox" id="hbox181">
                             <property name="visible">True</property>
-                            <property name="spacing">12</property>
+                            <property name="spacing">6</property>
                             <child>
-                              <object class="GtkVBox" id="vbox2">
+                              <object class="GtkButton" id="button_back">
+                                <property name="label">gtk-cancel</property>
                                 <property name="visible">True</property>
-                                <property name="orientation">vertical</property>
-                                <child>
-                                  <object class="GtkRadioButton" id="radiobutton_reuse">
-                                    <property name="label" translatable="yes">_Reuse an existing account</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="active">True</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkRadioButton" id="radiobutton_register">
-                                    <property name="label" translatable="yes">_Create a new account</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="active">True</property>
-                                    <property name="draw_indicator">True</property>
-                                    <property name="group">radiobutton_reuse</property>
-                                  </object>
-                                  <packing>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="use_stock">True</property>
                               </object>
                               <packing>
-                                <property name="position">2</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="pack_type">end</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHBox" id="hbox181">
+                              <object class="GtkButton" id="button_create">
                                 <property name="visible">True</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <object class="GtkButton" id="button_back">
-                                    <property name="label">gtk-cancel</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_stock">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="pack_type">end</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
                                 <child>
-                                  <object class="GtkButton" id="button_create">
+                                  <object class="GtkAlignment" id="alignment1">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
+                                    <property name="xscale">0</property>
+                                    <property name="yscale">0</property>
                                     <child>
-                                      <object class="GtkAlignment" id="alignment1">
+                                      <object class="GtkHBox" id="hbox1">
                                         <property name="visible">True</property>
-                                        <property name="xscale">0</property>
-                                        <property name="yscale">0</property>
+                                        <property name="spacing">2</property>
                                         <child>
-                                          <object class="GtkHBox" id="hbox1">
+                                          <object class="GtkImage" id="image1">
                                             <property name="visible">True</property>
-                                            <property name="spacing">2</property>
-                                            <child>
-                                              <object class="GtkImage" id="image1">
-                                                <property name="visible">True</property>
-                                                <property name="stock">gtk-new</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">False</property>
-                                                <property name="position">0</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label1">
-                                                <property name="visible">True</property>
-                                                <property name="label" translatable="yes">Cr_eate</property>
-                                                <property name="use_underline">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">False</property>
-                                                <property name="position">1</property>
-                                              </packing>
-                                            </child>
+                                            <property name="stock">gtk-new</property>
                                           </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label1">
+                                            <property name="visible">True</property>
+                                            <property name="label" translatable="yes">Cr_eate</property>
+                                            <property name="use_underline">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                            <property name="position">1</property>
+                                          </packing>
                                         </child>
                                       </object>
                                     </child>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="pack_type">end</property>
-                                    <property name="position">0</property>
-                                  </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
                                 <property name="pack_type">end</property>
-                                <property name="position">1</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                           </object>
-- 
2.39.2