From f150fa0b160ca7aa013cf6b9db644df1547f59d4 Mon Sep 17 00:00:00 2001 From: Matthew Loper Date: Tue, 9 May 2000 16:46:59 +0000 Subject: + * calendar/pcs/cal-backend.c (cal_backend_add_cal): Return nothing + for a 'void' function. + * folder-browser-factory.c (control_activate): Remove "File->mail" + menuitem. + * e-shell-view-menu.c (command_run_bugbuddy): New function; allows + users to submit a bug. svn path=/trunk/; revision=2948 --- ChangeLog | 5 +++++ calendar/pcs/cal-backend.c | 2 +- mail/ChangeLog | 3 +++ mail/folder-browser-factory.c | 8 ++------ shell/ChangeLog | 5 +++++ shell/e-shell-view-menu.c | 17 +++++++++++++++++ 6 files changed, 33 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 19dc892109..2a3569ee10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-05-09 Matt Loper + + * calendar/pcs/cal-backend.c (cal_backend_add_cal): Return nothing + for a 'void' function. + 2000-05-08 Christopher James Lahey * widget/e-text/e-text.c, widgets/e-text/e-text.h: Added an diff --git a/calendar/pcs/cal-backend.c b/calendar/pcs/cal-backend.c index 27cc3e53ce..335d7ff591 100644 --- a/calendar/pcs/cal-backend.c +++ b/calendar/pcs/cal-backend.c @@ -134,7 +134,7 @@ cal_backend_add_cal (CalBackend *backend, Cal *cal) g_return_if_fail (IS_CAL_BACKEND (backend)); g_assert (CLASS (backend)->add_cal != NULL); - return (* CLASS (backend)->add_cal) (backend, cal); + (* CLASS (backend)->add_cal) (backend, cal); } /** diff --git a/mail/ChangeLog b/mail/ChangeLog index 1798565251..6836f0db1c 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,8 @@ 2000-05-09 Matt Loper + * folder-browser-factory.c (control_activate): Remove "File->mail" + menuitem. + * mail-config.c (mail_config_druid): Fill in "blah blah blah". 2000-05-09 Dan Winship diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c index e21240a5f8..f88962a0f7 100644 --- a/mail/folder-browser-factory.c +++ b/mail/folder-browser-factory.c @@ -141,14 +141,10 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih) folder_browser = bonobo_control_get_widget (control); - bonobo_ui_handler_menu_new_item (uih, "/File/Mail", N_("_Mail"), - NULL, -1, - BONOBO_UI_HANDLER_PIXMAP_NONE, NULL, - 0, 0, send_msg, NULL); - bonobo_ui_handler_menu_new_item (uih, "/Tools/Expunge", N_("_Expunge"), NULL, -1, - BONOBO_UI_HANDLER_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_TRASH, + BONOBO_UI_HANDLER_PIXMAP_STOCK, + GNOME_STOCK_PIXMAP_TRASH, 0, 0, expunge_folder, folder_browser); toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, diff --git a/shell/ChangeLog b/shell/ChangeLog index 90400d3fe1..ffe06a1e29 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,8 @@ +2000-05-09 Matt Loper + + * e-shell-view-menu.c (command_run_bugbuddy): New function; allows + users to submit a bug. + 2000-05-09 Ettore Perazzoli * e-shell.c (e_shell_new_view): Display the specified @uri in the diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c index 156b81ed30..f0d4bdc9c0 100644 --- a/shell/e-shell-view-menu.c +++ b/shell/e-shell-view-menu.c @@ -43,9 +43,19 @@ command_quit (GtkWidget *widget, e_shell_quit (shell); } +static void +command_run_bugbuddy (GtkWidget *widget, gpointer data) +{ + + +} + + /* Unimplemented commands. */ + + #define DEFINE_UNIMPLEMENTED(func) \ static void \ func (GtkWidget *widget, gpointer data) \ @@ -176,6 +186,13 @@ static GnomeUIInfo menu_actions [] = { GNOMEUIINFO_END }; +static GnomeUIInfo menu_help [] = { + { GNOME_APP_UI_ITEM, N_("_Submit bug"), + N_("Submit bug-report via bug-buddy"), command_run_bugbuddy, NULL, + NULL, 0, 0, 'n', GDK_CONTROL_MASK | GDK_SHIFT_MASK }, + GNOMEUIINFO_END +}; + /* Menu bar. */ -- cgit v1.2.3