GNOME.org
 

[evolution-patches] Fix for #37578 - Help Pages Not Displayed

Here's a patch to fix the help pages not being loaded from the menus.


-- dobey


? addressbook/backend/ebook/Evolution-Composer-common.c
? addressbook/backend/ebook/Evolution-Composer-skels.c
? addressbook/backend/ebook/Evolution-Composer-stubs.c
? addressbook/backend/ebook/Evolution-Composer.h
? calendar/gui/dialogs/Evolution-Addressbook-SelectNames-common.c
? calendar/gui/dialogs/Evolution-Addressbook-SelectNames-skels.c
? calendar/gui/dialogs/Evolution-Addressbook-SelectNames-stubs.c
Index: shell/e-shell-view.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-view.c,v
retrieving revision 1.280
diff -u -r1.280 e-shell-view.c
--- shell/e-shell-view.c	6 Apr 2003 09:25:31 -0000	1.280
+++ shell/e-shell-view.c	16 Apr 2003 21:23:50 -0000
@@ -1823,7 +1823,7 @@
 
 	bonobo_ui_component_freeze (priv->ui_component, NULL);
 
-	bonobo_ui_util_set_ui (priv->ui_component, EVOLUTION_DATADIR,
+	bonobo_ui_util_set_ui (priv->ui_component, PREFIX,
 			       EVOLUTION_UIDIR "/evolution.xml",
 			       "evolution-1.4", NULL);
 
Index: addressbook/gui/component/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/Makefile.am,v
retrieving revision 1.83
diff -u -r1.83 Makefile.am
--- addressbook/gui/component/Makefile.am	28 Feb 2003 21:59:31 -0000	1.83
+++ addressbook/gui/component/Makefile.am	16 Apr 2003 21:23:51 -0000
@@ -19,6 +19,7 @@
 	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"		\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"		\
+	-DPREFIX=\""$(prefix)"\"				\
 	$(LDAP_CFLAGS)						\
 	-DG_DISABLE_DEPRECATED					\
 	-DGTK_DISABLE_DEPRECATED				\
Index: addressbook/gui/component/addressbook.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook.c,v
retrieving revision 1.207
diff -u -r1.207 addressbook.c
--- addressbook/gui/component/addressbook.c	27 Feb 2003 23:06:56 -0000	1.207
+++ addressbook/gui/component/addressbook.c	16 Apr 2003 21:23:51 -0000
@@ -374,7 +374,7 @@
 	
 	bonobo_ui_component_freeze (uic, NULL);
 
-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
+	bonobo_ui_util_set_ui (uic, PREFIX,
 			       EVOLUTION_UIDIR "/evolution-addressbook.xml",
 			       "evolution-addressbook", NULL);
 
Index: addressbook/gui/component/select-names/e-select-names-bonobo.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/select-names/e-select-names-bonobo.c,v
retrieving revision 1.42
diff -u -r1.42 e-select-names-bonobo.c
--- addressbook/gui/component/select-names/e-select-names-bonobo.c	7 Apr 2003 23:17:58 -0000	1.42
+++ addressbook/gui/component/select-names/e-select-names-bonobo.c	16 Apr 2003 21:23:51 -0000
@@ -374,7 +374,7 @@
 
 		bonobo_ui_component_freeze (uic, NULL);
 
-		bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
+		bonobo_ui_util_set_ui (uic, PREFIX,
 				       closure->ui_xml_path,
 				       closure->app_name, NULL);
 
Index: addressbook/gui/contact-editor/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/Makefile.am,v
retrieving revision 1.48
diff -u -r1.48 Makefile.am
--- addressbook/gui/contact-editor/Makefile.am	23 Mar 2003 23:38:22 -0000	1.48
+++ addressbook/gui/contact-editor/Makefile.am	16 Apr 2003 21:23:51 -0000
@@ -10,6 +10,7 @@
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
 	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)\""	\
