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

Clean up server names

Browse Source 
* 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
This commit is contained in:
Dan Winship
2003-04-07 16:08:51 +00:00
parent a14c9abfeb
commit 76d74ba347
8 changed files with 76 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mail/ChangeLog
View File

@ -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

50
mail/GNOME_Evolution_Mail.server.in.in
View File

@ -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>

9
mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in
View File

@ -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>

14
mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in
View File

@ -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>

9
mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in
View File

@ -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>

14
mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in
View File

@ -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>

9
mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in
View File

@ -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>

2
mail/importers/Makefile.am
View File

@ -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)