aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-04-23 17:55:30 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-04-23 17:55:30 +0800
commit338d2877c0f52c69cf362ab9349d07681dafa89d (patch)
tree8dbf708a7f5f91c8e5211ca36fcbc0029a731b17
parent56beb181035248b4aff6927b3397708755ce6588 (diff)
parent2f154e3477a56517bbcbcabb6684b0989e95995e (diff)
downloadgsoc2013-empathy-338d2877c0f52c69cf362ab9349d07681dafa89d.tar
gsoc2013-empathy-338d2877c0f52c69cf362ab9349d07681dafa89d.tar.gz
gsoc2013-empathy-338d2877c0f52c69cf362ab9349d07681dafa89d.tar.bz2
gsoc2013-empathy-338d2877c0f52c69cf362ab9349d07681dafa89d.tar.lz
gsoc2013-empathy-338d2877c0f52c69cf362ab9349d07681dafa89d.tar.xz
gsoc2013-empathy-338d2877c0f52c69cf362ab9349d07681dafa89d.tar.zst
gsoc2013-empathy-338d2877c0f52c69cf362ab9349d07681dafa89d.zip
Merge branch 'irc-dialog-579800'
-rw-r--r--libempathy-gtk/empathy-account-widget-irc.c8
-rw-r--r--libempathy-gtk/empathy-account-widget-irc.ui5
-rw-r--r--libempathy-gtk/empathy-irc-network-dialog.c1
3 files changed, 4 insertions, 10 deletions
diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c
index 3af842415..cc86a5aaa 100644
--- 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 f499866eb..76c67f711 100644
--- 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 89ee5b284..8f7f47bda 100644
--- 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;
}