aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2009-04-16 20:28:00 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-04-16 20:28:00 +0800
commitec5556cdd46548b33a10eadbfdb1c3c328a50dbf (patch)
tree4b5728ab411e765df356b3e1135821e3bc2eebab
parent606f2eda956c56a20ed376eb00dbbd079e20b6c1 (diff)
downloadgsoc2013-empathy-ec5556cdd46548b33a10eadbfdb1c3c328a50dbf.tar
gsoc2013-empathy-ec5556cdd46548b33a10eadbfdb1c3c328a50dbf.tar.gz
gsoc2013-empathy-ec5556cdd46548b33a10eadbfdb1c3c328a50dbf.tar.bz2
gsoc2013-empathy-ec5556cdd46548b33a10eadbfdb1c3c328a50dbf.tar.lz
gsoc2013-empathy-ec5556cdd46548b33a10eadbfdb1c3c328a50dbf.tar.xz
gsoc2013-empathy-ec5556cdd46548b33a10eadbfdb1c3c328a50dbf.tar.zst
gsoc2013-empathy-ec5556cdd46548b33a10eadbfdb1c3c328a50dbf.zip
Port EmpathyChat to new API
From: Xavier Claessens <xclaesse@gmail.com> svn path=/trunk/; revision=2844
-rw-r--r--libempathy-gtk/empathy-chat.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 99d4d4c09..7d9390274 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -1288,16 +1288,14 @@ static void
chat_create_ui (EmpathyChat *chat)
{
EmpathyChatPriv *priv = GET_PRIV (chat);
- GladeXML *glade;
+ GtkBuilder *gui;
GList *list = NULL;
gchar *filename;
GtkTextBuffer *buffer;
- filename = empathy_file_lookup ("empathy-chat.glade",
+ filename = empathy_file_lookup ("empathy-chat.ui",
"libempathy-gtk");
- glade = empathy_glade_get_file (filename,
- "chat_widget",
- NULL,
+ gui = empathy_builder_get_file (filename,
"chat_widget", &priv->widget,
"hpaned", &priv->hpaned,
"vbox_left", &priv->vbox_left,
@@ -1308,7 +1306,6 @@ chat_create_ui (EmpathyChat *chat)
"scrolled_window_contacts", &priv->scrolled_window_contacts,
NULL);
g_free (filename);
- g_object_unref (glade);
/* Add message view. */
chat->view = empathy_theme_manager_create_view (empathy_theme_manager_get ());
@@ -1374,6 +1371,7 @@ chat_create_ui (EmpathyChat *chat)
/* Add the main widget in the chat widget */
gtk_container_add (GTK_CONTAINER (chat), priv->widget);
+ g_object_unref (gui);
}
static void