Merge branch 'irc-dialog-579800'

diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c
index 3af842415ec219a1e41b4298d86cb05f47408f0b..cc86a5aaa44d539c6c270d7c5632afc574d0b0d3 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-irc.c
+++ b/libempathy-gtk/empathy-account-widget-irc.c
@@ -50,9 +50,6 @@ typedef struct {
   GtkWidget *vbox_settings;
 
   GtkWidget *combobox_network;
-  GtkWidget *button_add_network;
-  GtkWidget *button_network;
-  GtkWidget *button_remove;
 } EmpathyAccountWidgetIrc;
 
 enum {
@@ -462,9 +459,6 @@ empathy_account_widget_irc_new (McAccount *account)
   gui = empathy_builder_get_file (filename,
       "vbox_irc_settings", &settings->vbox_settings,
       "combobox_network", &settings->combobox_network,
-      "button_network", &settings->button_network,
-      "button_add_network", &settings->button_add_network,
-      "button_remove", &settings->button_remove,
       NULL);
   g_free (filename);
 
@@ -501,7 +495,7 @@ empathy_account_widget_irc_new (McAccount *account)
       "vbox_irc_settings", "destroy", account_widget_irc_destroy_cb,
       "button_network", "clicked", account_widget_irc_button_edit_network_clicked_cb,
       "button_add_network", "clicked", account_widget_irc_button_add_network_clicked_cb,
-      "button_remove", "clicked", account_widget_irc_button_remove_clicked_cb,
+      "button_remove_network", "clicked", account_widget_irc_button_remove_clicked_cb,
       "combobox_network", "changed", account_widget_irc_combobox_network_changed_cb,
       NULL);
 

diff --git a/libempathy-gtk/empathy-account-widget-irc.ui b/libempathy-gtk/empathy-account-widget-irc.ui
index f499866ebe3c9aec740e5ce50e25824977a1b708..76c67f711719697245643c28da0a7e3e8a44a170 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-irc.ui
+++ b/libempathy-gtk/empathy-account-widget-irc.ui
@@ -3,7 +3,6 @@
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="irc_network_dialog">
-    <property name="visible">True</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Network</property>
     <property name="window_position">center-on-parent</property>
@@ -418,7 +417,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkButton" id="button_remove">
+          <object class="GtkButton" id="button_remove_network">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -444,7 +443,7 @@
       </packing>
     </child>
     <child>
-      <object class="GtkLabel" id="label_network">
+      <object class="GtkLabel" id="label_network2">
         <property name="visible">True</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes">Network:</property>

diff --git a/libempathy-gtk/empathy-irc-network-dialog.c b/libempathy-gtk/empathy-irc-network-dialog.c
index 89ee5b2847388970f8c35552b2532d522de832f3..8f7f47bdaab81c1f0da9eeebad788e7c1fa1d819 100644 (file)
--- a/libempathy-gtk/empathy-irc-network-dialog.c
+++ b/libempathy-gtk/empathy-irc-network-dialog.c
@@ -572,6 +572,7 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network,
   gtk_window_set_modal (GTK_WINDOW (dialog->dialog), TRUE);
 
   irc_network_dialog_network_update_buttons (dialog);
+  gtk_widget_show_all (dialog->dialog);
 
   return dialog->dialog;
 }