diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/alarm-queue.c | 6 |
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; } } |