rpms/evolution
7
0
Fork 0
Code Issues Pull Requests Releases Activity
44323b7305
evolution/evolution-2.10.1-fix-help.patch

193 lines
5.8 KiB
Diff
Raw Blame History

--- evolution-2.10.1/widgets/misc/e-multi-config-dialog.c.fix-help 2007-04-09 09:10:24.000000000 -0400
+++ evolution-2.10.1/widgets/misc/e-multi-config-dialog.c 2007-04-13 22:26:25.000000000 -0400
@@ -192,13 +192,12 @@
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:
--- evolution-2.10.1/widgets/misc/e-send-options.c.fix-help 2007-04-13 22:25:21.000000000 -0400
+++ evolution-2.10.1/widgets/misc/e-send-options.c 2007-04-13 22:26:25.000000000 -0400
@@ -588,34 +588,32 @@
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
--- evolution-2.10.1/plugins/exchange-operations/exchange-send-options.c.fix-help 2007-04-13 22:25:21.000000000 -0400
+++ evolution-2.10.1/plugins/exchange-operations/exchange-send-options.c 2007-04-13 22:26:25.000000000 -0400
@@ -191,21 +191,20 @@
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);
--- evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor.c.fix-help 2007-04-13 22:25:21.000000000 -0400
+++ evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor.c 2007-04-13 22:26:02.000000000 -0400
@@ -3235,13 +3235,12 @@
{
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 *
--- evolution-2.10.1/composer/e-msg-composer.c.fix-help 2007-04-13 22:25:21.000000000 -0400
+++ evolution-2.10.1/composer/e-msg-composer.c 2007-04-13 22:26:25.000000000 -0400
@@ -2886,13 +2886,12 @@
GError *error = NULL;
EMsgComposerPrivate *p = composer->priv;
- 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);
+ }
}
--- evolution-2.10.1/shell/e-shell-window.c.fix-help 2007-04-13 22:25:21.000000000 -0400
+++ evolution-2.10.1/shell/e-shell-window.c 2007-04-13 22:26:02.000000000 -0400
@@ -1042,7 +1042,7 @@
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);
--- evolution-2.10.1/calendar/gui/dialogs/comp-editor.c.fix-help 2007-04-13 22:25:21.000000000 -0400
+++ evolution-2.10.1/calendar/gui/dialogs/comp-editor.c 2007-04-13 22:26:25.000000000 -0400
@@ -1693,13 +1693,12 @@
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);
+ }
}
Reference in New Issue View Git Blame Copy Permalink