diff options
| author | Federico Mena Quintero <federico@ximian.com> | 2001-07-11 02:39:25 +0800 |
|---|---|---|
| committer | Federico Mena Quintero <federico@src.gnome.org> | 2001-07-11 02:39:25 +0800 |
| commit | 1b3ce1c888c231091f8d9b7be00f719efbaff494 (patch) | |
| tree | 7bca9d0d63dab44177f4650bbdf571a8c72a8626 /calendar/gui | |
| parent | 6079b3a3457d5f6a0a9b02e7db6a58f4ff9b0bc8 (diff) | |
| download | gsoc2013-evolution-1b3ce1c888c231091f8d9b7be00f719efbaff494.tar gsoc2013-evolution-1b3ce1c888c231091f8d9b7be00f719efbaff494.tar.gz gsoc2013-evolution-1b3ce1c888c231091f8d9b7be00f719efbaff494.tar.bz2 gsoc2013-evolution-1b3ce1c888c231091f8d9b7be00f719efbaff494.tar.lz gsoc2013-evolution-1b3ce1c888c231091f8d9b7be00f719efbaff494.tar.xz gsoc2013-evolution-1b3ce1c888c231091f8d9b7be00f719efbaff494.tar.zst gsoc2013-evolution-1b3ce1c888c231091f8d9b7be00f719efbaff494.zip | |
Pass the parent vCalendar component as the timezone closure of
2001-07-09 Federico Mena Quintero <federico@ximian.com>
* pcs/cal-backend-file.c (generate_alarms_for_comp): Pass the
parent vCalendar component as the timezone closure of
cal_recur_generate_instances().
* gui/dialogs/alarm-page.c (get_alarm_string): Make the string
consistent with the option menu text.
(get_alarm_string): Removed extra spaces from the last part of the
alarm string.
svn path=/trunk/; revision=10961
Diffstat (limited to 'calendar/gui')
| -rw-r--r-- | calendar/gui/dialogs/alarm-page.c | 10 | ||||
| -rw-r--r-- | calendar/gui/e-day-view.c | 9 |
2 files changed, 14 insertions, 5 deletions
diff --git a/calendar/gui/dialogs/alarm-page.c b/calendar/gui/dialogs/alarm-page.c index e6e09d4d3a..de33ff2d0d 100644 --- a/calendar/gui/dialogs/alarm-page.c +++ b/calendar/gui/dialogs/alarm-page.c @@ -332,7 +332,7 @@ get_alarm_string (CalComponentAlarm *alarm) break; case CAL_ALARM_DISPLAY: - base = _("Show a dialog"); + base = _("Display a message"); break; case CAL_ALARM_EMAIL: @@ -358,10 +358,10 @@ get_alarm_string (CalComponentAlarm *alarm) if (trigger.u.rel_duration.is_neg) str = g_strdup_printf ("%s %s %s", base, dur, - _(" before start of appointment")); + _("before start of appointment")); else str = g_strdup_printf ("%s %s %s", base, dur, - _(" after start of appointment")); + _("after start of appointment")); g_free (dur); break; @@ -371,10 +371,10 @@ get_alarm_string (CalComponentAlarm *alarm) if (trigger.u.rel_duration.is_neg) str = g_strdup_printf ("%s %s %s", base, dur, - _(" before end of appointment")); + _("before end of appointment")); else str = g_strdup_printf ("%s %s %s", base, dur, - _(" after end of appointment")); + _("after end of appointment")); g_free (dur); break; diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 5315dfcb1b..d8e9736449 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -1376,6 +1376,11 @@ e_day_view_focus_in (GtkWidget *widget, GdkEventFocus *event) gtk_widget_queue_draw (day_view->top_canvas); gtk_widget_queue_draw (day_view->main_canvas); + g_assert (GTK_WIDGET_REALIZED (day_view->main_canvas)); + if (E_CANVAS (day_view->main_canvas)->ic) + gdk_im_begin (E_CANVAS (day_view->main_canvas)->ic, + GTK_LAYOUT (day_view->main_canvas)->bin_window); + return FALSE; } @@ -1396,6 +1401,10 @@ e_day_view_focus_out (GtkWidget *widget, GdkEventFocus *event) gtk_widget_queue_draw (day_view->top_canvas); gtk_widget_queue_draw (day_view->main_canvas); + g_assert (GTK_WIDGET_REALIZED (day_view->main_canvas)); + if (E_CANVAS (day_view->main_canvas)->ic) + gdk_im_end (); + return FALSE; } |