r798 - /unstable/evolution/debian/patches/35_unversioned-help.patch
oysteigi-guest at users.alioth.debian.org
oysteigi-guest at users.alioth.debian.org
Sat May 12 21:22:24 UTC 2007
Author: oysteigi-guest
Date: Sat May 12 21:22:24 2007
New Revision: 798
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=798
Log:
Add previously forgotten unversioned help patch
Added:
unstable/evolution/debian/patches/35_unversioned-help.patch
Added: unstable/evolution/debian/patches/35_unversioned-help.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/35_unversioned-help.patch?rev=798&op=file
==============================================================================
--- unstable/evolution/debian/patches/35_unversioned-help.patch (added)
+++ unstable/evolution/debian/patches/35_unversioned-help.patch Sat May 12 21:22:24 2007
@@ -1,0 +1,219 @@
+Index: addressbook/gui/contact-editor/e-contact-editor.c
+===================================================================
+--- addressbook/gui/contact-editor/e-contact-editor.c (revision 33422)
++++ addressbook/gui/contact-editor/e-contact-editor.c (working copy)
+@@ -3222,13 +3222,12 @@ show_help_cb (GtkWidget *widget, gpointe
+ {
+ 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 *
+Index: shell/e-shell-window.c
+===================================================================
+--- shell/e-shell-window.c (revision 33422)
++++ shell/e-shell-window.c (working copy)
+@@ -1042,7 +1042,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);
+Index: shell/main.c
+===================================================================
+--- shell/main.c (revision 33422)
++++ shell/main.c (working copy)
+@@ -497,7 +497,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"),
+Index: plugins/exchange-operations/exchange-send-options.c
+===================================================================
+--- plugins/exchange-operations/exchange-send-options.c (revision 33422)
++++ plugins/exchange-operations/exchange-send-options.c (working copy)
+@@ -191,21 +191,20 @@ static void exchange_send_options_cb (Gt
+
+ 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);
+
+Index: composer/e-msg-composer.c
+===================================================================
+--- composer/e-msg-composer.c (revision 33422)
++++ composer/e-msg-composer.c (working copy)
+@@ -2879,13 +2879,12 @@ e_msg_composer_show_help (EMsgComposer *
+ {
+ 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);
++ }
+ }
+
+
+Index: widgets/misc/e-multi-config-dialog.c
+===================================================================
+--- widgets/misc/e-multi-config-dialog.c (revision 33422)
++++ widgets/misc/e-multi-config-dialog.c (working copy)
+@@ -192,13 +192,12 @@ impl_response (GtkDialog *dialog, int re
+
+ 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:
+Index: widgets/misc/e-send-options.c
+===================================================================
+--- widgets/misc/e-send-options.c (revision 33422)
++++ widgets/misc/e-send-options.c (working copy)
+@@ -588,34 +588,32 @@ e_sendoptions_set_global (ESendOptionsDi
+
+ static void e_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data)
+ {
++ ESendOptionsDialogPrivate *priv;
++ ESendOptionsDialog *sod;
++ GError *error = NULL;
+
+- 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);
++ 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 (
++ "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
+Index: calendar/gui/dialogs/comp-editor.c
+===================================================================
+--- calendar/gui/dialogs/comp-editor.c (revision 33422)
++++ calendar/gui/dialogs/comp-editor.c (working copy)
+@@ -1693,13 +1693,12 @@ comp_editor_show_help (CompEditor *edito
+
+ 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);
++ }
+ }
+
+
More information about the pkg-evolution-commits
mailing list