From 05007fc365715586cd17d49c1c8254b267b7748b Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed, 22 Apr 2009 17:59:14 +0100
Subject: [PATCH] rename button_remove to button_remove_network to fix id clash

---
 libempathy-gtk/empathy-account-widget-irc.c  | 4 ++--
 libempathy-gtk/empathy-account-widget-irc.ui | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c
index 3af84241..4546cfd2 100644
--- 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,
-      "button_remove", &settings->button_remove,
+      "button_remove_network", &settings->button_remove,
       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,
-      "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 b7cb79d3..bcfc67fe 100644
--- a/libempathy-gtk/empathy-account-widget-irc.ui
+++ b/libempathy-gtk/empathy-account-widget-irc.ui
@@ -417,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>
-- 
2.39.2