diff options
| -rw-r--r-- | calendar/ChangeLog | 12 | ||||
| -rw-r--r-- | calendar/gui/dialogs/cal-prefs-dialog.c | 1 | ||||
| -rw-r--r-- | calendar/gui/e-day-view.c | 29 | ||||
| -rw-r--r-- | calendar/gui/e-week-view.c | 28 |
4 files changed, 15 insertions, 55 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index e9f27ba527..4d9df14caf 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,15 @@ +2002-10-08 JP Rosevear <jpr@ximian.com> + + * gui/dialogs/cal-prefs-dialog.c + (cal_prefs_dialog_create_time_edit): set the 24 hour format + initially + +2002-10-08 JP Rosevear <jpr@ximian.com> + + * gui/e-week-view.c: remove pilot settings from contextual menu + + * gui/e-day-view.c: ditto + 2002-10-07 Rodrigo Moya <rodrigo@ximian.com> Fixes #31774 diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index acb686026a..6f4378f7a8 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -346,6 +346,7 @@ cal_prefs_dialog_create_time_edit (void) dedit = e_date_edit_new (); + e_date_edit_set_use_24_hour_format (E_DATE_EDIT (dedit), calendar_config_get_24_hour_format ()); e_date_edit_set_time_popup_range (E_DATE_EDIT (dedit), 0, 24); e_date_edit_set_show_date (E_DATE_EDIT (dedit), FALSE); diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 9f1ef62a6f..892cc2f4a4 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -364,8 +364,6 @@ static void e_day_view_on_publish (GtkWidget *widget, gpointer data); static void e_day_view_on_settings (GtkWidget *widget, gpointer data); -static void e_day_view_on_pilot_settings (GtkWidget *widget, - gpointer data); static void e_day_view_on_delete_occurrence (GtkWidget *widget, gpointer data); static void e_day_view_on_delete_appointment (GtkWidget *widget, @@ -3739,10 +3737,8 @@ static EPopupMenu main_items [] = { E_POPUP_SEPARATOR, - E_POPUP_ITEM (N_("_Configure..."), + E_POPUP_ITEM (N_("_Settings..."), e_day_view_on_settings, 0), - E_POPUP_ITEM (N_("_Configure Pilot..."), - e_day_view_on_pilot_settings, 0), E_POPUP_TERMINATOR }; @@ -4124,29 +4120,6 @@ e_day_view_on_settings (GtkWidget *widget, gpointer data) } static void -e_day_view_on_pilot_settings (GtkWidget *widget, gpointer data) -{ - char *args[] = { - "gpilotd-control-applet", - NULL - }; - int pid; - - args[0] = gnome_is_program_in_path ("gpilotd-control-applet"); - if (!args[0]) { - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, - _("The GNOME Pilot tools do not appear to be installed on this system.")); - return; - } - - pid = gnome_execute_async (NULL, 4, args); - if (pid == -1) - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, _("Error executing %s."), args[0]); - - g_free (args[0]); -} - -static void e_day_view_on_delete_occurrence (GtkWidget *widget, gpointer data) { EDayView *day_view; diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 084d33c414..66ddc9a32e 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -205,8 +205,6 @@ static void e_week_view_on_publish (GtkWidget *widget, gpointer data); static void e_week_view_on_settings (GtkWidget *widget, gpointer data); -static void e_week_view_on_pilot_settings (GtkWidget *widget, - gpointer data); static void e_week_view_on_delete_occurrence (GtkWidget *widget, gpointer data); static void e_week_view_on_delete_appointment (GtkWidget *widget, @@ -3538,8 +3536,7 @@ static EPopupMenu main_items [] = { E_POPUP_SEPARATOR, - E_POPUP_ITEM (N_("_Configure..."), e_week_view_on_settings, 0), - E_POPUP_ITEM (N_("_Configure Pilot..."), e_week_view_on_pilot_settings, 0), + E_POPUP_ITEM (N_("_Settings..."), e_week_view_on_settings, 0), E_POPUP_TERMINATOR }; @@ -3879,29 +3876,6 @@ e_week_view_on_settings (GtkWidget *widget, gpointer data) } static void -e_week_view_on_pilot_settings (GtkWidget *widget, gpointer data) -{ - char *args[] = { - "gpilotd-control-applet", - NULL - }; - int pid; - - args[0] = gnome_is_program_in_path ("gpilotd-control-applet"); - if (!args[0]) { - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, - _("The GNOME Pilot tools do not appear to be installed on this system.")); - return; - } - - pid = gnome_execute_async (NULL, 4, args); - if (pid == -1) - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, _("Error executing %s."), args[0]); - - g_free (args[0]); -} - -static void e_week_view_on_delete_occurrence (GtkWidget *widget, gpointer data) { EWeekView *week_view; |