From 59b1e25cfdb4253a94df4392d1e2fb69a6901515 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Tue, 2 Jan 2001 18:16:45 +0000 Subject: Do not compose strings so that they can be localized correctly. Also, 2001-01-02 Federico Mena Quintero * gui/dialogs/delete-comp.c (delete_component_dialog): Do not compose strings so that they can be localized correctly. Also, convert from UTF8 into the font's encoding. Fixes bug #1030. * gui/e-calendar-table.c (delete_component): Pass the widget argument to delete_component_dialog(). * gui/e-day-view.c (e_day_view_on_delete_appointment): Likewise. * gui/e-week-view.c (e_week_view_on_delete_appointment): Likewise. * gui/event-editor.c (file_delete_cb): Likewise. * gui/calendar-commands.c: Use BONOBO_UI_VERB() instead of BONOBO_UI_UNSAFE_VERB(). Guess what, all of our handler signatures were wrong. * gui/event-editor.c: Likewise. * gui/dialogs/task-editor.c: Likewise. * gui/goto-dialog.glade: Added some spacing between the month/year widgets and the calendar widget. svn path=/trunk/; revision=7211 --- calendar/ChangeLog | 26 ++++++++++ calendar/gui/calendar-commands.c | 103 +++++++++++++++++++++++-------------- calendar/gui/dialogs/delete-comp.c | 52 +++++++++++++------ calendar/gui/dialogs/delete-comp.h | 2 +- calendar/gui/dialogs/task-editor.c | 32 ++++++------ calendar/gui/e-calendar-table.c | 8 +-- calendar/gui/e-day-view.c | 2 +- calendar/gui/e-week-view.c | 2 +- calendar/gui/event-editor.c | 30 +++++------ calendar/gui/goto-dialog.glade | 8 +-- calendar/gui/goto-dialog.glade.h | 25 +++++---- 11 files changed, 178 insertions(+), 112 deletions(-) diff --git a/calendar/ChangeLog b/calendar/ChangeLog index b372baa31e..04abb82c3b 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,29 @@ +2001-01-02 Federico Mena Quintero + + * gui/dialogs/delete-comp.c (delete_component_dialog): Do not + compose strings so that they can be localized correctly. Also, + convert from UTF8 into the font's encoding. Fixes bug #1030. + + * gui/e-calendar-table.c (delete_component): Pass the widget + argument to delete_component_dialog(). + + * gui/e-day-view.c (e_day_view_on_delete_appointment): Likewise. + + * gui/e-week-view.c (e_week_view_on_delete_appointment): Likewise. + + * gui/event-editor.c (file_delete_cb): Likewise. + + * gui/calendar-commands.c: Use BONOBO_UI_VERB() instead of + BONOBO_UI_UNSAFE_VERB(). Guess what, all of our handler + signatures were wrong. + + * gui/event-editor.c: Likewise. + + * gui/dialogs/task-editor.c: Likewise. + + * gui/goto-dialog.glade: Added some spacing between the month/year + widgets and the calendar widget. + 2001-01-01 Federico Mena Quintero * gui/gnome-cal.c (gnome_calendar_destroy): Unconditionally remove diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index 7b6c909f76..f56d941d2c 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -50,11 +50,11 @@ static void set_pixmap (BonoboUIComponent *uic, /* Callback for the new appointment command */ static void -new_appointment_cb (BonoboUIComponent *uih, void *user_data, const char *path) +new_appointment_cb (BonoboUIComponent *uic, gpointer data, const char *path) { GnomeCalendar *gcal; - gcal = GNOME_CALENDAR (user_data); + gcal = GNOME_CALENDAR (data); gnome_calendar_new_appointment (gcal); } @@ -85,7 +85,7 @@ print (GnomeCalendar *gcal, gboolean preview) /* File/Print callback */ static void -file_print_cb (BonoboUIComponent *uih, void *data, const char *path) +file_print_cb (BonoboUIComponent *uic, gpointer data, const char *path) { GnomeCalendar *gcal; @@ -127,74 +127,94 @@ set_normal_cursor (GnomeCalendar *gcal) } static void -previous_clicked (BonoboUIComponent *uih, void *user_data, const char *path) +previous_clicked (BonoboUIComponent *uic, gpointer data, const char *path) { - GnomeCalendar *gcal = GNOME_CALENDAR (user_data); + GnomeCalendar *gcal; + + gcal = GNOME_CALENDAR (data); + set_clock_cursor (gcal); gnome_calendar_previous (gcal); set_normal_cursor (gcal); } static void -next_clicked (BonoboUIComponent *uih, void *user_data, const char *path) +next_clicked (BonoboUIComponent *uic, gpointer data, const char *path) { - GnomeCalendar *gcal = GNOME_CALENDAR (user_data); + GnomeCalendar *gcal; + + gcal = GNOME_CALENDAR (data); + set_clock_cursor (gcal); gnome_calendar_next (gcal); set_normal_cursor (gcal); } static void -today_clicked (BonoboUIComponent *uih, void *user_data, const char *path) +today_clicked (BonoboUIComponent *uic, gpointer data, const char *path) { - GnomeCalendar *gcal = GNOME_CALENDAR (user_data); + GnomeCalendar *gcal; + + gcal = GNOME_CALENDAR (data); + set_clock_cursor (gcal); gnome_calendar_goto_today (gcal); set_normal_cursor (gcal); } static void -goto_clicked (BonoboUIComponent *uih, void *user_data, const char *path) +goto_clicked (BonoboUIComponent *uic, gpointer data, const char *path) { - GnomeCalendar *gcal = GNOME_CALENDAR (user_data); + GnomeCalendar *gcal; + + gcal = GNOME_CALENDAR (data); + goto_dialog (gcal); } static void -show_day_view_clicked (BonoboUIComponent *uih, void *user_data, const char *path) +show_day_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path) { - GnomeCalendar *gcal = GNOME_CALENDAR (user_data); + GnomeCalendar *gcal; + + gcal = GNOME_CALENDAR (data); gnome_calendar_set_view (gcal, "dayview", FALSE, TRUE); } static void -show_work_week_view_clicked (BonoboUIComponent *uih, void *user_data, const char *path) +show_work_week_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path) { - GnomeCalendar *gcal = GNOME_CALENDAR (user_data); + GnomeCalendar *gcal; + + gcal = GNOME_CALENDAR (data); gnome_calendar_set_view (gcal, "workweekview", FALSE, TRUE); } static void -show_week_view_clicked (BonoboUIComponent *uih, void *user_data, const char *path) +show_week_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path) { - GnomeCalendar *gcal = GNOME_CALENDAR (user_data); + GnomeCalendar *gcal; + + gcal = GNOME_CALENDAR (data); gnome_calendar_set_view (gcal, "weekview", FALSE, TRUE); } static void -show_month_view_clicked (BonoboUIComponent *uih, void *user_data, const char *path) +show_month_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path) { - GnomeCalendar *gcal = GNOME_CALENDAR (user_data); + GnomeCalendar *gcal; + + gcal = GNOME_CALENDAR (data); gnome_calendar_set_view (gcal, "monthview", FALSE, TRUE); } static void -new_calendar_cmd (BonoboUIComponent *uih, void *user_data, const char *path) +new_calendar_cmd (BonoboUIComponent *uic, gpointer data, const char *path) { new_calendar (); } @@ -226,7 +246,7 @@ open_ok (GtkWidget *widget, GtkFileSelection *fs) } static void -open_calendar_cmd (BonoboUIComponent *uih, void *user_data, const char *path) +open_calendar_cmd (BonoboUIComponent *uic, gpointer data, const char *path) { GtkFileSelection *fs; @@ -265,12 +285,15 @@ close_save (GtkWidget *w) } static void -save_as_calendar_cmd (BonoboUIComponent *uih, void *user_data, const char *path) +save_as_calendar_cmd (BonoboUIComponent *uic, gpointer data, const char *path) { + GnomeCalendar *gcal; GtkFileSelection *fs; + gcal = GNOME_CALENDAR (data); + fs = GTK_FILE_SELECTION (gtk_file_selection_new (_("Save calendar"))); - gtk_object_set_user_data (GTK_OBJECT (fs), user_data); + gtk_object_set_user_data (GTK_OBJECT (fs), gcal); gtk_signal_connect (GTK_OBJECT (fs->ok_button), "clicked", (GtkSignalFunc) save_ok, @@ -288,7 +311,7 @@ save_as_calendar_cmd (BonoboUIComponent *uih, void *user_data, const char *path) } static void -properties_cmd (BonoboUIComponent *uih, void *user_data, const char *path) +properties_cmd (BonoboUIComponent *uic, gpointer data, const char *path) { if (!preferences_dialog) preferences_dialog = cal_prefs_dialog_new (); @@ -298,22 +321,22 @@ properties_cmd (BonoboUIComponent *uih, void *user_data, const char *path) static BonoboUIVerb verbs [] = { - BONOBO_UI_UNSAFE_VERB ("CalendarNew", new_calendar_cmd), - BONOBO_UI_UNSAFE_VERB ("CalendarOpen", open_calendar_cmd), - BONOBO_UI_UNSAFE_VERB ("CalendarSaveAs", save_as_calendar_cmd), - BONOBO_UI_UNSAFE_VERB ("CalendarPrint", file_print_cb), - BONOBO_UI_UNSAFE_VERB ("EditNewAppointment", new_appointment_cb), - BONOBO_UI_UNSAFE_VERB ("CalendarPreferences", properties_cmd), - - BONOBO_UI_UNSAFE_VERB ("CalendarPrev", previous_clicked), - BONOBO_UI_UNSAFE_VERB ("CalendarToday", today_clicked), - BONOBO_UI_UNSAFE_VERB ("CalendarNext", next_clicked), - BONOBO_UI_UNSAFE_VERB ("CalendarGoto", goto_clicked), - - BONOBO_UI_UNSAFE_VERB ("ShowDayView", show_day_view_clicked), - BONOBO_UI_UNSAFE_VERB ("ShowWorkWeekView", show_work_week_view_clicked), - BONOBO_UI_UNSAFE_VERB ("ShowWeekView", show_week_view_clicked), - BONOBO_UI_UNSAFE_VERB ("ShowMonthView", show_month_view_clicked), + BONOBO_UI_VERB ("CalendarNew", new_calendar_cmd), + BONOBO_UI_VERB ("CalendarOpen", open_calendar_cmd), + BONOBO_UI_VERB ("CalendarSaveAs", save_as_calendar_cmd), + BONOBO_UI_VERB ("CalendarPrint", file_print_cb), + BONOBO_UI_VERB ("EditNewAppointment", new_appointment_cb), + BONOBO_UI_VERB ("CalendarPreferences", properties_cmd), + + BONOBO_UI_VERB ("CalendarPrev", previous_clicked), + BONOBO_UI_VERB ("CalendarToday", today_clicked), + BONOBO_UI_VERB ("CalendarNext", next_clicked), + BONOBO_UI_VERB ("CalendarGoto", goto_clicked), + + BONOBO_UI_VERB ("ShowDayView", show_day_view_clicked), + BONOBO_UI_VERB ("ShowWorkWeekView", show_work_week_view_clicked), + BONOBO_UI_VERB ("ShowWeekView", show_week_view_clicked), + BONOBO_UI_VERB ("ShowMonthView", show_month_view_clicked), BONOBO_UI_VERB_END }; diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c index 6133e0d908..97e1b69cd6 100644 --- a/calendar/gui/dialogs/delete-comp.c +++ b/calendar/gui/dialogs/delete-comp.c @@ -24,6 +24,7 @@ #endif #include +#include #include "delete-comp.h" @@ -31,6 +32,8 @@ /** * delete_component_dialog: * @comp: A calendar component. + * @widget: A widget to use as a basis for conversion from UTF8 into font + * encoding. * * Pops up a dialog box asking the user whether he wants to delete a particular * calendar component. @@ -38,31 +41,47 @@ * Return value: TRUE if the user clicked Yes, FALSE otherwise. **/ gboolean -delete_component_dialog (CalComponent *comp) +delete_component_dialog (CalComponent *comp, GtkWidget *widget) { CalComponentText summary; CalComponentVType vtype; - char *str; - char *type; + char *str, *tmp; GtkWidget *dialog; g_return_val_if_fail (comp != NULL, FALSE); g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE); + g_return_val_if_fail (widget != NULL, FALSE); + g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); vtype = cal_component_get_vtype (comp); cal_component_get_summary (comp, &summary); switch (vtype) { case CAL_COMPONENT_EVENT: - type = _("Are you sure you want to delete the appointment"); + if (summary.value) + str = g_strdup_printf (_("Are you sure you want to delete the appointment " + "`%s'?"), summary.value); + else + str = g_strdup (_("Are you sure you want to delete this " + "untitled appointment?")); break; case CAL_COMPONENT_TODO: - type = _("Are you sure you want to delete the task"); + if (summary.value) + str = g_strdup_printf (_("Are you sure you want to delete the task " + "`%s'?"), summary.value); + else + str = g_strdup (_("Are you sure you want to delete this " + "untitled task?")); break; case CAL_COMPONENT_JOURNAL: - type = _("Are you sure you want to delete the journal entry"); + if (summary.value) + str = g_strdup_printf (_("Are you sure you want to delete the journal entry " + "`%s'?"), summary.value); + else + str = g_strdup (_("Are you sure want to delete this " + "untitled journal entry?")); break; default: @@ -70,16 +89,19 @@ delete_component_dialog (CalComponent *comp) return FALSE; } - if (summary.value) - str = g_strdup_printf ("%s `%s'?", type, summary.value); - else - str = g_strdup_printf ("%s?", type); - - dialog = gnome_question_dialog_modal (str, NULL, NULL); + tmp = e_utf8_to_gtk_string (widget, str); g_free (str); - if (gnome_dialog_run (GNOME_DIALOG (dialog)) == GNOME_YES) - return TRUE; - else + if (tmp) { + dialog = gnome_question_dialog_modal (tmp, NULL, NULL); + g_free (tmp); + + if (gnome_dialog_run (GNOME_DIALOG (dialog)) == GNOME_YES) + return TRUE; + else + return FALSE; + } else { + g_message ("delete_component_dialog(): Could not convert the string from UTF8"); return FALSE; + } } diff --git a/calendar/gui/dialogs/delete-comp.h b/calendar/gui/dialogs/delete-comp.h index 6747787fac..cae8531981 100644 --- a/calendar/gui/dialogs/delete-comp.h +++ b/calendar/gui/dialogs/delete-comp.h @@ -24,6 +24,6 @@ #include -gboolean delete_component_dialog (CalComponent *comp); +gboolean delete_component_dialog (CalComponent *comp, GtkWidget *widget); #endif diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c index 6cf73a3a72..ceac6c933d 100644 --- a/calendar/gui/dialogs/task-editor.c +++ b/calendar/gui/dialogs/task-editor.c @@ -138,12 +138,12 @@ static void set_title_from_comp (TaskEditor *tedit, CalComponent *comp); static void clear_widgets (TaskEditor *tedit); static void fill_widgets (TaskEditor *tedit); -static void file_save_cb (GtkWidget *widget, gpointer data); -static void file_save_and_close_cb (GtkWidget *widget, gpointer data); -static void file_delete_cb (GtkWidget *widget, gpointer data); -static void file_close_cb (GtkWidget *widget, gpointer data); +static void file_save_cb (BonoboUIComponent *uic, gpointer data, const char *path); +static void file_save_and_close_cb (BonoboUIComponent *uic, gpointer data, const char *path); +static void file_delete_cb (BonoboUIComponent *uic, gpointer data, const char *path); +static void file_close_cb (BonoboUIComponent *uic, gpointer data, const char *path); -static void debug_xml_cb (GtkWidget *widget, gpointer data); +static void debug_xml_cb (BonoboUIComponent *uic, gpointer data, const char *path); static void save_todo_object (TaskEditor *tedit); static void dialog_to_comp_object (TaskEditor *tedit); @@ -220,12 +220,12 @@ task_editor_new (void) static BonoboUIVerb verbs [] = { - BONOBO_UI_UNSAFE_VERB ("FileSave", file_save_cb), - BONOBO_UI_UNSAFE_VERB ("FileDelete", file_delete_cb), - BONOBO_UI_UNSAFE_VERB ("FileClose", file_close_cb), - BONOBO_UI_UNSAFE_VERB ("FileSaveAndClose", file_save_and_close_cb), - - BONOBO_UI_UNSAFE_VERB ("DebugDumpXml", debug_xml_cb), + BONOBO_UI_VERB ("FileSave", file_save_cb), + BONOBO_UI_VERB ("FileDelete", file_delete_cb), + BONOBO_UI_VERB ("FileClose", file_close_cb), + BONOBO_UI_VERB ("FileSaveAndClose", file_save_and_close_cb), + + BONOBO_UI_VERB ("DebugDumpXml", debug_xml_cb), BONOBO_UI_VERB_END }; @@ -999,7 +999,7 @@ dialog_to_comp_object (TaskEditor *tedit) } static void -debug_xml_cb (GtkWidget *widget, gpointer data) +debug_xml_cb (BonoboUIComponent *uic, gpointer data, const char *path) { TaskEditor *tedit = TASK_EDITOR (data); TaskEditorPrivate *priv = tedit->priv; @@ -1009,7 +1009,7 @@ debug_xml_cb (GtkWidget *widget, gpointer data) /* File/Save callback */ static void -file_save_cb (GtkWidget *widget, gpointer data) +file_save_cb (BonoboUIComponent *uic, gpointer data, const char *path) { TaskEditor *tedit; @@ -1019,7 +1019,7 @@ file_save_cb (GtkWidget *widget, gpointer data) /* File/Save and Close callback */ static void -file_save_and_close_cb (GtkWidget *widget, gpointer data) +file_save_and_close_cb (BonoboUIComponent *uic, gpointer data, const char *path) { TaskEditor *tedit; @@ -1030,7 +1030,7 @@ file_save_and_close_cb (GtkWidget *widget, gpointer data) /* File/Delete callback */ static void -file_delete_cb (GtkWidget *widget, gpointer data) +file_delete_cb (BonoboUIComponent *uic, gpointer data, const char *path) { TaskEditor *tedit; TaskEditorPrivate *priv; @@ -1056,7 +1056,7 @@ file_delete_cb (GtkWidget *widget, gpointer data) /* File/Close callback */ static void -file_close_cb (GtkWidget *widget, gpointer data) +file_close_cb (BonoboUIComponent *uic, gpointer data, const char *path) { TaskEditor *tedit; diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index 9211e8a646..df1c8a5225 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -400,13 +400,13 @@ e_calendar_table_on_mark_task_complete (GtkWidget *menuitem, /* Deletes a component from the table */ static void -delete_component (CalendarModel *model, int row) +delete_component (CalendarModel *model, int row, GtkWidget *widget) { CalComponent *comp; comp = calendar_model_get_component (model, row); - if (delete_component_dialog (comp)) { + if (delete_component_dialog (comp, widget)) { CalClient *client; const char *uid; @@ -426,7 +426,7 @@ e_calendar_table_on_delete_task (GtkWidget *menuitem, { ECalendarMenuData *menu_data = (ECalendarMenuData*) data; - delete_component (menu_data->cal_table->model, menu_data->row); + delete_component (menu_data->cal_table->model, menu_data->row, menuitem); } @@ -439,7 +439,7 @@ e_calendar_table_on_key_press (ETable *table, ECalendarTable *cal_table) { if (event->keyval == GDK_Delete) { - delete_component (cal_table->model, row); + delete_component (cal_table->model, row, GTK_WIDGET (table)); return TRUE; } diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 3ec8e6022a..1f10194cb0 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -3104,7 +3104,7 @@ e_day_view_on_delete_appointment (GtkWidget *widget, gpointer data) if (day_view->editing_event_day >= 0) e_day_view_stop_editing_event (day_view); - if (delete_component_dialog (event->comp)) { + if (delete_component_dialog (event->comp, widget)) { const char *uid; cal_component_get_uid (event->comp, &uid); diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index d5d5520105..c9344c88f4 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -3325,7 +3325,7 @@ e_week_view_on_delete_appointment (GtkWidget *widget, gpointer data) event = &g_array_index (week_view->events, EWeekViewEvent, week_view->popup_event_num); - if (delete_component_dialog (event->comp)) { + if (delete_component_dialog (event->comp, widget)) { const char *uid; cal_component_get_uid (event->comp, &uid); diff --git a/calendar/gui/event-editor.c b/calendar/gui/event-editor.c index 6ddfd859ed..ea2f78ae10 100644 --- a/calendar/gui/event-editor.c +++ b/calendar/gui/event-editor.c @@ -2377,7 +2377,7 @@ close_dialog (EventEditor *ee) static void -debug_xml_cb (GtkWidget *widget, gpointer data) +debug_xml_cb (BonoboUIComponent *uic, gpointer data, const char *path) { EventEditor *ee = EVENT_EDITOR (data); EventEditorPrivate *priv = ee->priv; @@ -2387,7 +2387,7 @@ debug_xml_cb (GtkWidget *widget, gpointer data) /* File/Save callback */ static void -file_save_cb (GtkWidget *widget, gpointer data) +file_save_cb (BonoboUIComponent *uic, gpointer data, const char *path) { EventEditor *ee; @@ -2397,7 +2397,7 @@ file_save_cb (GtkWidget *widget, gpointer data) /* File/Save and Close callback */ static void -file_save_and_close_cb (GtkWidget *widget, gpointer data) +file_save_and_close_cb (BonoboUIComponent *uic, gpointer data, const char *path) { EventEditor *ee; @@ -2408,7 +2408,7 @@ file_save_and_close_cb (GtkWidget *widget, gpointer data) /* File/Delete callback */ static void -file_delete_cb (GtkWidget *widget, gpointer data) +file_delete_cb (BonoboUIComponent *uic, gpointer data, const char *path) { EventEditor *ee; EventEditorPrivate *priv; @@ -2421,7 +2421,7 @@ file_delete_cb (GtkWidget *widget, gpointer data) g_return_if_fail (priv->comp); - if (delete_component_dialog (priv->comp)) { + if (delete_component_dialog (priv->comp, priv->app)) { const char *uid; cal_component_get_uid (priv->comp, &uid); @@ -2437,7 +2437,7 @@ file_delete_cb (GtkWidget *widget, gpointer data) /* File/Close callback */ static void -file_close_cb (GtkWidget *widget, gpointer data) +file_close_cb (BonoboUIComponent *uic, gpointer data, const char *path) { EventEditor *ee; @@ -2450,7 +2450,7 @@ file_close_cb (GtkWidget *widget, gpointer data) } static void -schedule_meeting_cb (GtkWidget *widget, gpointer data) +schedule_meeting_cb (BonoboUIComponent *uic, gpointer data, const char *path) { EventEditor *ee; EventEditorPrivate *priv; @@ -2473,14 +2473,14 @@ schedule_meeting_cb (GtkWidget *widget, gpointer data) * this and the task-editor. */ static BonoboUIVerb verbs [] = { - BONOBO_UI_UNSAFE_VERB ("FileSave", file_save_cb), - BONOBO_UI_UNSAFE_VERB ("FileDelete", file_delete_cb), - BONOBO_UI_UNSAFE_VERB ("FileClose", file_close_cb), - BONOBO_UI_UNSAFE_VERB ("FileSaveAndClose", file_save_and_close_cb), - - BONOBO_UI_UNSAFE_VERB ("ActionScheduleMeeting", schedule_meeting_cb), - - BONOBO_UI_UNSAFE_VERB ("DebugDumpXml", debug_xml_cb), + BONOBO_UI_VERB ("FileSave", file_save_cb), + BONOBO_UI_VERB ("FileDelete", file_delete_cb), + BONOBO_UI_VERB ("FileClose", file_close_cb), + BONOBO_UI_VERB ("FileSaveAndClose", file_save_and_close_cb), + + BONOBO_UI_VERB ("ActionScheduleMeeting", schedule_meeting_cb), + + BONOBO_UI_VERB ("DebugDumpXml", debug_xml_cb), BONOBO_UI_VERB_END }; diff --git a/calendar/gui/goto-dialog.glade b/calendar/gui/goto-dialog.glade index 74198dc2dc..6b81612b6c 100644 --- a/calendar/gui/goto-dialog.glade +++ b/calendar/gui/goto-dialog.glade @@ -79,7 +79,7 @@ GtkVBox vbox False - 0 + 4 0 True @@ -90,7 +90,7 @@ GtkHBox hbox12 True - 3 + 4 0 True @@ -149,10 +149,6 @@ December Placeholder - - - Placeholder - diff --git a/calendar/gui/goto-dialog.glade.h b/calendar/gui/goto-dialog.glade.h index 5d970035fc..8701da0ec8 100644 --- a/calendar/gui/goto-dialog.glade.h +++ b/calendar/gui/goto-dialog.glade.h @@ -6,16 +6,15 @@ gchar *s = N_("Go To Date"); gchar *s = N_("Go To Today"); -gchar *s = N_("January\n" - "February\n" - "March\n" - "April\n" - "May\n" - "June\n" - "July\n" - "August\n" - "September\n" - "October\n" - "November\n" - "December\n" - ""); +gchar *s = N_("January"); +gchar *s = N_("February"); +gchar *s = N_("March"); +gchar *s = N_("April"); +gchar *s = N_("May"); +gchar *s = N_("June"); +gchar *s = N_("July"); +gchar *s = N_("August"); +gchar *s = N_("September"); +gchar *s = N_("October"); +gchar *s = N_("November"); +gchar *s = N_("December"); -- cgit v1.2.3