aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2006-01-31 17:12:13 +0800
committerTor Lillqvist <tml@src.gnome.org>2006-01-31 17:12:13 +0800
commit08183549095241722745085ffdf67cb37f138af8 (patch)
treeaf95c5c1fad57226ac25e503ba71097e12da6f60 /calendar
parenta7ebde1a817510ce5fb477cc665a51625210e168 (diff)
downloadgsoc2013-evolution-08183549095241722745085ffdf67cb37f138af8.tar
gsoc2013-evolution-08183549095241722745085ffdf67cb37f138af8.tar.gz
gsoc2013-evolution-08183549095241722745085ffdf67cb37f138af8.tar.bz2
gsoc2013-evolution-08183549095241722745085ffdf67cb37f138af8.tar.lz
gsoc2013-evolution-08183549095241722745085ffdf67cb37f138af8.tar.xz
gsoc2013-evolution-08183549095241722745085ffdf67cb37f138af8.tar.zst
gsoc2013-evolution-08183549095241722745085ffdf67cb37f138af8.zip
Fix compilation against HEAD gtk and on Win32, where we use the
2006-01-31 Tor Lillqvist <tml@novell.com> * gui/alarm-notify/alarm-queue.c (open_alarm_dialog, tray_icon_clicked_cb): Fix compilation against HEAD gtk and on Win32, where we use the GtkStatusIcon API and there is no tray_image variable. svn path=/trunk/; revision=31384
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/alarm-notify/alarm-queue.c6
2 files changed, 11 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 775b6aabf9..5dff2c86fe 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-31 Tor Lillqvist <tml@novell.com>
+
+ * gui/alarm-notify/alarm-queue.c (open_alarm_dialog,
+ tray_icon_clicked_cb): Fix compilation against HEAD gtk and on
+ Win32, where we use the GtkStatusIcon API and there is no
+ tray_image variable.
+
2006-01-31 Chenthill Palanisamy <pchenthill@novell.com>
* gui/dialogs/cal-prefs-dialog.c: (show_alarms_config):
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 73e6be43f9..c837a7d8f4 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -972,8 +972,9 @@ open_alarm_dialog (TrayIconData *tray_data)
gtk_widget_destroy (tray_icon);
tray_icon = NULL;
+#ifndef USE_GTK_STATUS_ICON
tray_image = NULL;
-
+#endif
if (!alarm_notifications_dialog)
alarm_notifications_dialog = notified_alarms_dialog_new ();
@@ -1028,8 +1029,9 @@ tray_icon_clicked_cb (GtkWidget *widget, GdkEventButton *event, gpointer user_da
gtk_widget_destroy (tray_icon);
tray_icon = NULL;
+#ifndef USE_GTK_STATUS_ICON
tray_image = NULL;
-
+#endif
return TRUE;
}
}