diff options
author | Suman Manjunath <msuman@src.gnome.org> | 2008-01-17 16:42:24 +0800 |
---|---|---|
committer | Suman Manjunath <msuman@src.gnome.org> | 2008-01-17 16:42:24 +0800 |
commit | 864ab0d253bf176f999792bf67bd590a37a9883b (patch) | |
tree | 1526dd0c92b4a0d4a1c64e7a7d645037ac291e20 /calendar | |
parent | e2e3ab5bfbeab96ce47649707f110d49f035dc30 (diff) | |
download | gsoc2013-evolution-864ab0d253bf176f999792bf67bd590a37a9883b.tar.gz gsoc2013-evolution-864ab0d253bf176f999792bf67bd590a37a9883b.tar.zst gsoc2013-evolution-864ab0d253bf176f999792bf67bd590a37a9883b.zip |
Fix for bug #426159 (Allow users to snooze for 1+ hour 0 minutes)
svn path=/trunk/; revision=34843
Diffstat (limited to 'calendar')
-rw-r--r-- | calendar/ChangeLog | 8 | ||||
-rw-r--r-- | calendar/gui/alarm-notify/alarm-notify-dialog.c | 4 | ||||
-rw-r--r-- | calendar/gui/alarm-notify/alarm-notify.glade | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 5a227db79a..11dcd44688 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2008-01-17 Suman Manjunath <msuman@novell.com> + + ** Fix for bug #426159 + + * gui/alarm-notify/alarm-notify-dialog.c: (snooze_pressed_cb): + * gui/alarm-notify/alarm-notify.glade: Allow users to snooze for + 1+ hour 0 minutes. + 2008-01-15 Milan Crha <mcrha@redhat.com> ** Fix for bug #333695 diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c index 7022c389be..982b859547 100644 --- a/calendar/gui/alarm-notify/alarm-notify-dialog.c +++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c @@ -175,6 +175,8 @@ edit_pressed_cb (GtkButton *button, gpointer user_data) (* funcinfo->func) (ALARM_NOTIFY_EDIT, -1, funcinfo->func_data); } +#define DEFAULT_SNOOZE_MINS 5 + static void snooze_pressed_cb (GtkButton *button, gpointer user_data) { @@ -194,6 +196,8 @@ snooze_pressed_cb (GtkButton *button, gpointer user_data) snooze_timeout = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (an->snooze_time_min)); snooze_timeout += 60 * (gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (an->snooze_time_hrs))); + if (!snooze_timeout) + snooze_timeout = DEFAULT_SNOOZE_MINS; (* funcinfo->func) (ALARM_NOTIFY_SNOOZE, snooze_timeout, funcinfo->func_data); } diff --git a/calendar/gui/alarm-notify/alarm-notify.glade b/calendar/gui/alarm-notify/alarm-notify.glade index e6172caca4..539bd66269 100644 --- a/calendar/gui/alarm-notify/alarm-notify.glade +++ b/calendar/gui/alarm-notify/alarm-notify.glade @@ -251,7 +251,7 @@ <property name="update_policy">GTK_UPDATE_ALWAYS</property> <property name="snap_to_ticks">False</property> <property name="wrap">False</property> - <property name="adjustment">5 1 59 1 10 10</property> + <property name="adjustment">5 0 59 1 10 10</property> </widget> <packing> <property name="padding">0</property> |