callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ fixes #21499 ]

Browse Source 
2003-04-18  Rodney Dawes  <dobey@ximian.com>

	[ fixes #21499 ]
	* gui/component/Makefile.am:
	* gui/component/addressbook.c:
	* gui/component/select-names/e-select-names-bonobo.c:
	* gui/contact-editor/Makefile.am:
	* gui/contact-editor/e-contact-editor.c:
	* gui/contact-list-editor/Makefile.am:
	* gui/contact-list-editor/e-contact-list-editor.c:
	Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ()

	* gui/Makefile.am:
	* gui/calendar-commands.c:
	* gui/tasks-control.c:
	* gui/dialogs/Makefile.am:
	* gui/dialogs/comp-editor.c:
	Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ()

	* Makefile.am:
	* e-msg-composer.c:
	Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ().
	Fixes bug #21499.

	* Makefile.am:
	* folder-browser-ui.c:
	* mail-signature-editor.c:
	* message-browser.c:
	Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ().
	Fixes bug #21499.

	* Makefile.am:
	* e-summary-factory.c:
	Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ()

	* e-shell-view.c: Use PREFIX instead of EVOLUTION_DATADIR for
	bonobo_ui_util_set_ui () [#21499]

svn path=/trunk/; revision=20888
This commit is contained in:
Rodney Dawes
2003-04-18 17:46:26 +00:00
committed by Rodney Dawes
parent 3a26734567
commit 1bd3678dbe
27 changed files with 73 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addressbook/ChangeLog
+12
View File
@@ -1,3 +1,15 @@
2003-04-18 Rodney Dawes <dobey@ximian.com>
[ fixes #21499 ]
* gui/component/Makefile.am:
* gui/component/addressbook.c:
* gui/component/select-names/e-select-names-bonobo.c:
* gui/contact-editor/Makefile.am:
* gui/contact-editor/e-contact-editor.c:
* gui/contact-list-editor/Makefile.am:
* gui/contact-list-editor/e-contact-list-editor.c:
Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ()
2003-04-15 Chris Toshok <toshok@ximian.com>
[ fixes #41252 ]
addressbook/gui/component/Makefile.am
+1
View File
@@ -19,6 +19,7 @@ INCLUDES = \
-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
-DPREFIX=\""$(prefix)"\" \
$(LDAP_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
addressbook/gui/component/addressbook.c
+1 -1
View File
@@ -374,7 +374,7 @@ control_activate (BonoboControl *control,
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);
addressbook/gui/component/select-names/e-select-names-bonobo.c
+1 -1
View File
@@ -374,7 +374,7 @@ merge_menu_items (BonoboControl *control, BonoboUIComponent *uic, ControlUIClosu
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);
addressbook/gui/contact-editor/Makefile.am
+1
View File
@@ -10,6 +10,7 @@ INCLUDES = \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
-DEVOLUTION_UIDIR=\""$(evolutionuidir)\"" \
-DPREFIX=\""$(prefix)"\" \
-DG_LOG_DOMAIN=\"contact-editor\" \
-DG_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
addressbook/gui/contact-editor/e-contact-editor.c
+1 -1
View File
@@ -1191,7 +1191,7 @@ create_ui (EContactEditor *ce)
{
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);
addressbook/gui/contact-list-editor/Makefile.am
+1
View File
@@ -11,6 +11,7 @@ INCLUDES = \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
-DEVOLUTION_UIDIR=\""$(evolutionuidir)\"" \
-DPREFIX=\""$(prefix)"\" \
-DG_LOG_DOMAIN=\"contact-list-editor\" \
-DG_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
addressbook/gui/contact-list-editor/e-contact-list-editor.c
+1 -1
View File
@@ -559,7 +559,7 @@ create_ui (EContactListEditor *ce)
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);
calendar/ChangeLog
+11
View File
@@ -1,3 +1,14 @@
2003-04-18 Rodney Dawes <dobey@ximian.com>
Fixes #21499
* gui/Makefile.am:
* gui/calendar-commands.c:
* gui/tasks-control.c:
* gui/dialogs/Makefile.am:
* gui/dialogs/comp-editor.c:
Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ()
2003-04-17 JP Rosevear <jpr@ximian.com>
Fixes #41459
calendar/gui/Makefile.am
+1
View File
@@ -79,6 +79,7 @@ INCLUDES = \
-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \
-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
-DPREFIX=\""$(prefix)"\" \
$(EVOLUTION_CALENDAR_CFLAGS)
glade_DATA = \
calendar/gui/calendar-commands.c
+1 -1
View File
@@ -719,7 +719,7 @@ calendar_control_activate (BonoboControl *control,
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);
calendar/gui/dialogs/Makefile.am
+1
View File
@@ -28,6 +28,7 @@ INCLUDES = \
-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
-DPREFIX=\""$(prefix)"\" \
$(EVOLUTION_CALENDAR_CFLAGS)
noinst_LTLIBRARIES = libcal-dialogs.la
calendar/gui/dialogs/comp-editor.c
+1 -1
View File
@@ -198,7 +198,7 @@ setup_widgets (CompEditor *editor)
"/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);
calendar/gui/tasks-control.c
+1 -1
View File
@@ -322,7 +322,7 @@ tasks_control_activate (BonoboControl *control, ETasks *tasks)
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);
composer/ChangeLog
+7
View File
@@ -1,3 +1,10 @@
2003-04-18 Rodney Dawes <dobey@ximian.com>
* Makefile.am:
* e-msg-composer.c:
Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ().
Fixes bug #21499.
2003-04-14 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer-attachment.c (file_name_focus_out_cb): Return
composer/Makefile.am
+1
View File
@@ -65,6 +65,7 @@ INCLUDES = \
-DEVOLUTION_IMAGESDIR=\"$(imagesdir)\" \
-DEVOLUTION_UIDIR=\"$(evolutionuidir)\" \
-DEVOLUTION_GLADEDIR=\"$(gladedir)\" \
-DPREFIX=\"$(prefix)\" \
-DG_LOG_DOMAIN=\"composer\" \
-DG_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
composer/e-msg-composer.c
+1 -1
View File
@@ -2086,7 +2086,7 @@ setup_ui (EMsgComposer *composer)
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);
mail/ChangeLog
+9
View File
@@ -1,3 +1,12 @@
2003-04-18 Rodney Dawes <dobey@ximian.com>
* Makefile.am:
* folder-browser-ui.c:
* mail-signature-editor.c:
* message-browser.c:
Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ().
Fixes bug #21499.
2003-04-17 Not Zed <NotZed@Ximian.com>
* mail-signature-editor.c (menu_help): remove the help menu item
mail/Makefile.am
+1
View File
@@ -33,6 +33,7 @@ INCLUDES = \
-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
-DMAIL_IMPORTERSDIR=\""$(importerdir)"\" \
-DPREFIX=\""$(prefix)"\" \
-DG_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
-DG_LOG_DOMAIN=\"evolution-mail\"
mail/folder-browser-ui.c
+1 -1
View File
@@ -312,7 +312,7 @@ ui_add (FolderBrowser *fb, const char *name, BonoboUIVerb verb[], EPixmap pixcac
/*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);
mail/mail-signature-editor.c
+1 -1
View File
@@ -391,7 +391,7 @@ mail_signature_editor (MailConfigSignature *sig, GtkWindow *parent, gboolean is_
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);
mail/message-browser.c
+1 -1
View File
@@ -283,7 +283,7 @@ set_bonobo_ui (GtkWidget *widget, FolderBrowser *fb)
/* 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);
my-evolution/ChangeLog
+8
View File
@@ -1,3 +1,11 @@
2003-04-18 Rodney Dawes <dobey@ximian.com>
[#21499]
* Makefile.am:
* e-summary-factory.c:
Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui ()
2003-04-16 Ettore Perazzoli <ettore@ximian.com>
[#39693]
my-evolution/Makefile.am
+1
View File
@@ -12,6 +12,7 @@ INCLUDES = \
-DEVOLUTION_BUTTONSDIR=\""$(buttonsdir)"\" \
-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
-DLOCATIONDIR=\""$(Locationdir)"\" \
-DPREFIX=\""$(prefix)"\" \
-DG_LOG_DOMAIN=\"evolution-executive-summary\" \
$(EVOLUTION_EXECUTIVE_SUMMARY_CFLAGS)
my-evolution/e-summary-factory.c
+1 -1
View File
@@ -64,7 +64,7 @@ control_activate (BonoboControl *control,
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);
shell/ChangeLog
+5
View File
@@ -1,3 +1,8 @@
2003-04-18 Rodney Dawes <dobey@ximian.com>
* e-shell-view.c: Use PREFIX instead of EVOLUTION_DATADIR for
bonobo_ui_util_set_ui () [#21499]
2003-04-17 Dan Winship <danw@ximian.com>
* e-shell-folder-creation-dialog.c (add_folder_types): If the
shell/e-shell-view.c
+1 -1
View File
@@ -1823,7 +1823,7 @@ e_shell_view_construct (EShellView *shell_view,
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);