empathy r2859 - trunk/src

[xclaesse svn gnome org]

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

Log:
Port EmpathyImportDialog to new API

From: Xavier Claessens <xclaesse gmail com>

Modified:
   trunk/src/empathy-import-dialog.c

Modified: trunk/src/empathy-import-dialog.c
==============================================================================
--- trunk/src/empathy-import-dialog.c	(original)
+++ trunk/src/empathy-import-dialog.c	Thu Apr 16 12:28:51 2009
@@ -25,7 +25,6 @@
 
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 #include <glib/gi18n.h>
 
 #include <libmissioncontrol/mc-account.h>
@@ -363,7 +362,7 @@
                             gboolean warning)
 {
   static EmpathyImportDialog *dialog = NULL;
-  GladeXML *glade;
+  GtkBuilder *gui;
   gchar *filename;
   GList *accounts = NULL;
 
@@ -402,16 +401,13 @@
   dialog = g_slice_new0 (EmpathyImportDialog);
   dialog->accounts = accounts;  
 
-  filename = empathy_file_lookup ("empathy-import-dialog.glade", "src");
-  glade = empathy_glade_get_file (filename,
-      "import_dialog",
-      NULL,
+  filename = empathy_file_lookup ("empathy-import-dialog.ui", "src");
+  gui = empathy_builder_get_file (filename,
       "import_dialog", &dialog->window,
       "treeview", &dialog->treeview,
       NULL);
 
-  empathy_glade_connect (glade,
-      dialog,
+  empathy_builder_connect (gui, dialog,
       "import_dialog", "destroy", import_dialog_destroy_cb,
       "import_dialog", "response", import_dialog_response_cb,
       NULL);
@@ -419,7 +415,7 @@
   g_object_add_weak_pointer (G_OBJECT (dialog->window), (gpointer) &dialog);
 
   g_free (filename);
-  g_object_unref (glade);
+  g_object_unref (gui);
 
   if (parent)
     gtk_window_set_transient_for (GTK_WINDOW (dialog->window), parent);