|
|
Author: mbarnes
Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3324
Modified Files:
evolution.spec
Added Files:
evolution-2.10.1-fix-help.patch
Log Message:
* Fri Apr 13 2007 Matthew Barnes <mbarnes@xxxxxxxxxx> - 2.10.1-3.fc7
- Add patch for RH bug #235878 (make Help->Contents work again).
evolution-2.10.1-fix-help.patch:
addressbook/gui/contact-editor/e-contact-editor.c | 11 ++--
calendar/gui/dialogs/comp-editor.c | 11 ++--
composer/e-msg-composer.c | 11 ++--
plugins/exchange-operations/exchange-send-options.c | 25 ++++------
shell/e-shell-window.c | 2
widgets/misc/e-multi-config-dialog.c | 11 ++--
widgets/misc/e-send-options.c | 50 +++++++++-----------
7 files changed, 57 insertions(+), 64 deletions(-)
--- NEW FILE evolution-2.10.1-fix-help.patch ---
--- 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);
+ }
}
Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- evolution.spec 11 Apr 2007 03:11:35 -0000 1.244
+++ evolution.spec 14 Apr 2007 03:06:01 -0000 1.245
@@ -47,7 +47,7 @@
Name: evolution
Version: 2.10.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPL
Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite
@@ -161,6 +161,9 @@
# GNOME bug #427939 (gnome-doc-utils)
Patch48: evolution-2.10.1-fix-gnome-doc-utils.patch
+# RH bug 235878 / GNOME bug #386503
+Patch49: evolution-2.10.1-fix-help.patch
+
## Dependencies ###
Requires(post): GConf2
@@ -314,6 +317,7 @@
%patch46 -p1 -b .use-glib-i18n
%patch47 -p1 -b .drop-old-glib-support
%patch48 -p1 -b .fix-gnome-doc-utils
+%patch49 -p1 -b .fix-help
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@@ -730,6 +734,9 @@
%{_libdir}/evolution/%{evo_major}/libmenus.so
%changelog
+* Fri Apr 13 2007 Matthew Barnes <mbarnes@xxxxxxxxxx> - 2.10.1-3.fc7
+- Add patch for RH bug #235878 (make Help->Contents work again).
+
* Tue Apr 10 2007 Matthew Barnes <mbarnes@xxxxxxxxxx> - 2.10.1-2.fc7
- Revise patch for GNOME bug #362638 to fix RH bug #235096
(crash when displaying a mail server message to user).
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|