empathy r2849 - trunk/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Thu Apr 16 12:28:17 2009
New Revision: 2849
URL: http://svn.gnome.org/viewvc/empathy?rev=2849&view=rev

Log:
Port EmpathyIrcNetwordDialog to new API

From: Xavier Claessens <xclaesse gmail com>

Modified:
   trunk/libempathy-gtk/empathy-irc-network-dialog.c

Modified: trunk/libempathy-gtk/empathy-irc-network-dialog.c
==============================================================================
--- trunk/libempathy-gtk/empathy-irc-network-dialog.c	(original)
+++ trunk/libempathy-gtk/empathy-irc-network-dialog.c	Thu Apr 16 12:28:17 2009
@@ -26,7 +26,6 @@
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 
 #include <libmissioncontrol/mc-account.h>
 #include <libmissioncontrol/mc-protocol.h>
@@ -457,7 +456,7 @@
                                  GtkWidget *parent)
 {
   static EmpathyIrcNetworkDialog *dialog = NULL;
-  GladeXML *glade;
+  GtkBuilder *gui;
   GtkListStore *store;
   GtkCellRenderer *renderer;
   GtkAdjustment *adjustment;
@@ -480,11 +479,9 @@
   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 @@
 
   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 @@
       "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);