diff options
| author | Srinivasa Ragavan <sragavan@src.gnome.org> | 2007-06-03 23:07:55 +0800 |
|---|---|---|
| committer | Srinivasa Ragavan <sragavan@src.gnome.org> | 2007-06-03 23:07:55 +0800 |
| commit | 8bebb05056fd093d0302546fc65edb130c3c136a (patch) | |
| tree | d6b46a985b77386944f97ac87d203fdc912497fc /widgets/misc | |
| parent | 54a9260f696f5c7462f40af8f838d723ba3abeb5 (diff) | |
| download | gsoc2013-evolution-8bebb05056fd093d0302546fc65edb130c3c136a.tar gsoc2013-evolution-8bebb05056fd093d0302546fc65edb130c3c136a.tar.gz gsoc2013-evolution-8bebb05056fd093d0302546fc65edb130c3c136a.tar.bz2 gsoc2013-evolution-8bebb05056fd093d0302546fc65edb130c3c136a.tar.lz gsoc2013-evolution-8bebb05056fd093d0302546fc65edb130c3c136a.tar.xz gsoc2013-evolution-8bebb05056fd093d0302546fc65edb130c3c136a.tar.zst gsoc2013-evolution-8bebb05056fd093d0302546fc65edb130c3c136a.zip | |
** Fix for bug #386503 from Matthew Barnes
svn path=/trunk/; revision=33647
Diffstat (limited to 'widgets/misc')
| -rw-r--r-- | widgets/misc/ChangeLog | 7 | ||||
| -rw-r--r-- | widgets/misc/e-multi-config-dialog.c | 11 | ||||
| -rw-r--r-- | widgets/misc/e-send-options.c | 50 |
3 files changed, 36 insertions, 32 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index b6e336aa55..0eac87d410 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,5 +1,12 @@ 2007-06-03 Srinivasa Ragavan <sragavan@novell.com> + ** 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 <sragavan@novell.com> + ** Fix for bug #416031 from Martin Jürgens * e-charset-picker.c: 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 |