callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debian/patches/17_fix_alarm_delay_for_calendar.patch: Doesn't apply cleanly

Browse Source 
git-svn-id: file:///svn/pkg-evolution/experimental/evolution@431 ed03ce00-e4f4-0310-9448-ee38221cb277
This commit is contained in:
Øystein Gisnås
2006-05-28 14:24:55 +00:00
parent add5603f59
commit 80df5aede1
2 changed files with 3 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -7,8 +7,10 @@ evolution (2.7.2-1) UNRELEASED; urgency=low
* debian/patches/11_window_settings_stored.patch: Applied upstream
* debian/patches/12_fix_icon_metaphors_bug_339626.patch: Applied
upstream
* debian/patches/17_fix_alarm_delay_for_calendar.patch: Doesn't apply
cleanly
-- Oystein Gisnas <oystein@gisnas.net> Sun, 28 May 2006 15:58:19 +0200
-- Oystein Gisnas <oystein@gisnas.net> Sun, 28 May 2006 16:24:50 +0200
evolution (2.6.1-4) UNRELEASED; urgency=low

52
debian/patches/17_fix_alarm_delay_for_calendar.patch vendored
View File

@ -1,52 +0,0 @@
Index: gui/dialogs/event-page.c
===================================================================
diff -Naur old/calendar/gui/dialogs/event-page.c calendar/gui/dialogs/event-page.c
--- old/calendar/gui/dialogs/event-page.c 2006-04-06 08:58:33.000000000 +0000
+++ calendar/gui/dialogs/event-page.c 2006-05-04 00:35:46.000000000 +0000
@@ -2918,40 +2918,33 @@
priv->alarm_units = calendar_config_get_default_reminder_units ();
priv->alarm_interval = calendar_config_get_default_reminder_interval ();
+ menu_label = "";
switch (priv->alarm_units) {
case CAL_DAYS:
if (priv->alarm_interval != 1) {
menu_label = g_strdup_printf (ngettext("%d day before appointment", "%d days before appointment", priv->alarm_interval), priv->alarm_interval);
- } else {
- priv->alarm_interval = -1;
}
break;
case CAL_HOURS:
if (priv->alarm_interval != 1) {
menu_label = g_strdup_printf (ngettext("%d hour before appointment", "%d hours before appointment", priv->alarm_interval), priv->alarm_interval);
- } else {
- priv->alarm_interval = -1;
}
break;
case CAL_MINUTES:
if (priv->alarm_interval != 15) {
menu_label = g_strdup_printf (ngettext("%d minute before appointement", "%d minutes before appointment", priv->alarm_interval), priv->alarm_interval);
- } else {
- priv->alarm_interval = -1;
}
break;
}
- if (menu_label) {
- GtkWidget *item, *menu;
-
- item = gtk_menu_item_new_with_label (menu_label);
- gtk_widget_show (item);
- menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->alarm_time));
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ cus_item = gtk_menu_item_new_with_label (menu_label);
+ if(menu_label[0] != '\0') {
+ gtk_widget_show (cus_item);
}
+ menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->alarm_time));
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), cus_item);
cus_item = gtk_menu_item_new_with_label (_("Customize"));
gtk_widget_show (cus_item);