aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-04-23 00:59:14 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-04-23 01:15:23 +0800
commit05007fc365715586cd17d49c1c8254b267b7748b (patch)
tree9c4147148c32fba9d5afc1ddb2fe2bdf2c6c247a /libempathy-gtk
parentdb53174019108700d3e944f145c17c7ab4e623d2 (diff)
downloadgsoc2013-empathy-05007fc365715586cd17d49c1c8254b267b7748b.tar
gsoc2013-empathy-05007fc365715586cd17d49c1c8254b267b7748b.tar.gz
gsoc2013-empathy-05007fc365715586cd17d49c1c8254b267b7748b.tar.bz2
gsoc2013-empathy-05007fc365715586cd17d49c1c8254b267b7748b.tar.lz
gsoc2013-empathy-05007fc365715586cd17d49c1c8254b267b7748b.tar.xz
gsoc2013-empathy-05007fc365715586cd17d49c1c8254b267b7748b.tar.zst
gsoc2013-empathy-05007fc365715586cd17d49c1c8254b267b7748b.zip
rename button_remove to button_remove_network to fix id clash
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-account-widget-irc.c4
-rw-r--r--libempathy-gtk/empathy-account-widget-irc.ui2
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 3af842415..4546cfd23 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 b7cb79d33..bcfc67fe2 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>