From 8bebb05056fd093d0302546fc65edb130c3c136a Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Sun, 3 Jun 2007 15:07:55 +0000 Subject: ** Fix for bug #386503 from Matthew Barnes svn path=/trunk/; revision=33647 --- addressbook/ChangeLog | 6 +++ addressbook/gui/contact-editor/e-contact-editor.c | 11 +++-- calendar/ChangeLog | 6 +++ calendar/gui/dialogs/comp-editor.c | 11 +++-- composer/ChangeLog | 6 +++ composer/e-msg-composer.c | 11 +++-- plugins/exchange-operations/ChangeLog | 6 +++ .../exchange-operations/exchange-send-options.c | 25 ++++++----- shell/ChangeLog | 7 +++ shell/e-shell-window.c | 2 +- shell/main.c | 2 +- widgets/misc/ChangeLog | 7 +++ widgets/misc/e-multi-config-dialog.c | 11 +++-- widgets/misc/e-send-options.c | 50 +++++++++++----------- 14 files changed, 96 insertions(+), 65 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index ff685225ac..5d05f411c4 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,9 @@ +2007-06-03 Srinivasa Ragavan + + ** Fix for bug #386503 from Matthew Barnes + + * gui/contact-editor/e-contact-editor.c: (show_help_cb): + 2007-06-03 Srinivasa Ragavan ** Fix for version removal from Installed files from Gilles Dartiguelongue diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 9f35370fa9..ab1978f627 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -3228,13 +3228,12 @@ show_help_cb (GtkWidget *widget, gpointer data) { GError *error = NULL; - gnome_help_display_desktop (NULL, - "evolution-" BASE_VERSION, - "evolution-" BASE_VERSION ".xml", - "usage-contact-cards", - &error); - if (error != NULL) + gnome_help_display ( + "evolution.xml", "usage-contact-cards", &error); + if (error != NULL) { g_warning ("%s", error->message); + g_error_free (error); + } } static GList * diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 333c5b6ab3..174e5ebe16 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2007-06-03 Srinivasa Ragavan + + ** Fix for bug #386503 from Matthew Barnes + + * gui/dialogs/comp-editor.c: (comp_editor_show_help): + 2007-06-03 Srinivasa Ragavan ** Fix for version removal from Installed files from Gilles Dartiguelongue diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index c20791eb3f..59f805c1e1 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -1695,13 +1695,12 @@ comp_editor_show_help (CompEditor *editor) priv = editor->priv; - gnome_help_display_desktop (NULL, - "evolution-" BASE_VERSION, - "evolution-" BASE_VERSION ".xml", - priv->help_section, - &error); - if (error != NULL) + gnome_help_display ( + "evolution.xml", priv->help_section, &error); + if (error != NULL) { g_warning ("%s", error->message); + g_error_free (error); + } } diff --git a/composer/ChangeLog b/composer/ChangeLog index 5bfb0e6035..a6c54e6784 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,9 @@ +2007-06-03 Srinivasa Ragavan + + ** Fix for bug #386503 from Matthew Barnes + + * e-msg-composer.c: (e_msg_composer_show_help): + 2007-06-01 Srinivasa Ragavan ** Fix for bug #315012 from Pascal Terjan diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 57c6e4f40c..d142c08edb 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -2879,13 +2879,12 @@ e_msg_composer_show_help (EMsgComposer *composer) { GError *error = NULL; - gnome_help_display_desktop (NULL, - "evolution-" BASE_VERSION, - "evolution-" BASE_VERSION ".xml", - "usage-composer", - &error); - if (error != NULL) + gnome_help_display ( + "evolution.xml", "usage-composer", &error); + if (error != NULL) { g_warning ("%s", error->message); + g_error_free (error); + } } diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog index 1407b97101..e86c3d2dcf 100644 --- a/plugins/exchange-operations/ChangeLog +++ b/plugins/exchange-operations/ChangeLog @@ -1,3 +1,9 @@ +2007-06-03 Srinivasa Ragavan + + ** Fix for bug #386503 from Matthew Barnes + + * exchange-send-options.c: (exchange_send_options_cb): + 2007-05-25 Matthew Barnes * exchange-config-listener.c (exchange_add_autocompletion_folders): diff --git a/plugins/exchange-operations/exchange-send-options.c b/plugins/exchange-operations/exchange-send-options.c index 0c9d405875..68bfc89fce 100644 --- a/plugins/exchange-operations/exchange-send-options.c +++ b/plugins/exchange-operations/exchange-send-options.c @@ -191,21 +191,20 @@ static void exchange_send_options_cb (GtkDialog *dialog, gint state, gpointer fu switch (state) { case GTK_RESPONSE_OK: - exchange_send_options_get_widgets_data (sod); + exchange_send_options_get_widgets_data (sod); case GTK_RESPONSE_CANCEL: - gtk_widget_hide (priv->main); - gtk_widget_destroy (priv->main); - g_object_unref (priv->xml); - break; + gtk_widget_hide (priv->main); + gtk_widget_destroy (priv->main); + g_object_unref (priv->xml); + break; case GTK_RESPONSE_HELP: - gnome_help_display_desktop (NULL, - "evolution-" BASE_VERSION, - "evolution-" BASE_VERSION ".xml", - priv->help_section, - &error); - if (error != NULL) - g_warning ("%s", error->message); - break; + gnome_help_display ( + "evolution.xml", priv->help_section, &error); + if (error != NULL) { + g_warning ("%s", error->message); + g_error_free (error); + } + break; } g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state); diff --git a/shell/ChangeLog b/shell/ChangeLog index ecf87434e7..02572610ac 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2007-06-03 Srinivasa Ragavan + + ** Fix for bug #386503 from Matthew Barnes + + * e-shell-window.c: (e_shell_window_new): + * main.c: (main): + 2007-06-03 Srinivasa Ragavan ** Fix for version removal from Installed files from Gilles Dartiguelongue diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index a5475b078f..c6ec497234 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -1066,7 +1066,7 @@ e_shell_window_new (EShell *shell, bonobo_ui_util_set_ui (priv->ui_component, PREFIX, xmlfile, - "evolution-" BASE_VERSION, NULL); + "evolution", NULL); g_free (xmlfile); e_shell_window_commands_setup (window); diff --git a/shell/main.c b/shell/main.c index 9667b862f8..407286d4fb 100644 --- a/shell/main.c +++ b/shell/main.c @@ -502,7 +502,7 @@ main (int argc, char **argv) g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE); - program = gnome_program_init (PACKAGE "-" BASE_VERSION, VERSION, LIBGNOMEUI_MODULE, argc, argv, + program = gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv, GNOME_PROGRAM_STANDARD_PROPERTIES, GNOME_PARAM_GOPTION_CONTEXT, context, GNOME_PARAM_HUMAN_READABLE_NAME, _("Evolution"), diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index b6e336aa55..0eac87d410 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,10 @@ +2007-06-03 Srinivasa Ragavan + + ** Fix for bug #386503 from Matthew Barnes + + * e-multi-config-dialog.c: (impl_response): + * e-send-options.c: (e_send_options_cb): + 2007-06-03 Srinivasa Ragavan ** Fix for bug #416031 from Martin Jürgens diff --git a/widgets/misc/e-multi-config-dialog.c b/widgets/misc/e-multi-config-dialog.c index 360c124f66..b63b7827e4 100644 --- a/widgets/misc/e-multi-config-dialog.c +++ b/widgets/misc/e-multi-config-dialog.c @@ -193,13 +193,12 @@ impl_response (GtkDialog *dialog, int response_id) switch (response_id) { case GTK_RESPONSE_HELP: - gnome_help_display_desktop (NULL, - "evolution-" BASE_VERSION, - "evolution-" BASE_VERSION ".xml", - "config-prefs", - &error); - if (error != NULL) + gnome_help_display ( + "evolution.xml", "config-prefs", &error); + if (error != NULL) { g_warning ("%s", error->message); + g_error_free (error); + } break; case GTK_RESPONSE_CLOSE: default: diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c index f0c6fe42a1..1eae245547 100644 --- a/widgets/misc/e-send-options.c +++ b/widgets/misc/e-send-options.c @@ -588,34 +588,32 @@ e_sendoptions_set_global (ESendOptionsDialog *sod, gboolean set) static void e_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data) { + ESendOptionsDialogPrivate *priv; + ESendOptionsDialog *sod; + GError *error = NULL; + + sod = func_data; + priv = sod->priv; - ESendOptionsDialogPrivate *priv; - ESendOptionsDialog *sod; - GError *error = NULL; - - sod = func_data; - priv = sod->priv; - - switch (state) { - case GTK_RESPONSE_OK: - e_send_options_get_widgets_data (sod); - case GTK_RESPONSE_CANCEL: - gtk_widget_hide (priv->main); - gtk_widget_destroy (priv->main); - g_object_unref (priv->xml); - break; - case GTK_RESPONSE_HELP: - gnome_help_display_desktop (NULL, - "evolution-" BASE_VERSION, - "evolution-" BASE_VERSION ".xml", - priv->help_section, - &error); - if (error != NULL) - g_warning ("%s", error->message); - break; - } - g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state); + switch (state) { + case GTK_RESPONSE_OK: + e_send_options_get_widgets_data (sod); + case GTK_RESPONSE_CANCEL: + gtk_widget_hide (priv->main); + gtk_widget_destroy (priv->main); + g_object_unref (priv->xml); + break; + case GTK_RESPONSE_HELP: + gnome_help_display ( + "evolution.xml", priv->help_section, &error); + if (error != NULL) { + g_warning ("%s", error->message); + g_error_free (error); + } + break; + } + g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state); } gboolean -- cgit