aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2009-04-16 20:29:01 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-04-16 20:29:01 +0800
commit42fb30200c14cacfd517184a4ebdfd3baf718bab (patch)
treef5316ca99559d212418f0f7eaf645e6371484ff1
parent791170c47bfaecd6f18020db7c794028ffcf6d0b (diff)
downloadgsoc2013-empathy-42fb30200c14cacfd517184a4ebdfd3baf718bab.tar
gsoc2013-empathy-42fb30200c14cacfd517184a4ebdfd3baf718bab.tar.gz
gsoc2013-empathy-42fb30200c14cacfd517184a4ebdfd3baf718bab.tar.bz2
gsoc2013-empathy-42fb30200c14cacfd517184a4ebdfd3baf718bab.tar.lz
gsoc2013-empathy-42fb30200c14cacfd517184a4ebdfd3baf718bab.tar.xz
gsoc2013-empathy-42fb30200c14cacfd517184a4ebdfd3baf718bab.tar.zst
gsoc2013-empathy-42fb30200c14cacfd517184a4ebdfd3baf718bab.zip
Port EmpathyPreferences to new API
From: Xavier Claessens <xclaesse@gmail.com> svn path=/trunk/; revision=2862
-rw-r--r--src/empathy-preferences.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 0ad8e9bdf..4d1fd71fd 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -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 @@ GtkWidget *
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 @@ empathy_preferences_show (GtkWindow *parent)
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 @@ empathy_preferences_show (GtkWindow *parent)
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);