diff options
author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-15 04:19:12 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-15 04:19:12 +0800 |
commit | 7ade227e6409c98a4010992450e111cf7bb10520 (patch) | |
tree | bdd716d894ae2f3b1affaa6bb68950a89441db13 /calendar/gui/alarm-notify/alarm-queue.c | |
parent | cca29c3424aede2bb3c9ec5a6d255ce490d3511b (diff) | |
download | gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.gz gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.bz2 gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.lz gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.xz gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.zst gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.zip |
Merge revisions 35951:35992 from trunk.
svn path=/branches/kill-bonobo/; revision=35994
Diffstat (limited to 'calendar/gui/alarm-notify/alarm-queue.c')
-rw-r--r-- | calendar/gui/alarm-notify/alarm-queue.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index 219dfdc82d..720a757eed 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -35,7 +35,6 @@ #include <libgnomeui/gnome-dialog-util.h> #include <libgnomeui/gnome-uidefs.h> -#include <e-util/e-icon-factory.h> #include <libecal/e-cal-time-util.h> #include <libecal/e-cal-component.h> @@ -1384,19 +1383,18 @@ static gboolean tray_icon_blink_cb (gpointer data) { static gboolean tray_blink_state = FALSE; - GdkPixbuf *pixbuf; + const gchar *icon_name; tray_blink_countdown--; tray_blink_state = !tray_blink_state; - pixbuf = e_icon_factory_get_icon ((tray_blink_state || tray_blink_countdown <= 0)? - "stock_appointment-reminder-excl" : - "stock_appointment-reminder", - E_ICON_SIZE_LARGE_TOOLBAR); + if (tray_blink_state || tray_blink_countdown <= 0) + icon_name = "stock_appointment-reminder-excl"; + else + icon_name = "stock_appointment-reminder"; if (tray_icon) - gtk_status_icon_set_from_pixbuf (tray_icon, pixbuf); - g_object_unref (pixbuf); + gtk_status_icon_set_from_icon_name (tray_icon, icon_name); if (tray_blink_countdown <= 0) tray_blink_id = -1; @@ -1480,7 +1478,8 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa, /* create the tray icon */ if (tray_icon == NULL) { tray_icon = gtk_status_icon_new (); - gtk_status_icon_set_from_pixbuf (tray_icon, e_icon_factory_get_icon ("stock_appointment-reminder", E_ICON_SIZE_LARGE_TOOLBAR)); + gtk_status_icon_set_from_icon_name ( + tray_icon, "stock_appointment-reminder"); g_signal_connect (G_OBJECT (tray_icon), "activate", G_CALLBACK (icon_activated), NULL); g_signal_connect (G_OBJECT (tray_icon), "popup-menu", |