rename button_remove to button_remove_network to fix id clash

diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c
index 3af842415ec219a1e41b4298d86cb05f47408f0b..4546cfd233898320eab172f1c5000614eaed159f 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-irc.c
+++ b/libempathy-gtk/empathy-account-widget-irc.c
@@ -464,7 +464,7 @@ empathy_account_widget_irc_new (McAccount *account)
       "combobox_network", &settings->combobox_network,
       "button_network", &settings->button_network,
       "button_add_network", &settings->button_add_network,
       "combobox_network", &settings->combobox_network,
       "button_network", &settings->button_network,
       "button_add_network", &settings->button_add_network,

-      "button_remove", &settings->button_remove,
+      "button_remove_network", &settings->button_remove,

       NULL);
   g_free (filename);
 
       NULL);
   g_free (filename);
 


@@ -501,7 +501,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,
       "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);
 
       "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 b7cb79d335c981da8e9e5d54587a65e362f7c8b2..bcfc67fe264e0425a653ce9e7af4981dbfa421ef 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-irc.ui
+++ b/libempathy-gtk/empathy-account-widget-irc.ui
@@ -417,7 +417,7 @@
           </packing>
         </child>
         <child>
           </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>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>