diff options
| -rw-r--r-- | libempathy-gtk/empathy-account-widget-skype.c | 15 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-account-widget-skype.ui | 113 |
2 files changed, 4 insertions, 124 deletions
diff --git a/libempathy-gtk/empathy-account-widget-skype.c b/libempathy-gtk/empathy-account-widget-skype.c index 9d0ae7ccb..dcbef165f 100644 --- a/libempathy-gtk/empathy-account-widget-skype.c +++ b/libempathy-gtk/empathy-account-widget-skype.c @@ -409,20 +409,7 @@ empathy_account_widget_build_skype (EmpathyAccountWidget *self, { EmpathyAccountWidgetPriv *priv = GET_PRIV (self); - if (priv->simple) - { - self->ui_details->gui = empathy_builder_get_file (filename, - "vbox_skype_simple", &self->ui_details->widget, - NULL); - - empathy_account_widget_handle_params (self, - "entry_id_simple", "account", - "entry_password_simple", "password", - NULL); - - self->ui_details->default_focus = g_strdup ("entry_id_simple"); - } - else if (priv->creating_account) + if (priv->simple || priv->creating_account) { /* if we don't have an account it means we're doing the initial setup */ self->ui_details->gui = empathy_builder_get_file (filename, diff --git a/libempathy-gtk/empathy-account-widget-skype.ui b/libempathy-gtk/empathy-account-widget-skype.ui index b89c82e0c..4d2cfebc7 100644 --- a/libempathy-gtk/empathy-account-widget-skype.ui +++ b/libempathy-gtk/empathy-account-widget-skype.ui @@ -106,113 +106,6 @@ Get one at <a href="http://www.skype.com/go/register">Skype.com</a>< </packing> </child> </object> - <object class="GtkVBox" id="vbox_skype_simple"> - <property name="visible">True</property> - <property name="border_width">6</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label_id_simple"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">What is your Skype Name?</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkAlignment" id="alignment3"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xscale">0.34999999403953552</property> - <property name="yscale">0.34999999403953552</property> - <property name="bottom_padding">3</property> - <property name="left_padding">12</property> - <child> - <object class="GtkVBox" id="vbox1"> - <property name="visible">True</property> - <property name="spacing">4</property> - <child> - <object class="GtkEntry" id="entry_id_simple"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label_example"> - <property name="visible">True</property> - <property name="xalign">0.10000000149011612</property> - <property name="label" translatable="yes">Don't have a Skype Name? -Get one at <a href="http://www.skype.com/go/register">Skype.com</a></property> - <property name="use_markup">True</property> - <attributes> - <attribute name="scale" value="0.800000"/> - </attributes> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label_password_simple"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">What is your Skype password?</property> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkAlignment" id="alignment2"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xscale">0.34999999403953552</property> - <property name="yscale">0.34999999403953552</property> - <property name="left_padding">12</property> - <child> - <object class="GtkVBox" id="vbox2"> - <property name="visible">True</property> - <child> - <object class="GtkEntry" id="entry_password_simple"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="visibility">False</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label9"> - <property name="visible">True</property> - <property name="label" translatable="yes"><a href="https://login.skype.com/account/password-reset-request">Forgotten your password?</a></property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - <packing> - <property name="position">3</property> - </packing> - </child> - </object> <object class="GtkDialog" id="privacy-settings-dialog"> <property name="resizable">False</property> <property name="modal">True</property> @@ -534,9 +427,6 @@ Get one at <a href="http://www.skype.com/go/register">Skype.com</a>< </packing> </child> <child> - <placeholder/> - </child> - <child> <object class="GtkLinkButton" id="linkbutton2"> <property name="label" translatable="yes">Change Password...</property> <property name="visible">True</property> @@ -553,6 +443,9 @@ Get one at <a href="http://www.skype.com/go/register">Skype.com</a>< <property name="x_options">GTK_FILL</property> </packing> </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> |