aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/ChangeLog35
-rw-r--r--mail/Makefile.am62
-rw-r--r--mail/component-factory.c2
-rw-r--r--mail/folder-browser-ui.c4
-rw-r--r--mail/mail-autofilter.c6
-rw-r--r--mail/mail-callbacks.c2
-rw-r--r--mail/mail-search-dialogue.c2
-rw-r--r--mail/mail-session.c2
-rw-r--r--mail/mail-signature-editor.c4
-rw-r--r--mail/mail-summary.c2
-rw-r--r--mail/mail-vfolder.c3
-rw-r--r--mail/message-browser.c4
12 files changed, 85 insertions, 43 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index c7b69c40e6..89a2085755 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,38 @@
+2003-01-22 Ettore Perazzoli <ettore@ximian.com>
+
+ * folder-browser-ui.c (folder_browser_ui_setup_view_menus): Use
+ EVOLUTION_GALVIEWSDIR.
+
+ * message-browser.c (set_bonobo_ui): Get
+ evolution-mail-messagedisplay.xml from EVOLUTION_UIDIR.
+
+ * mail-signature-editor.c (mail_signature_editor): Get
+ evolution-signature-editor.xml from EVOLUTION_UIDIR.
+
+ * folder-browser-ui.c (ui_add): Get the evoluiton-mail* XML files
+ from EVOLUTION_UIDIR.
+
+ * Makefile.am (INCLUDES): Define EVOLUTION_GALVIEWSDIR; update
+ EVOLUTION_IMAGESDIR to include the $(BASE_VERSION).
+ (gladedir): Version using $(BASE_VERSION).
+ (etspecdir): Likewise.
+ (iconsdir): Likewise.
+ (buttonsdir): Likewise.
+ (etspecdir): Likewise.
+
+ * component-factory.c (owner_set_cb): Look for vfoldertypes.xml in
+ the new version-aware location.
+ * mail-summary.c (generate_folder_summaries): Likewise.
+ * mail-search-dialogue.c (mail_search_dialogue_construct): Likewise.
+ * mail-vfolder.c (vfolder_load_storage): Likewise.
+
+ * mail-autofilter.c (filter_gui_add_from_message): Look for
+ filtertypes.xml in the new version-aware location.
+ (mail_filter_rename_uri): Likewise.
+ (mail_filter_delete_uri): Likewise.
+ * mail-session.c (main_get_filter_driver): Likewise.
+ * mail-callbacks.c (filter_edit): Likewise.
+
2003-01-22 Radek Doulik <rodo@ximian.com>
* mail-callbacks.c (do_mail_print): put unrealized html widget
diff --git a/mail/Makefile.am b/mail/Makefile.am
index d1a9ee819d..a6f01cedb5 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -6,32 +6,34 @@ SUBDIRS = importers
importerdir = $(privlibdir)/evolution-mail-importers
-INCLUDES = \
- -I$(top_srcdir)/widgets \
- -I$(top_srcdir)/widgets/e-text \
- -I$(top_srcdir)/widgets/misc \
- -I$(top_srcdir)/camel \
- -I$(top_srcdir) \
- -I$(top_srcdir)/composer \
- -I$(top_builddir)/composer \
- -I$(top_builddir)/shell \
- -I$(top_srcdir)/shell \
- -I$(top_srcdir)/shell/importer \
- -I$(top_builddir)/shell/importer \
- -I$(top_srcdir)/addressbook/backend \
- -I$(top_builddir)/addressbook/backend \
- $(EVOLUTION_MAIL_CFLAGS) \
- -DEVOLUTION_DATADIR=\""$(datadir)"\" \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
- -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
- -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
- -DEVOLUTION_IMAGES=\""$(datadir)/evolution/images"\" \
- -DEVOLUTION_BUTTONSDIR=\""$(buttonsdir)"\" \
- -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
- -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
- -DMAIL_IMPORTERSDIR=\""$(importerdir)"\" \
- -DG_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED \
+INCLUDES = \
+ -I$(top_srcdir)/widgets \
+ -I$(top_srcdir)/widgets/e-text \
+ -I$(top_srcdir)/widgets/misc \
+ -I$(top_srcdir)/camel \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/composer \
+ -I$(top_builddir)/composer \
+ -I$(top_builddir)/shell \
+ -I$(top_srcdir)/shell \
+ -I$(top_srcdir)/shell/importer \
+ -I$(top_builddir)/shell/importer \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
+ $(EVOLUTION_MAIL_CFLAGS) \
+ -DEVOLUTION_DATADIR=\""$(datadir)"\" \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
+ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
+ -DEVOLUTION_IMAGES=\""$(datadir)"/evolution-$(BASE_VERSION)/images\" \
+ -DEVOLUTION_GALVIEWSDIR=\"$(datadir)/evolution-$(BASE_VERSION)/views\" \
+ -DEVOLUTION_BUTTONSDIR=\""$(buttonsdir)"\" \
+ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
+ -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
+ -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
+ -DMAIL_IMPORTERSDIR=\""$(importerdir)"\" \
+ -DG_DISABLE_DEPRECATED \
+ -DGTK_DISABLE_DEPRECATED \
-DG_LOG_DOMAIN=\"evolution-mail\"
componentdir = $(COMPONENT_DIR)
@@ -176,17 +178,17 @@ $(server_in_files:.server.in.in=.server.in): $(server_in_files)
sed -e "s|\@COMPONENTDIR\@|$(componentdir)|" $< > $@
@INTLTOOL_SERVER_RULE@
-gladedir = $(datadir)/evolution/glade
+gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
glade_DATA = mail-config.glade local-config.glade subscribe-dialog.glade message-tags.glade
-etspecdir = $(datadir)/evolution/etspec/
+etspecdir = $(datadir)/evolution-$(BASE_VERSION)/etspec/
etspec_DATA = mail-accounts.etspec message-list.etspec subscribe-dialog.etspec
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_DATA = evolution-mail.schemas
-iconsdir = $(datadir)/evolution/images
-buttonsdir = $(datadir)/evolution/images/buttons
+iconsdir = $(datadir)/evolution-$(BASE_VERSION)/images
+buttonsdir = $(datadir)/evolution-$(BASE_VERSION)/images/buttons
idl_DATA = Mailer.idl
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 353d0026f2..9a2a5e2089 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -799,7 +799,7 @@ owner_set_cb (EvolutionShellComponent *shell_component,
{
/* setup the global quick-search context */
char *user = g_strdup_printf ("%s/searches.xml", evolution_dir);
- char *system = g_strdup (EVOLUTION_DATADIR "/evolution/vfoldertypes.xml");
+ char *system = g_strdup (EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/vfoldertypes.xml");
search_context = rule_context_new ();
g_object_set_data_full(G_OBJECT(search_context), "user", user, g_free);
diff --git a/mail/folder-browser-ui.c b/mail/folder-browser-ui.c
index b5d76a5fb6..9ce54a16b3 100644
--- a/mail/folder-browser-ui.c
+++ b/mail/folder-browser-ui.c
@@ -309,7 +309,7 @@ ui_add (FolderBrowser *fb, const char *name, BonoboUIVerb verb[], EPixmap pixcac
/*bonobo_ui_component_freeze (uic, NULL);*/
- file = g_strconcat ("evolution-mail-", name, ".xml", NULL);
+ file = g_strconcat (EVOLUTION_UIDIR "/evolution-mail-", name, ".xml", NULL);
bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR, file, "evolution-mail", NULL);
g_free (file);
@@ -359,7 +359,7 @@ folder_browser_ui_setup_view_menus (FolderBrowser *fb)
local_dir = gnome_util_prepend_user_home ("/evolution/views/mail/");
gal_view_collection_set_storage_directories
(collection,
- EVOLUTION_DATADIR "/evolution/views/mail/",
+ EVOLUTION_GALVIEWSDIR "/evolution/views/mail/",
local_dir);
g_free (local_dir);
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index 3916b33c55..c934bb44b0 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -314,7 +314,7 @@ filter_gui_add_from_message (CamelMimeMessage *msg, const char *source, int flag
fc = filter_context_new ();
user = g_strdup_printf ("%s/filters.xml", evolution_dir);
- system = EVOLUTION_DATADIR "/evolution/filtertypes.xml";
+ system = EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/filtertypes.xml";
rule_context_load ((RuleContext *)fc, system, user);
rule = filter_rule_from_message (fc, msg, flags);
@@ -335,7 +335,7 @@ mail_filter_rename_uri(CamelStore *store, const char *olduri, const char *newuri
fc = filter_context_new ();
user = g_strdup_printf ("%s/filters.xml", evolution_dir);
- system = EVOLUTION_DATADIR "/evolution/filtertypes.xml";
+ system = EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/filtertypes.xml";
rule_context_load ((RuleContext *)fc, system, user);
changed = rule_context_rename_uri((RuleContext *)fc, olduri, newuri, uri_cmp);
@@ -360,7 +360,7 @@ mail_filter_delete_uri(CamelStore *store, const char *uri)
fc = filter_context_new ();
user = g_strdup_printf ("%s/filters.xml", evolution_dir);
- system = EVOLUTION_DATADIR "/evolution/filtertypes.xml";
+ system = EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/filtertypes.xml";
rule_context_load ((RuleContext *)fc, system, user);
deleted = rule_context_delete_uri ((RuleContext *) fc, uri, uri_cmp);
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 7c90847e2a..8a30ece8cf 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -2741,7 +2741,7 @@ filter_edit (BonoboUIComponent *uih, void *user_data, const char *path)
fc = filter_context_new ();
user = g_strdup_printf ("%s/filters.xml", evolution_dir);
- system = EVOLUTION_DATADIR "/evolution/filtertypes.xml";
+ system = EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/filtertypes.xml";
rule_context_load ((RuleContext *)fc, system, user);
g_free (user);
diff --git a/mail/mail-search-dialogue.c b/mail/mail-search-dialogue.c
index 1bce657546..8a6580d2e9 100644
--- a/mail/mail-search-dialogue.c
+++ b/mail/mail-search-dialogue.c
@@ -89,7 +89,7 @@ mail_search_dialogue_construct (MailSearchDialogue *o, FilterRule *rule)
o->context = rule_context_new ();
rule_context_add_part_set (o->context, "partset", filter_part_get_type (),
rule_context_add_part, rule_context_next_part);
- rule_context_load (o->context, EVOLUTION_DATADIR "/evolution/vfoldertypes.xml", "");
+ rule_context_load (o->context, EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/vfoldertypes.xml", "");
if (rule) {
o->rule = rule;
o->guts = filter_rule_get_widget (o->rule, o->context);
diff --git a/mail/mail-session.c b/mail/mail-session.c
index 00402fa5b5..6d6ecb29b4 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -759,7 +759,7 @@ main_get_filter_driver (CamelSession *session, const char *type, CamelException
gconf = gconf_client_get_default ();
user = g_strdup_printf ("%s/filters.xml", evolution_dir);
- system = EVOLUTION_DATADIR "/evolution/filtertypes.xml";
+ system = EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/filtertypes.xml";
fc = (RuleContext *) filter_context_new ();
rule_context_load (fc, system, user);
g_free (user);
diff --git a/mail/mail-signature-editor.c b/mail/mail-signature-editor.c
index 4691ff4f4c..09de02174f 100644
--- a/mail/mail-signature-editor.c
+++ b/mail/mail-signature-editor.c
@@ -333,7 +333,9 @@ mail_signature_editor (MailConfigSignature *sig)
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, "evolution-signature-editor.xml", "evolution-signature-editor", NULL);
+ bonobo_ui_util_set_ui (component, EVOLUTION_DATADIR,
+ EVOLUTION_UIDIR "/evolution-signature-editor.xml",
+ "evolution-signature-editor", NULL);
editor->control = bonobo_widget_new_control ("OAFIID:GNOME_GtkHTML_Editor:3.0",
bonobo_ui_component_get_container (component));
diff --git a/mail/mail-summary.c b/mail/mail-summary.c
index 2c42c01fb5..3d833d2fac 100644
--- a/mail/mail-summary.c
+++ b/mail/mail-summary.c
@@ -296,7 +296,7 @@ generate_folder_summaries (MailSummary *summary)
int i;
user = g_strdup_printf ("%s/vfolders.xml", evolution_dir);
- system = EVOLUTION_DATADIR "/evolution/vfoldertypes.xml";
+ system = EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/vfoldertypes.xml";
context = vfolder_context_new ();
rule_context_load ((RuleContext *)context, system, user);
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index ec1eee12d7..a64105b511 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -778,7 +778,8 @@ vfolder_load_storage(GNOME_Evolution_Shell shell)
/* load our rules */
user = g_strdup_printf ("%s/vfolders.xml", evolution_dir);
context = vfolder_context_new ();
- if (rule_context_load ((RuleContext *)context, EVOLUTION_DATADIR "/evolution/vfoldertypes.xml", user) != 0) {
+ if (rule_context_load ((RuleContext *)context,
+ EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/vfoldertypes.xml", user) != 0) {
g_warning("cannot load vfolders: %s\n", ((RuleContext *)context)->error);
}
g_free (user);
diff --git a/mail/message-browser.c b/mail/message-browser.c
index 5a9c74fc6e..b53f278a34 100644
--- a/mail/message-browser.c
+++ b/mail/message-browser.c
@@ -278,7 +278,9 @@ set_bonobo_ui (GtkWidget *widget, FolderBrowser *fb)
/* Load our UI */
/*bonobo_ui_component_freeze (uic, NULL);*/
- bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR, "evolution-mail-messagedisplay.xml", "evolution-mail", NULL);
+ bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
+ EVOLUTION_UIDIR "/evolution-mail-messagedisplay.xml",
+ "evolution-mail", NULL);
/* Load the appropriate UI stuff from the folder browser */
generated by cgit (git 2.34.1) at 2024-11-19 00:06:26 +0800