empathy r2862 - trunk/src

[xclaesse svn gnome org]

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

Log:
Port EmpathyPreferences to new API

From: Xavier Claessens <xclaesse gmail com>

Modified:
   trunk/src/empathy-preferences.c

Modified: trunk/src/empathy-preferences.c
==============================================================================
--- trunk/src/empathy-preferences.c	(original)
+++ trunk/src/empathy-preferences.c	Thu Apr 16 12:29:01 2009
@@ -27,7 +27,6 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 #include <glib/gi18n.h>
 
 #include <libempathy/empathy-utils.h>
@@ -1058,8 +1057,8 @@
 empathy_preferences_show (GtkWindow *parent)
 {
 	static EmpathyPreferences *preferences;
-	GladeXML                 *glade;
-	gchar                    *filename;
+	GtkBuilder                *gui;
+	gchar                     *filename;
 
 	if (preferences) {
 		gtk_window_present (GTK_WINDOW (preferences->dialog));
@@ -1068,10 +1067,8 @@
 
 	preferences = g_new0 (EmpathyPreferences, 1);
 
-	filename = empathy_file_lookup ("empathy-preferences.glade", "src");
-	glade = empathy_glade_get_file (filename,
-		"preferences_dialog",
-		NULL,
+	filename = empathy_file_lookup ("empathy-preferences.ui", "src");
+	gui = empathy_builder_get_file (filename,
 		"preferences_dialog", &preferences->dialog,
 		"notebook", &preferences->notebook,
 		"checkbutton_show_avatars", &preferences->checkbutton_show_avatars,
@@ -1092,13 +1089,12 @@
 		NULL);
 	g_free (filename);
 
-	empathy_glade_connect (glade,
-			      preferences,
+	empathy_builder_connect (gui, preferences,
 			      "preferences_dialog", "destroy", preferences_destroy_cb,
 			      "preferences_dialog", "response", preferences_response_cb,
 			      NULL);
 
-	g_object_unref (glade);
+	g_object_unref (gui);
 
 	g_object_add_weak_pointer (G_OBJECT (preferences->dialog), (gpointer) &preferences);