From 29e1c3eda2b5a5cf9a3734011411476ee51295c3 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Thu, 16 Apr 2009 12:28:17 +0000 Subject: [PATCH] Port EmpathyIrcNetwordDialog to new API From: Xavier Claessens svn path=/trunk/; revision=2849 --- libempathy-gtk/empathy-irc-network-dialog.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libempathy-gtk/empathy-irc-network-dialog.c b/libempathy-gtk/empathy-irc-network-dialog.c index b4ec2ff4..89ee5b28 100644 --- a/libempathy-gtk/empathy-irc-network-dialog.c +++ b/libempathy-gtk/empathy-irc-network-dialog.c @@ -26,7 +26,6 @@ #include #include -#include #include #include @@ -457,7 +456,7 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network, GtkWidget *parent) { static EmpathyIrcNetworkDialog *dialog = NULL; - GladeXML *glade; + GtkBuilder *gui; GtkListStore *store; GtkCellRenderer *renderer; GtkAdjustment *adjustment; @@ -480,11 +479,9 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network, dialog->network = network; g_object_ref (dialog->network); - filename = empathy_file_lookup ("empathy-account-widget-irc.glade", + filename = empathy_file_lookup ("empathy-account-widget-irc.ui", "libempathy-gtk"); - glade = empathy_glade_get_file (filename, - "irc_network_dialog", - NULL, + gui = empathy_builder_get_file (filename, "irc_network_dialog", &dialog->dialog, "button_close", &dialog->button_close, "entry_network", &dialog->entry_network, @@ -550,7 +547,7 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network, irc_network_dialog_setup (dialog); - empathy_glade_connect (glade, dialog, + empathy_builder_connect (gui, dialog, "irc_network_dialog", "destroy", irc_network_dialog_destroy_cb, "button_close", "clicked", irc_network_dialog_close_clicked_cb, "entry_network", "focus-out-event", irc_network_dialog_network_focus_cb, @@ -561,7 +558,7 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network, "combobox_charset", "changed", irc_network_dialog_combobox_charset_changed_cb, NULL); - g_object_unref (glade); + g_object_unref (gui); g_object_add_weak_pointer (G_OBJECT (dialog->dialog), (gpointer) &dialog); -- 2.39.2