aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2003-04-08 00:08:51 +0800
committerDan Winship <danw@src.gnome.org>2003-04-08 00:08:51 +0800
commit76d74ba347a69ecba86bed5b0ab5159eadcc4261 (patch)
tree817edabae47e53f0dd39a9c200ef3a430467b63b
parenta14c9abfebfd4c5dbc22cac4d3b50dec580fc6fc (diff)
downloadgsoc2013-evolution-76d74ba347a69ecba86bed5b0ab5159eadcc4261.tar
gsoc2013-evolution-76d74ba347a69ecba86bed5b0ab5159eadcc4261.tar.gz
gsoc2013-evolution-76d74ba347a69ecba86bed5b0ab5159eadcc4261.tar.bz2
gsoc2013-evolution-76d74ba347a69ecba86bed5b0ab5159eadcc4261.tar.lz
gsoc2013-evolution-76d74ba347a69ecba86bed5b0ab5159eadcc4261.tar.xz
gsoc2013-evolution-76d74ba347a69ecba86bed5b0ab5159eadcc4261.tar.zst
gsoc2013-evolution-76d74ba347a69ecba86bed5b0ab5159eadcc4261.zip
Clean up server names
* GNOME_Evolution_Mail.server.in.in: Clean up server names * importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in: Likewise, and fix evolution-mail location * importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in: Likewise * importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in: Likewise * importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in: Likewise * importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in: Likewise * importers/Makefile.am (%.server.in): Fix this for evolution-mail being a shlib. svn path=/trunk/; revision=20703
-rw-r--r--mail/ChangeLog22
-rw-r--r--mail/GNOME_Evolution_Mail.server.in.in50
-rw-r--r--mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in9
-rw-r--r--mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in14
-rw-r--r--mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in9
-rw-r--r--mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in14
-rw-r--r--mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in9
-rw-r--r--mail/importers/Makefile.am2
8 files changed, 76 insertions, 53 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 0ef3ce1db2..b5656e33c9 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,25 @@
+2003-04-07 Dan Winship <danw@ximian.com>
+
+ * GNOME_Evolution_Mail.server.in.in: Clean up server names
+
+ * importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in:
+ Likewise, and fix evolution-mail location
+
+ * importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in:
+ Likewise
+
+ * importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in:
+ Likewise
+
+ * importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in:
+ Likewise
+
+ * importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in:
+ Likewise
+
+ * importers/Makefile.am (%.server.in): Fix this for evolution-mail
+ being a shlib.
+
2003-04-03 Not Zed <NotZed@Ximian.com>
** Bug 40536
diff --git a/mail/GNOME_Evolution_Mail.server.in.in b/mail/GNOME_Evolution_Mail.server.in.in
index 285b75169f..8b7b8c23b4 100644
--- a/mail/GNOME_Evolution_Mail.server.in.in
+++ b/mail/GNOME_Evolution_Mail.server.in.in
@@ -11,8 +11,8 @@
<item value="IDL:GNOME/ObjectFactory:1.0"/>
</oaf_attribute>
- <oaf_attribute name="description" type="string"
- _value="Factory for the controls exported by the Evolution Mailer"/>
+ <oaf_attribute name="name" type="string"
+ _value="Evolution Mail"/>
</oaf_server>
<!-- (control) -->
@@ -25,8 +25,8 @@
<item value="IDL:GNOME/Control:1.0"/>
</oaf_attribute>
- <oaf_attribute name="description" type="string"
- _value="Evolution mail folder display component."/>
+ <oaf_attribute name="name" type="string"
+ _value="Evolution Mail folder viewer"/>
</oaf_server>
<!-- Shell Component -->
@@ -39,8 +39,8 @@
<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
</oaf_attribute>
- <oaf_attribute name="description" type="string"
- _value="Evolution component for handling mail."/>
+ <oaf_attribute name="name" type="string"
+ _value="Evolution Mail component"/>
<oaf_attribute name="evolution:shell_component_icon" type="string"
value="evolution-inbox.png"/>
@@ -48,20 +48,6 @@
value="1"/>
</oaf_server>
- <!-- Summary component, for showing info in the summary -->
-
- <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponent"
- type="factory"
- location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
-
- <oaf_attribute name="repo_ids" type="stringv">
- <item value="IDL:GNOME/Evolution:Summary:ComponentFactory:1.0"/>
- </oaf_attribute>
-
- <oaf_attribute name="description" type="string"
- _value="Evolution mail executive summary component."/>
- </oaf_server>
-
<!-- Message composer -->
<!-- (composer) -->
@@ -74,8 +60,8 @@
<item value="IDL:Bonobo/ItemContainer:1.0"/>
</oaf_attribute>
- <oaf_attribute name="description" type="string"
- _value="Evolution mail composer."/>
+ <oaf_attribute name="name" type="string"
+ _value="Evolution Mail composer"/>
</oaf_server>
<!-- MailConfig interface -->
@@ -87,8 +73,8 @@
<item value="IDL:GNOME/Evolution/MailConfig:1.0"/>
</oaf_attribute>
- <oaf_attribute name="description" type="string"
- _value="Mail configuration interface"/>
+ <oaf_attribute name="name" type="string"
+ _value="Evolution Mail configuration interface"/>
</oaf_server>
<!-- FolderInfo interface -->
@@ -144,8 +130,8 @@
<oaf_attribute name="evolution:config_item:priority" type="string" value="-10"/>
- <oaf_attribute name="description" type="string"
- _value="Configuration control for the Evolution Mail Accounts."/>
+ <oaf_attribute name="name" type="string"
+ _value="Evolution Mail accounts configuration control"/>
</oaf_server>
@@ -169,8 +155,8 @@
<oaf_attribute name="evolution:config_item:priority" type="string" value="-9"/>
- <oaf_attribute name="description" type="string"
- _value="Configuration control for the Evolution Mailer."/>
+ <oaf_attribute name="name" type="string"
+ _value="Evolution Mail preferences control"/>
</oaf_server>
@@ -194,8 +180,8 @@
<oaf_attribute name="evolution:config_item:priority" type="string" value="-6"/>
- <oaf_attribute name="description" type="string"
- _value="Configuration control for the Evolution Display Fonts."/>
+ <oaf_attribute name="name" type="string"
+ _value="Evolution Mail font configuration control"/>
</oaf_server>
@@ -219,8 +205,8 @@
<oaf_attribute name="evolution:config_item:priority" type="string" value="-8"/>
- <oaf_attribute name="description" type="string"
- _value="Configuration control for the Evolution Message Composer."/>
+ <oaf_attribute name="name" type="string"
+ _value="Evolution Mail composer configuration control"/>
</oaf_server>
diff --git a/mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in b/mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in
index 8f6a390137..9a85427a75 100644
--- a/mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in
+++ b/mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in
@@ -1,12 +1,15 @@
<oaf_info>
<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer_Factory"
- type="exe"
- location="@LIBEXECDIR@/evolution-mail">
+ type="shlib"
+ location="@COMPONENTDIR@/libevolution-mail.so">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/ObjectFactory:1.0"/>
</oaf_attribute>
+
+ <oaf_attribute name="name" type="string"
+ _value="Evolution Elm importer">
</oaf_server>
<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer"
@@ -17,5 +20,7 @@
<item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/>
</oaf_attribute>
+ <oaf_attribute name="name" type="string"
+ _value="Evolution Elm importer">
</oaf_server>
</oaf_info>
diff --git a/mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in b/mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in
index 4e5bbe15cc..61a1dd3b2f 100644
--- a/mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in
+++ b/mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in
@@ -1,15 +1,15 @@
<oaf_info>
<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory"
- type="exe"
- location="@LIBEXECDIR@/evolution-mail">
+ type="shlib"
+ location="@COMPONENTDIR@/libevolution-mail.so">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/ObjectFactory:1.0"/>
</oaf_attribute>
- <oaf_attribute name="description" type="string"
- _value="Factory to import mbox into Evolution"/>
+ <oaf_attribute name="name" type="string"
+ _value="Evolution mbox importer"/>
</oaf_server>
<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Mbox_Importer"
@@ -21,9 +21,9 @@
</oaf_attribute>
<oaf_attribute name="evolution:menu_name" type="string"
- value="MBox (mbox)"/>
- <oaf_attribute name="description" type="string"
- _value="Imports mbox files into Evolution"/>
+ _value="MBox (mbox)"/>
+ <oaf_attribute name="name" type="string"
+ _value="Evolution mbox importer"/>
</oaf_server>
</oaf_info>
diff --git a/mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in b/mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in
index 346ad883bc..3536c536ac 100644
--- a/mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in
+++ b/mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in
@@ -1,12 +1,15 @@
<oaf_info>
<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer_Factory"
- type="exe"
- location="@LIBEXECDIR@/evolution-mail">
+ type="shlib"
+ location="@COMPONENTDIR@/libevolution-mail.so">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/ObjectFactory:1.0"/>
</oaf_attribute>
+
+ <oaf_attribute name="name" type="string"
+ _value="Evolution Netscape Mail importer">
</oaf_server>
<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer"
@@ -17,5 +20,7 @@
<item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/>
</oaf_attribute>
+ <oaf_attribute name="name" type="string"
+ _value="Evolution Netscape Mail importer">
</oaf_server>
</oaf_info>
diff --git a/mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in b/mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in
index 103dd9117f..6af5ece4bc 100644
--- a/mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in
+++ b/mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in
@@ -1,15 +1,15 @@
<oaf_info>
<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory"
- type="exe"
- location="@LIBEXECDIR@/evolution-mail">
+ type="shlib"
+ location="@COMPONENTDIR@/libevolution-mail.so">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/ObjectFactory:1.0"/>
</oaf_attribute>
- <oaf_attribute name="description" type="string"
- _value="Factory to import Outlook Express 4 mails into Evolution"/>
+ <oaf_attribute name="name" type="string"
+ _value="Evolution Outlook Express 4 importer"/>
</oaf_server>
<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Outlook_Importer"
@@ -21,9 +21,9 @@
</oaf_attribute>
<oaf_attribute name="evolution:menu_name" type="string"
- value="Outlook Express 4 (.mbx)"/>
- <oaf_attribute name="description" type="string"
- _value="Imports Outlook Express 4 files into Evolution"/>
+ _value="Outlook Express 4 (.mbx)"/>
+ <oaf_attribute name="name" type="string"
+ _value="Evolution Outlook Express 4 importer"/>
</oaf_server>
</oaf_info>
diff --git a/mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in b/mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in
index 4a5e41d5fe..a2e8ea7b21 100644
--- a/mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in
+++ b/mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in
@@ -1,12 +1,15 @@
<oaf_info>
<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer_Factory"
- type="exe"
- location="@LIBEXECDIR@/evolution-mail">
+ type="shlib"
+ location="@COMPONENTDIR@/libevolution-mail.so">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/ObjectFactory:1.0"/>
</oaf_attribute>
+
+ <oaf_attribute name="name" type="string"
+ _value="Evolution Pine importer">
</oaf_server>
<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer"
@@ -17,5 +20,7 @@
<item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/>
</oaf_attribute>
+ <oaf_attribute name="name" type="string"
+ _value="Evolution Pine importer">
</oaf_server>
</oaf_info>
diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
index 4bd2bf82de..380acbf13c 100644
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -91,7 +91,7 @@ server_in_files = GNOME_Evolution_Mail_Mbox_Importer.server.in.in \
GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in
server_DATA = $(server_in_files:.server.in.in=.server)
%.server.in: %.server.in.in
- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
+ sed -e "s|\@COMPONENTDIR\@|$(componentdir)|" $< > $@
EXTRA_DIST = $(server_in_files) $(server_DATA)