diff options
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/alarm-queue.c | 5 | ||||
| -rw-r--r-- | calendar/gui/e-timezone-entry.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index dbad295e2d..6ea90e5438 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,12 @@ 2004-11-26 JP Rosevear <jpr@novell.com> + * gui/alarm-notify/alarm-queue.c (display_notification): ditto + + * gui/e-timezone-entry.c (e_timezone_entry_init): get the image + directly from the icon factory + +2004-11-26 JP Rosevear <jpr@novell.com> + * gui/alarm-notify/alarm-queue.c (display_notification): prevent crash if there is no description diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index 5d7b6b2078..8176c3c145 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -932,7 +932,6 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa, GSList *text_list; char *str, *start_str, *end_str, *alarm_str; icaltimezone *current_zone; - GdkPixbuf *pixbuf; comp = cqa->alarms->comp; qa = lookup_queued_alarm (cqa, alarm_id); @@ -970,9 +969,7 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa, tooltips = gtk_tooltips_new (); tray_icon = GTK_WIDGET (egg_tray_icon_new (qa->instance->auid)); - pixbuf = e_icon_factory_get_icon ("stock_appointment-reminder", E_ICON_SIZE_LARGE_TOOLBAR); - image = gtk_image_new_from_pixbuf (pixbuf); - gdk_pixbuf_unref (pixbuf); + image = e_icon_factory_get_image ("stock_appointment-reminder", E_ICON_SIZE_LARGE_TOOLBAR); ebox = gtk_event_box_new (); gtk_widget_show (image); diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c index 8e4c65e64d..4004ae2cb8 100644 --- a/calendar/gui/e-timezone-entry.c +++ b/calendar/gui/e-timezone-entry.c @@ -110,7 +110,6 @@ e_timezone_entry_init (ETimezoneEntry *tentry) { ETimezoneEntryPrivate *priv; GtkWidget *gtk_image; - GdkPixbuf *gdk_pixbuf; AtkObject *a11y; tentry->priv = priv = g_new0 (ETimezoneEntryPrivate, 1); @@ -134,12 +133,9 @@ e_timezone_entry_init (ETimezoneEntry *tentry) atk_object_set_name (a11y, _("Timezone Button")); } - gdk_pixbuf = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_BUTTON); - gtk_image = gtk_image_new_from_pixbuf (gdk_pixbuf); + gtk_image = e_icon_factory_get_image ("stock_timezone", E_ICON_SIZE_BUTTON); gtk_container_add (GTK_CONTAINER (priv->button), gtk_image); gtk_widget_show (gtk_image); - - g_object_unref (gdk_pixbuf); } |