aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2009-04-16 20:28:21 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-04-16 20:28:21 +0800
commitdb1793b6152f154c4f066e8c62994c9c191df7fe (patch)
tree33fcbe0bdbb72fa5ee54506f0ace7e132421e223
parent29e1c3eda2b5a5cf9a3734011411476ee51295c3 (diff)
downloadgsoc2013-empathy-db1793b6152f154c4f066e8c62994c9c191df7fe.tar
gsoc2013-empathy-db1793b6152f154c4f066e8c62994c9c191df7fe.tar.gz
gsoc2013-empathy-db1793b6152f154c4f066e8c62994c9c191df7fe.tar.bz2
gsoc2013-empathy-db1793b6152f154c4f066e8c62994c9c191df7fe.tar.lz
gsoc2013-empathy-db1793b6152f154c4f066e8c62994c9c191df7fe.tar.xz
gsoc2013-empathy-db1793b6152f154c4f066e8c62994c9c191df7fe.tar.zst
gsoc2013-empathy-db1793b6152f154c4f066e8c62994c9c191df7fe.zip
Port EmpathyLogWindow to new API
From: Xavier Claessens <xclaesse@gmail.com> svn path=/trunk/; revision=2850
-rw-r--r--libempathy-gtk/empathy-log-window.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index 24633e565..2cec17783 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -29,7 +29,6 @@
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include <libempathy/empathy-log-manager.h>
#include <libempathy/empathy-chatroom-manager.h>
@@ -144,7 +143,7 @@ empathy_log_window_show (McAccount *account,
EmpathyAccountChooser *account_chooser;
GList *accounts;
gint account_num;
- GladeXML *glade;
+ GtkBuilder *gui;
gchar *filename;
if (window) {
@@ -162,11 +161,9 @@ empathy_log_window_show (McAccount *account,
window = g_new0 (EmpathyLogWindow, 1);
window->log_manager = empathy_log_manager_dup_singleton ();
- filename = empathy_file_lookup ("empathy-log-window.glade",
+ filename = empathy_file_lookup ("empathy-log-window.ui",
"libempathy-gtk");
- glade = empathy_glade_get_file (filename,
- "log_window",
- NULL,
+ gui = empathy_builder_get_file (filename,
"log_window", &window->window,
"notebook", &window->notebook,
"entry_find", &window->entry_find,
@@ -183,8 +180,7 @@ empathy_log_window_show (McAccount *account,
NULL);
g_free (filename);
- empathy_glade_connect (glade,
- window,
+ empathy_builder_connect (gui, window,
"log_window", "destroy", log_window_destroy_cb,
"entry_find", "changed", log_window_entry_find_changed_cb,
"button_previous", "clicked", log_window_button_previous_clicked_cb,
@@ -194,7 +190,7 @@ empathy_log_window_show (McAccount *account,
"entry_chats", "activate", log_window_entry_chats_activate_cb,
NULL);
- g_object_unref (glade);
+ g_object_unref (gui);
g_object_add_weak_pointer (G_OBJECT (window->window),
(gpointer) &window);