diff options
| author | Rodrigo Moya <rodrigo@novell.com> | 2004-09-04 00:41:16 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@src.gnome.org> | 2004-09-04 00:41:16 +0800 |
| commit | 6c8275587de84ce04ba13641b5e724e71703b859 (patch) | |
| tree | 78b7b815bced22babab935710d172b5816805672 | |
| parent | 185a26f76253315fabe4c2719172b51647d49f53 (diff) | |
| download | gsoc2013-evolution-6c8275587de84ce04ba13641b5e724e71703b859.tar gsoc2013-evolution-6c8275587de84ce04ba13641b5e724e71703b859.tar.gz gsoc2013-evolution-6c8275587de84ce04ba13641b5e724e71703b859.tar.bz2 gsoc2013-evolution-6c8275587de84ce04ba13641b5e724e71703b859.tar.lz gsoc2013-evolution-6c8275587de84ce04ba13641b5e724e71703b859.tar.xz gsoc2013-evolution-6c8275587de84ce04ba13641b5e724e71703b859.tar.zst gsoc2013-evolution-6c8275587de84ce04ba13641b5e724e71703b859.zip | |
Fixes #62392
2004-08-31 Rodrigo Moya <rodrigo@novell.com>
Fixes #62392
* gui/alarm-notify/alarm-queue.c (display_notification): ref the
client's query object so that it doesn't disappear on us.
(tray_icon_destroyed_cb): unref the query previously ref'ed.
svn path=/trunk/; revision=27132
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/alarm-queue.c | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 43909a5bd9..a7bcc95db5 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,13 @@ 2004-08-31 Rodrigo Moya <rodrigo@novell.com> + Fixes #62392 + + * gui/alarm-notify/alarm-queue.c (display_notification): ref the + client's query object so that it doesn't disappear on us. + (tray_icon_destroyed_cb): unref the query previously ref'ed. + +2004-08-31 Rodrigo Moya <rodrigo@novell.com> + * gui/e-cal-model-tasks.c: include missing string.h, to avoid problems in 64 bit builds. diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index d7047d98ea..0d978136c5 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -802,6 +802,7 @@ tray_icon_destroyed_cb (GtkWidget *tray, gpointer user_data) g_object_unref (tray_data->comp); g_object_unref (tray_data->client); + g_object_unref (tray_data->query); tray_icons_list = g_list_remove (tray_icons_list, tray_data); g_free (tray_data); @@ -975,7 +976,6 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa, /* create the tray icon */ tooltips = gtk_tooltips_new (); - /* FIXME: Use stock image equivalent when it becomes available */ tray_icon = 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); @@ -1011,7 +1011,7 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa, tray_data->alarm_id = alarm_id; tray_data->comp = e_cal_component_clone (comp); tray_data->client = cqa->parent_client->client; - tray_data->query = cqa->parent_client->query; + tray_data->query = g_object_ref (cqa->parent_client->query); tray_data->image = image; tray_data->blink_state = FALSE; g_object_ref (tray_data->client); |