aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2009-04-16 20:29:04 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-04-16 20:29:04 +0800
commit17e35e5856e649673fefbaad04f1fa5f0f483527 (patch)
treea1d6af6d31ed0f9cf426cade84a073c0acb35ccc
parent42fb30200c14cacfd517184a4ebdfd3baf718bab (diff)
downloadgsoc2013-empathy-17e35e5856e649673fefbaad04f1fa5f0f483527.tar
gsoc2013-empathy-17e35e5856e649673fefbaad04f1fa5f0f483527.tar.gz
gsoc2013-empathy-17e35e5856e649673fefbaad04f1fa5f0f483527.tar.bz2
gsoc2013-empathy-17e35e5856e649673fefbaad04f1fa5f0f483527.tar.lz
gsoc2013-empathy-17e35e5856e649673fefbaad04f1fa5f0f483527.tar.xz
gsoc2013-empathy-17e35e5856e649673fefbaad04f1fa5f0f483527.tar.zst
gsoc2013-empathy-17e35e5856e649673fefbaad04f1fa5f0f483527.zip
Port EmpathyStatusIcon to new API
From: Xavier Claessens <xclaesse@gmail.com> svn path=/trunk/; revision=2863
-rw-r--r--src/empathy-status-icon.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 6c0ddb250..ef4433631 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -24,7 +24,6 @@
#include <string.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include <gdk/gdkkeysyms.h>
#include <libnotify/notification.h>
@@ -454,13 +453,11 @@ static void
status_icon_create_menu (EmpathyStatusIcon *icon)
{
EmpathyStatusIconPriv *priv = GET_PRIV (icon);
- GladeXML *glade;
+ GtkBuilder *gui;
gchar *filename;
- filename = empathy_file_lookup ("empathy-status-icon.glade", "src");
- glade = empathy_glade_get_file (filename,
- "tray_menu",
- NULL,
+ filename = empathy_file_lookup ("empathy-status-icon.ui", "src");
+ gui = empathy_builder_get_file (filename,
"tray_menu", &priv->popup_menu,
"tray_show_list", &priv->show_window_item,
"tray_new_message", &priv->message_item,
@@ -468,14 +465,13 @@ status_icon_create_menu (EmpathyStatusIcon *icon)
NULL);
g_free (filename);
- empathy_glade_connect (glade,
- icon,
+ empathy_builder_connect (gui, icon,
"tray_show_list", "toggled", status_icon_show_hide_window_cb,
"tray_new_message", "activate", status_icon_new_message_cb,
"tray_quit", "activate", status_icon_quit_cb,
NULL);
- g_object_unref (glade);
+ g_object_unref (gui);
}
static void