+	-DPREFIX=\""$(prefix)"\"			\
 	-DG_LOG_DOMAIN=\"contact-editor\"		\
 	-DG_DISABLE_DEPRECATED				\
 	-DGTK_DISABLE_DEPRECATED			\
Index: addressbook/gui/contact-editor/e-contact-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/e-contact-editor.c,v
retrieving revision 1.146
diff -u -r1.146 e-contact-editor.c
--- addressbook/gui/contact-editor/e-contact-editor.c	28 Mar 2003 22:22:39 -0000	1.146
+++ addressbook/gui/contact-editor/e-contact-editor.c	16 Apr 2003 21:23:52 -0000
@@ -1191,7 +1191,7 @@
 {
 	bonobo_ui_component_add_verb_list_with_data (ce->uic, verbs, ce);
 
-	bonobo_ui_util_set_ui (ce->uic, EVOLUTION_DATADIR,
+	bonobo_ui_util_set_ui (ce->uic, PREFIX,
 			       EVOLUTION_UIDIR "/evolution-contact-editor.xml",
 			       "evolution-contact-editor", NULL);
 
Index: addressbook/gui/contact-list-editor/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-list-editor/Makefile.am,v
retrieving revision 1.17
diff -u -r1.17 Makefile.am
--- addressbook/gui/contact-list-editor/Makefile.am	27 Mar 2003 03:31:19 -0000	1.17
+++ addressbook/gui/contact-list-editor/Makefile.am	16 Apr 2003 21:23:52 -0000
@@ -11,6 +11,7 @@
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
 	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)\""	\
+	-DPREFIX=\""$(prefix)"\"			\
 	-DG_LOG_DOMAIN=\"contact-list-editor\"		\
 	-DG_DISABLE_DEPRECATED				\
 	-DGTK_DISABLE_DEPRECATED			\
Index: addressbook/gui/contact-list-editor/e-contact-list-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-list-editor/e-contact-list-editor.c,v
retrieving revision 1.39
diff -u -r1.39 e-contact-list-editor.c
--- addressbook/gui/contact-list-editor/e-contact-list-editor.c	27 Mar 2003 03:47:24 -0000	1.39
+++ addressbook/gui/contact-list-editor/e-contact-list-editor.c	16 Apr 2003 21:23:52 -0000
@@ -559,7 +559,7 @@
 	bonobo_ui_component_add_verb_list_with_data (
 		ce->uic, verbs, ce);
 
-	bonobo_ui_util_set_ui (ce->uic, EVOLUTION_DATADIR,
+	bonobo_ui_util_set_ui (ce->uic, PREFIX,
 			       EVOLUTION_UIDIR "/evolution-contact-list-editor.xml",
 			       "evolution-contact-list-editor", NULL);
 
Index: calendar/gui/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/Makefile.am,v
retrieving revision 1.266
diff -u -r1.266 Makefile.am
--- calendar/gui/Makefile.am	14 Mar 2003 19:42:28 -0000	1.266
+++ calendar/gui/Makefile.am	16 Apr 2003 21:23:53 -0000
@@ -79,6 +79,7 @@
 	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
 	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"	\
 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"	\
+	-DPREFIX=\""$(prefix)"\"			\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
 glade_DATA = 					\
Index: calendar/gui/calendar-commands.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/calendar-commands.c,v
retrieving revision 1.116
diff -u -r1.116 calendar-commands.c
--- calendar/gui/calendar-commands.c	22 Jan 2003 20:07:44 -0000	1.116
+++ calendar/gui/calendar-commands.c	16 Apr 2003 21:23:53 -0000
@@ -719,7 +719,7 @@
 
 	bonobo_ui_component_freeze (uic, NULL);
 
-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
+	bonobo_ui_util_set_ui (uic, PREFIX,
 			       EVOLUTION_UIDIR "/evolution-calendar.xml",
 			       "evolution-calendar",
 			       NULL);
Index: calendar/gui/tasks-control.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/tasks-control.c,v
retrieving revision 1.54
diff -u -r1.54 tasks-control.c
--- calendar/gui/tasks-control.c	25 Mar 2003 15:49:42 -0000	1.54
+++ calendar/gui/tasks-control.c	16 Apr 2003 21:23:53 -0000
@@ -322,7 +322,7 @@
 
 	bonobo_ui_component_freeze (uic, NULL);
 
-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
+	bonobo_ui_util_set_ui (uic, PREFIX,
 			       EVOLUTION_UIDIR "/evolution-tasks.xml",
 			       "evolution-tasks",
 			       NULL);
Index: calendar/gui/dialogs/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/Makefile.am,v
retrieving revision 1.46
diff -u -r1.46 Makefile.am
--- calendar/gui/dialogs/Makefile.am	11 Apr 2003 18:18:20 -0000	1.46
+++ calendar/gui/dialogs/Makefile.am	16 Apr 2003 21:23:53 -0000
@@ -28,6 +28,7 @@
 	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"			\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"			\
 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"			\
+	-DPREFIX=\""$(prefix)"\"					\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
 noinst_LTLIBRARIES = libcal-dialogs.la
Index: calendar/gui/dialogs/comp-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/comp-editor.c,v
retrieving revision 1.73
diff -u -r1.73 comp-editor.c
--- calendar/gui/dialogs/comp-editor.c	25 Mar 2003 15:49:44 -0000	1.73
+++ calendar/gui/dialogs/comp-editor.c	16 Apr 2003 21:23:53 -0000
@@ -198,7 +198,7 @@
 					  "/evolution/UIConf/kvps");
 
 	bonobo_ui_component_add_verb_list_with_data (priv->uic, verbs, editor);
-	bonobo_ui_util_set_ui (priv->uic, EVOLUTION_DATADIR,
+	bonobo_ui_util_set_ui (priv->uic, PREFIX,
 			       EVOLUTION_UIDIR "/evolution-comp-editor.xml",
 			       "evolution-calendar", NULL);
 	e_pixmaps_update (priv->uic, pixmaps);
Index: composer/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/composer/Makefile.am,v
retrieving revision 1.60
diff -u -r1.60 Makefile.am
--- composer/Makefile.am	11 Mar 2003 16:48:52 -0000	1.60
+++ composer/Makefile.am	16 Apr 2003 21:23:54 -0000
@@ -65,6 +65,7 @@
 	-DEVOLUTION_IMAGESDIR=\"$(imagesdir)\"				\
 	-DEVOLUTION_UIDIR=\"$(evolutionuidir)\"				\
 	-DEVOLUTION_GLADEDIR=\"$(gladedir)\"				\
+	-DPREFIX=\"$(prefix)\"						\
 	-DG_LOG_DOMAIN=\"composer\"					\
 	-DG_DISABLE_DEPRECATED						\
 	-DGTK_DISABLE_DEPRECATED					\
Index: composer/e-msg-composer.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer.c,v
retrieving revision 1.385
diff -u -r1.385 e-msg-composer.c
--- composer/e-msg-composer.c	9 Apr 2003 22:51:47 -0000	1.385
+++ composer/e-msg-composer.c	16 Apr 2003 21:23:56 -0000
@@ -2086,7 +2086,7 @@
 	
 	bonobo_ui_component_freeze (composer->uic, NULL);
 	
-	bonobo_ui_util_set_ui (composer->uic, EVOLUTION_DATADIR,
+	bonobo_ui_util_set_ui (composer->uic, PREFIX,
 			       EVOLUTION_UIDIR "/evolution-message-composer.xml",
 			       "evolution-message-composer", NULL);
 	
Index: mail/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/mail/Makefile.am,v
retrieving revision 1.207
diff -u -r1.207 Makefile.am
--- mail/Makefile.am	19 Mar 2003 22:21:37 -0000	1.207
+++ mail/Makefile.am	16 Apr 2003 21:23:56 -0000
@@ -33,6 +33,7 @@
 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"	\
 	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\"	\
 	-DMAIL_IMPORTERSDIR=\""$(importerdir)"\"	\
+	-DPREFIX=\""$(prefix)"\"			\
 	-DG_DISABLE_DEPRECATED				\
 	-DGTK_DISABLE_DEPRECATED			\
 	-DG_LOG_DOMAIN=\"evolution-mail\"
Index: mail/folder-browser-ui.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/folder-browser-ui.c,v
retrieving revision 1.76
diff -u -r1.76 folder-browser-ui.c
--- mail/folder-browser-ui.c	31 Mar 2003 02:57:41 -0000	1.76
+++ mail/folder-browser-ui.c	16 Apr 2003 21:23:56 -0000
@@ -312,7 +312,7 @@
 	/*bonobo_ui_component_freeze (uic, NULL);*/
 	
 	file = g_strconcat (EVOLUTION_UIDIR "/evolution-mail-", name, ".xml", NULL);
-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR, file, "evolution-mail", NULL);
+	bonobo_ui_util_set_ui (uic, PREFIX, file, "evolution-mail", NULL);
 	g_free (file);
 	
 	e_pixmaps_update (uic, pixcache);
Index: mail/mail-signature-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-signature-editor.c,v
retrieving revision 1.31
diff -u -r1.31 mail-signature-editor.c
--- mail/mail-signature-editor.c	25 Mar 2003 15:49:19 -0000	1.31
+++ mail/mail-signature-editor.c	16 Apr 2003 21:23:56 -0000
@@ -398,7 +398,7 @@
 	component = bonobo_ui_component_new_default ();
 	bonobo_ui_component_set_container (component, bonobo_object_corba_objref (BONOBO_OBJECT (container)), NULL);
 	bonobo_ui_component_add_verb_list_with_data (component, verbs, editor);
-	bonobo_ui_util_set_ui (component, EVOLUTION_DATADIR,
+	bonobo_ui_util_set_ui (component, PREFIX,
 			       EVOLUTION_UIDIR "/evolution-signature-editor.xml",
 			       "evolution-signature-editor", NULL);
 	
Index: mail/message-browser.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/message-browser.c,v
retrieving revision 1.36
diff -u -r1.36 message-browser.c
--- mail/message-browser.c	26 Mar 2003 21:01:27 -0000	1.36
+++ mail/message-browser.c	16 Apr 2003 21:23:56 -0000
@@ -283,7 +283,7 @@
 	/* Load our UI */
 	
 	/*bonobo_ui_component_freeze (uic, NULL);*/
-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
+	bonobo_ui_util_set_ui (uic, PREFIX,
 			       EVOLUTION_UIDIR "/evolution-mail-messagedisplay.xml",
 			       "evolution-mail", NULL);
 	
Index: my-evolution/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/my-evolution/Makefile.am,v
retrieving revision 1.44
diff -u -r1.44 Makefile.am
--- my-evolution/Makefile.am	28 Feb 2003 18:10:05 -0000	1.44
+++ my-evolution/Makefile.am	16 Apr 2003 21:23:56 -0000
@@ -12,6 +12,7 @@
 	-DEVOLUTION_BUTTONSDIR=\""$(buttonsdir)"\"		\
 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"		\
 	-DLOCATIONDIR=\""$(Locationdir)"\"			\
+	-DPREFIX=\""$(prefix)"\"	\
 	-DG_LOG_DOMAIN=\"evolution-executive-summary\"		\
 	$(EVOLUTION_EXECUTIVE_SUMMARY_CFLAGS)
 
Index: my-evolution/e-summary-factory.c
===================================================================
RCS file: /cvs/gnome/evolution/my-evolution/e-summary-factory.c,v
retrieving revision 1.19
diff -u -r1.19 e-summary-factory.c
--- my-evolution/e-summary-factory.c	1 Apr 2003 06:00:07 -0000	1.19
+++ my-evolution/e-summary-factory.c	16 Apr 2003 21:23:56 -0000
@@ -64,7 +64,7 @@
 	bonobo_ui_component_add_verb_list_with_data (ui_component, summary_verbs, summary);
 	bonobo_ui_component_freeze (ui_component, NULL);
 
-	bonobo_ui_util_set_ui (ui_component, EVOLUTION_DATADIR,
+	bonobo_ui_util_set_ui (ui_component, PREFIX,
 			       EVOLUTION_UIDIR "/my-evolution.xml", "my-evolution", NULL);
   	e_pixmaps_update (ui_component, pixmaps);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]