aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/alarm-notify/alarm-queue.c
diff options
context:
space:
mode:
authorMichael Terry <mike@mterry.name>2004-04-19 23:19:32 +0800
committerRodney Dawes <dobey@src.gnome.org>2004-04-19 23:19:32 +0800
commit8172d77c914b3d2cdbf1ff51f728f5c8860b64d9 (patch)
tree15c609a596728aabe5fff61fdfa1d32eb77c8d9c /calendar/gui/alarm-notify/alarm-queue.c
parentc13ea522069443479b5370d6bb0084b281272ef2 (diff)
downloadgsoc2013-evolution-8172d77c914b3d2cdbf1ff51f728f5c8860b64d9.tar
gsoc2013-evolution-8172d77c914b3d2cdbf1ff51f728f5c8860b64d9.tar.gz
gsoc2013-evolution-8172d77c914b3d2cdbf1ff51f728f5c8860b64d9.tar.bz2
gsoc2013-evolution-8172d77c914b3d2cdbf1ff51f728f5c8860b64d9.tar.lz
gsoc2013-evolution-8172d77c914b3d2cdbf1ff51f728f5c8860b64d9.tar.xz
gsoc2013-evolution-8172d77c914b3d2cdbf1ff51f728f5c8860b64d9.tar.zst
gsoc2013-evolution-8172d77c914b3d2cdbf1ff51f728f5c8860b64d9.zip
Update the calendar to use the icon theme through the EIconFactory object
2004-04-19 Michael Terry <mike@mterry.name> * gui/GNOME_Evolution_Calendar.server.in.in: * gui/calendar-commands.c: * gui/calendar-component.c: * gui/e-calendar-table.c: * gui/e-calendar-view.c: * gui/e-day-view-main-item.c: * gui/e-day-view-top-item.c: * gui/e-day-view.c: * gui/e-day-view.h: * gui/e-itip-control.c: * gui/e-timezone-entry.c: * gui/e-week-view-event-item.c: * gui/e-week-view.c: * gui/e-week-view.h: * gui/tasks-component.c: * gui/alarm-notify/alarm-notify-dialog.c: * gui/alarm-notify/alarm-queue.c: * gui/dialogs/comp-editor.c: * gui/dialogs/event-editor.c: Update the calendar to use the icon theme through the EIconFactory object in e-util svn path=/trunk/; revision=25515
Diffstat (limited to 'calendar/gui/alarm-notify/alarm-queue.c')
-rw-r--r--calendar/gui/alarm-notify/alarm-queue.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index cfbd124c64..83e676d12c 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -42,6 +42,7 @@
#include <libgnomeui/gnome-dialog-util.h>
#include <libgnomeui/gnome-uidefs.h>
#include <e-util/eggtrayicon.h>
+#include <e-util/e-icon-factory.h>
#include <libecal/e-cal-time-util.h>
#include "evolution-calendar.h"
#include "alarm.h"
@@ -888,14 +889,15 @@ static gboolean
tray_icon_blink_cb (gpointer data)
{
TrayIconData *tray_data = data;
-
- /* FIXME: Use stock image equivalents when they become available */
+ GdkPixbuf *pixbuf;
tray_data->blink_state = tray_data->blink_state == TRUE ? FALSE : TRUE;
- gtk_image_set_from_file (GTK_IMAGE (tray_data->image),
- tray_data->blink_state == TRUE ?
- EVOLUTION_IMAGESDIR "/appointment-reminder-excl.png" :
- EVOLUTION_IMAGESDIR "/appointment-reminder.png");
+ pixbuf = e_icon_factory_get_icon (tray_data->blink_state == TRUE ?
+ "stock_appointment-reminder-excl" :
+ "stock_appointment-reminder",
+ 24);
+ gtk_image_set_from_pixbuf (GTK_IMAGE (tray_data->image), pixbuf);
+ gdk_pixbuf_unref (pixbuf);
return TRUE;
}
@@ -916,6 +918,7 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
ECalComponentText text;
char *str, *start_str, *end_str, *alarm_str;
icaltimezone *current_zone;
+ GdkPixbuf *pixbuf;
comp = cqa->alarms->comp;
qa = lookup_queued_alarm (cqa, alarm_id);
@@ -946,7 +949,9 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
/* FIXME: Use stock image equivalent when it becomes available */
tray_icon = egg_tray_icon_new (qa->instance->auid);
- image = gtk_image_new_from_file (EVOLUTION_IMAGESDIR "/appointment-reminder.png");
+ pixbuf = e_icon_factory_get_icon ("stock_appointment-reminder", 24);
+ image = gtk_image_new_from_pixbuf (pixbuf);
+ gdk_pixbuf_unref (pixbuf);
ebox = gtk_event_box_new ();
gtk_widget_show (image);