aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@src.gnome.org>2006-08-30 22:36:04 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2006-08-30 22:36:04 +0800
commitb9da89740366237b523a30c98c75fced16dec076 (patch)
tree9e9253ca52e9f8a81b318c116da18ddd809163ba /calendar
parent5734088e70043273d90ea252552b068dbd641a88 (diff)
downloadgsoc2013-evolution-b9da89740366237b523a30c98c75fced16dec076.tar
gsoc2013-evolution-b9da89740366237b523a30c98c75fced16dec076.tar.gz
gsoc2013-evolution-b9da89740366237b523a30c98c75fced16dec076.tar.bz2
gsoc2013-evolution-b9da89740366237b523a30c98c75fced16dec076.tar.lz
gsoc2013-evolution-b9da89740366237b523a30c98c75fced16dec076.tar.xz
gsoc2013-evolution-b9da89740366237b523a30c98c75fced16dec076.tar.zst
gsoc2013-evolution-b9da89740366237b523a30c98c75fced16dec076.zip
** Fix for bug #344463
` svn path=/trunk/; revision=32698
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/alarm-notify/alarm-queue.c17
2 files changed, 19 insertions, 5 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 0aec0df68b..1ba6e1e857 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-30 Srinivasa Ragavan <sragavan@novell.com>
+
+ ** Fix for bug #344463
+
+ * gui/alarm-notify/alarm-queue.c: (open_alarm_dialog),
+ (tray_icon_clicked_cb): Use unref to remove GtkStatusIcon.
+
2006-08-29 Chenthill Palanisamy <pchenthill@novell.com>
* gui/e-cal-model-memos.c: (ecmm_fill_component_from_model):
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 41e2b9fea1..08f1aadd48 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -1279,12 +1279,15 @@ open_alarm_dialog (TrayIconData *tray_data)
if (tray_blink_id > -1)
g_source_remove (tray_blink_id);
tray_blink_id = -1;
-
- gtk_widget_destroy (GTK_WIDGET (tray_icon));
- tray_icon = NULL;
+
#ifndef USE_GTK_STATUS_ICON
+ gtk_widget_destroy (GTK_WIDGET (tray_icon));
tray_image = NULL;
+#else
+ g_object_unref (tray_icon);
#endif
+ tray_icon = NULL;
+
if (!alarm_notifications_dialog)
alarm_notifications_dialog = notified_alarms_dialog_new ();
@@ -1333,11 +1336,15 @@ tray_icon_clicked_cb (GtkWidget *widget, GdkEventButton *event, gpointer user_da
g_source_remove (tray_blink_id);
tray_blink_id = -1;
- gtk_widget_destroy (GTK_WIDGET (tray_icon));
- tray_icon = NULL;
+
+
#ifndef USE_GTK_STATUS_ICON
+ gtk_widget_destroy (GTK_WIDGET (tray_icon));
tray_image = NULL;
+#else
+ g_object_unref (tray_icon);
#endif
+ tray_icon = NULL;
return TRUE;
}
}