Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>

2007-04-02  Sankar P  <psankar@novell.com>

	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
	
	Code Cleanup. 
	Fixes part of #301149



svn path=/trunk/; revision=33354

34 files changed, 156 insertions, 20 deletions

diff --git a/plugins/backup-restore/ChangeLog b/plugins/backup-restore/ChangeLog
index 5df769d8e2..d9a67544ca 100644
--- a/plugins/backup-restore/ChangeLog
+++ b/plugins/backup-restore/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-02  Sankar P  <psankar@novell.com>
+
+	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
+
+	* org-gnome-backup-restore.eplug.xml:
+	Cleanup. 
+	Fixes part of #301149
+
 2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #419524
diff --git a/plugins/backup-restore/org-gnome-backup-restore.eplug.xml b/plugins/backup-restore/org-gnome-backup-restore.eplug.xml
index c6f18b0bc3..b06ed34f67 100644
--- a/plugins/backup-restore/org-gnome-backup-restore.eplug.xml
+++ b/plugins/backup-restore/org-gnome-backup-restore.eplug.xml
@@ -4,7 +4,7 @@
   <e-plugin
     id="org.gnome.plugin.backup.restore"
     type="shlib"
-    location="@PLUGINDIR@/liborg-gnome-backup-restore.so"
+    location="@PLUGINDIR@/liborg-gnome-backup-restore@SOEXT@"
     _name="Backup and restore plugin">
     <author name="JP Rosevear" email="jpr@novell.com"/>
     <_description>A plugin for backing up and restore Evolution data and settings.</_description>
diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog
index 4f89b00ee4..88f214ffd3 100644
--- a/plugins/bbdb/ChangeLog
+++ b/plugins/bbdb/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-02  Sankar P  <psankar@novell.com>
+
+	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
+
+	* org-gnome-evolution-bbdb.eplug.xml:
+	Cleanup. 
+	Fixes part of #301149
+
 2007-03-29  Matthew Barnes  <mbarnes@redhat.com>
 
 	* gaimbuddies.c:
diff --git a/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml b/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml
index 7aa24c607d..970ff6e90f 100644
--- a/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml
+++ b/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml
@@ -3,7 +3,7 @@
 	  type="shlib"
 	  id="org.gnome.evolution.bbdb"
 	  _name="Automatic Contacts"
- 	  location="@PLUGINDIR@/liborg-gnome-evolution-bbdb.so">
+ 	  location="@PLUGINDIR@/liborg-gnome-evolution-bbdb@SOEXT@">
 
 	  	<_description>Automatically fills your addressbook with names and email addresses as you reply to messages.  Also fills in IM contact information from your buddy lists.</_description>
 
diff --git a/plugins/copy-tool/ChangeLog b/plugins/copy-tool/ChangeLog
index 422ec4cb81..c53c8075f1 100644
--- a/plugins/copy-tool/ChangeLog
+++ b/plugins/copy-tool/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-02  Sankar P  <psankar@novell.com>
+
+	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
+
+	* org-gnome-copy-tool.eplug.xml:
+	Cleanup. 
+	Fixes part of #301149
+
 2006-05-19  Hiroyuki Ikezoe  <poincare@ikezoe.net>
 
 	** Fixes bug #322771
diff --git a/plugins/copy-tool/org-gnome-copy-tool.eplug.xml b/plugins/copy-tool/org-gnome-copy-tool.eplug.xml
index 9a759277e5..c1400dc30b 100644
--- a/plugins/copy-tool/org-gnome-copy-tool.eplug.xml
+++ b/plugins/copy-tool/org-gnome-copy-tool.eplug.xml
@@ -3,7 +3,7 @@
   <e-plugin
     type="shlib"
     id="org.gnome.evolution.plugin.copyTool"
-    location="@PLUGINDIR@/liborg-gnome-copy-tool.so"
+    location="@PLUGINDIR@/liborg-gnome-copy-tool@SOEXT@"
     _name="Copy tool">
     <_description>A test plugin which demonstrates a popup menu plugin which lets you copy things to the clipboard.</_description>
     <author name="Michael Zucchi" email="notzed@ximian.com"/>
diff --git a/plugins/default-mailer/ChangeLog b/plugins/default-mailer/ChangeLog
index 7ac2540480..6faf41ac8b 100644
--- a/plugins/default-mailer/ChangeLog
+++ b/plugins/default-mailer/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-02  Sankar P  <psankar@novell.com>
+
+	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
+
+	* org-gnome-default-mailer.eplug.xml:
+	Cleanup. 
+	Fixes part of #301149
+
 2006-08-22  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Fix for bug #350823
diff --git a/plugins/default-mailer/org-gnome-default-mailer.eplug.xml b/plugins/default-mailer/org-gnome-default-mailer.eplug.xml
index 29617d7fb1..1005b75bd1 100644
--- a/plugins/default-mailer/org-gnome-default-mailer.eplug.xml
+++ b/plugins/default-mailer/org-gnome-default-mailer.eplug.xml
@@ -4,7 +4,7 @@
 	id="org.gnome.evolution.default.mailer" 
 	type="shlib" 
 	_name="Default Mail Client " 
-	location="@PLUGINDIR@/liborg-gnome-default-mailer.so">
+	location="@PLUGINDIR@/liborg-gnome-default-mailer@SOEXT@">
 
 		<_description>Checks whether Evolution is the default mail client on startup.</_description>
 		<author name="Jonathan Dieter" email="jdieter99@gmx.net"/>
diff --git a/plugins/ipod-sync/ChangeLog b/plugins/ipod-sync/ChangeLog
index 198e86a2a1..1a9897f949 100644
--- a/plugins/ipod-sync/ChangeLog
+++ b/plugins/ipod-sync/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-02  Sankar P  <psankar@novell.com>
+
+	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
+	
+	* org-gnome-ipod-sync-evolution.eplug.xml:
+	Cleanup. 
+	Fixes part of #301149
+
 2007-01-27  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 
 	* evolution-ipod-sync.c: (ipod_check_status):
diff --git a/plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml b/plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml
index a10be9629f..3f17ef5f98 100644
--- a/plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml
+++ b/plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml
@@ -2,7 +2,7 @@
 <e-plugin-list>
     <e-plugin id="org.gnome.evolution.ipod_sync" type="shlib" 
 	_name="iPod Synchronization"
-	    location="@PLUGINDIR@/liborg-gnome-ipod-sync-evolution.so"> 
+	    location="@PLUGINDIR@/liborg-gnome-ipod-sync-evolution@SOEXT@"> 
 	    <author name="Srinivasa Ragavan" email="sragavan@novell.com"/>
 	    <_description>Synchronize the selected task/calendar/addressbook with Apple iPod</_description>
 	
diff --git a/plugins/mail-remote/ChangeLog b/plugins/mail-remote/ChangeLog
index d7b9bc3db4..16dc730c7a 100644
--- a/plugins/mail-remote/ChangeLog
+++ b/plugins/mail-remote/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-02  Sankar P  <psankar@novell.com>
+
+	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
+
+	* org-gnome-evolution-mail-remote.eplug.xml:
+	Cleanup. 
+	Fixes part of #301149
+
 2006-01-06  Simon Zheng <simon.zheng@sun.com>
 
 	* evolution-mail-session.c:
diff --git a/plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml b/plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml
index d26d9e6160..8435fb9619 100644
--- a/plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml
+++ b/plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml
@@ -3,7 +3,7 @@
   <e-plugin
     type="shlib"
     id="org.gnome.evolution.plugin.mailRemote"
-    location="@PLUGINDIR@/liborg-gnome-evolution-mail-remote.so"
+    location="@PLUGINDIR@/liborg-gnome-evolution-mail-remote@SOEXT@"
     _name="Mail Remote">
     <_description>A plugin which implements a CORBA
       interface for accessing mail data remotely.</_description>
diff --git a/plugins/mail-to-meeting/ChangeLog b/plugins/mail-to-meeting/ChangeLog
index 383a6180de..9b481ec99f 100644
--- a/plugins/mail-to-meeting/ChangeLog
+++ b/plugins/mail-to-meeting/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-02  Sankar P  <psankar@novell.com>
+
+	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
+
+	* org-gnome-mail-to-meeting.eplug.xml:
+	Cleanup. 
+	Fixes part of #301149
+
 2005-05-11  Not Zed  <NotZed@Ximian.com>
 
 	* Makefile.am: added built_sources/cleanfiles
diff --git a/plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml b/plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml
index c7513ec909..f3de1c5aa4 100644
--- a/plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml
+++ b/plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml
@@ -3,7 +3,7 @@
   <e-plugin
     type="shlib"
     id="org.gnome.evolution.plugin.mailToMeeting"
-    location="@PLUGINDIR@/liborg-gnome-mail-to-meeting.so"
+    location="@PLUGINDIR@/liborg-gnome-mail-to-meeting@SOEXT@"
     _name="Mail to meeting">
     <_description>A plugin which allows the creation of meetings from the contents of a mail message.</_description>
     <author name="Rodrigo Moya" email="rodrigo@novell.com"/>
diff --git a/plugins/mail-to-task/ChangeLog b/plugins/mail-to-task/ChangeLog
index 9932a96c1f..35727aa4b1 100644
--- a/plugins/mail-to-task/ChangeLog
+++ b/plugins/mail-to-task/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-02  Sankar P  <psankar@novell.com>
+
+	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
+
+	* org-gnome-mail-to-task.eplug.xml:
+	Cleanup. 
+	Fixes part of #301149
+
 2006-07-31  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #310489
diff --git a/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml b/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
index d28665c88d..00ba6875f8 100644
--- a/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
+++ b/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
@@ -3,7 +3,7 @@
   <e-plugin
     type="shlib"
     id="org.gnome.evolution.plugin.mailToTask"
-    location="@PLUGINDIR@/liborg-gnome-mail-to-task.so"
+    location="@PLUGINDIR@/liborg-gnome-mail-to-task@SOEXT@"
     _name="Mail to task">
     <_description>A plugin which allows the creation of tasks from the contents of a mail message.</_description>
     <author name="Rodrigo Moya" email="rodrigo@novell.com"/>
diff --git a/plugins/mark-calendar-offline/ChangeLog b/plugins/mark-calendar-offline/ChangeLog
index 33e6513e17..cb95a16aa0 100644
--- a/plugins/mark-calendar-offline/ChangeLog
+++ b/plugins/mark-calendar-offline/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-02  Sankar P  <psankar@novell.com>
+
+	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
+
+	* org-gnome-mark-calendar-offline.eplug.xml:
+	Cleanup. 
+	Fixes part of #301149
+
 2005-12-12  Harish Krishnaswamy  <kharish@novell.com>
 
 	* Makefile.am: Fix make-clean issues.
diff --git a/plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml b/plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml
index af42a0f575..ecf5b67d60 100644
--- a/plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml
+++ b/plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml
@@ -2,7 +2,7 @@
 <e-plugin-list>
     <e-plugin id="org.gnome.evolution.mark_calendar_offline" type="shlib" 
 	_name="Mark calendar offline" 
-	location="@PLUGINDIR@/liborg-gnome-mark-calendar-offline.so">
+	location="@PLUGINDIR@/liborg-gnome-mark-calendar-offline@SOEXT@">
 	<author name="Harish Krishnaswamy" email="kharish@novell.com"/>
        	<_description>Marks the selected calendar for offline viewing.</_description>
 
diff --git a/plugins/mono/ChangeLog b/plugins/mono/ChangeLog
index 3c3b66bb48..f668070b8d 100644
--- a/plugins/mono/ChangeLog
+++ b/plugins/mono/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-02  Sankar P  <psankar@novell.com>
+
+	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
+
+	* org-gnome-evolution-mono.eplug.xml:
+	Cleanup. 
+	Fixes part of #301149
+
 2005-12-17  Tor Lillqvist  <tml@novell.com>
 
 	* mono-plugin.c: Drop unused inclusion of <dirent.h>.
diff --git a/plugins/mono/org-gnome-evolution-mono.eplug.xml b/plugins/mono/org-gnome-evolution-mono.eplug.xml
index cdd12fc307..0e0a8b70d5 100644
--- a/plugins/mono/org-gnome-evolution-mono.eplug.xml
+++ b/plugins/mono/org-gnome-evolution-mono.eplug.xml
@@ -3,7 +3,7 @@
   <e-plugin
     type="shlib"
     id="org.gnome.evolution.plugin.mono"
-    location="@PLUGINDIR@/liborg-gnome-evolution-mono.so"
+    location="@PLUGINDIR@/liborg-gnome-evolution-mono@SOEXT@"
     _name="Mono Loader">
     <_description>A plugin which implements mono plugins.</_description>
     <author name="Michael Zucchi" email="notzed@ximian.com"/>
diff --git a/plugins/new-mail-notify/ChangeLog b/plugins/new-mail-notify/ChangeLog
index dd63a1b5a1..1f59cca0e7 100644
--- a/plugins/new-mail-notify/ChangeLog
+++ b/plugins/new-mail-notify/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-02  Sankar P  <psankar@novell.com>
+
+	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
+
+	* org-gnome-new-mail-notify.eplug.xml:
+	Cleanup. 
+	Fixes part of #301149
+
 2006-08-21  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Fix for bug #308271 Patch by Johannes Berg
diff --git a/plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml b/plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml
index f5fb48eb7f..823a00472f 100644
--- a/plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml
+++ b/plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml
@@ -3,7 +3,7 @@
 	id="org.gnome.evolution.new_mail_notify" 
 	type="shlib" 
 	_name="New Mail Notification" 
-	location="@PLUGINDIR@/liborg-gnome-new-mail-notify.so">
+	location="@PLUGINDIR@/liborg-gnome-new-mail-notify@SOEXT@">
 
 		<_description>Generates a D-BUS message when new mail arrives.</_description>
 		<author name="Miguel Angel López Hernández" email="miguel@gulev.org.mx"/>
diff --git a/plugins/prefer-plain/ChangeLog b/plugins/prefer-plain/ChangeLog
index 9661943e75..c4fc6331c4 100644
--- a/plugins/prefer-plain/ChangeLog
+++ b/plugins/prefer-plain/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-02  Sankar P  <psankar@novell.com>
+
+	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
+
+	* org-gnome-prefer-plain.eplug.xml:
+	Cleanup. 
+	Fixes part of #301149
+
 2006-08-17  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* prefer-plain.c: (e_plugin_lib_enable): Don't leak the key.
diff --git a/plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml b/plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml
index f35c06c642..0f80a11ae5 100644
--- a/plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml
+++ b/plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml
@@ -3,7 +3,7 @@
   <e-plugin
     type="shlib"
     id="org.gnome.evolution.plugin.preferPlain"
-    location="@PLUGINDIR@/liborg-gnome-prefer-plain.so"
+    location="@PLUGINDIR@/liborg-gnome-prefer-plain@SOEXT@"
     _name="Prefer plain-text">
 
 
diff --git a/plugins/profiler/ChangeLog b/plugins/profiler/ChangeLog
index 469aceb14d..65c4151a04 100644
--- a/plugins/profiler/ChangeLog
+++ b/plugins/profiler/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-02  Sankar P  <psankar@novell.com>
+
+	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
+
+	* org-gnome-evolution-profiler.eplug.xml:
+	Cleanup. 
+	Fixes part of #301149
+
 2005-12-25  Funda Wang  <fundawang@linux.net.cn>
 
 	* Makefile.am: Mark this plugin as translatable (bug#301149).
diff --git a/plugins/profiler/org-gnome-evolution-profiler.eplug.xml b/plugins/profiler/org-gnome-evolution-profiler.eplug.xml
index 1148fa5720..733b89fc4b 100644
--- a/plugins/profiler/org-gnome-evolution-profiler.eplug.xml
+++ b/plugins/profiler/org-gnome-evolution-profiler.eplug.xml
@@ -3,7 +3,7 @@
 	id="org.gnome.evolution.profiler" 
 	type="shlib" 
 	_name="Evolution Profiler" 
-	location="@PLUGINDIR@/liborg-gnome-evolution-profiler.so">
+	location="@PLUGINDIR@/liborg-gnome-evolution-profiler@SOEXT@">
 
 		<_description>Writes a log of profiling data events.</_description>
 		<author name="Michael Zucchi" email="notzed@novell.com"/>
diff --git a/plugins/save-attachments/ChangeLog b/plugins/save-attachments/ChangeLog
index fc8e1a9112..fb0d2426d3 100644
--- a/plugins/save-attachments/ChangeLog
+++ b/plugins/save-attachments/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-02  Sankar P  <psankar@novell.com>
+
+	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
+
+	* org-gnome-save-attachments.eplug.xml:
+	Cleanup. 
+	Fixes part of #301149
+
 2007-03-29  Matthew Barnes  <mbarnes@redhat.com>
 
 	* save-attachments.c:
diff --git a/plugins/save-attachments/org-gnome-save-attachments.eplug.xml b/plugins/save-attachments/org-gnome-save-attachments.eplug.xml
index 0f63421334..d51b341db4 100644
--- a/plugins/save-attachments/org-gnome-save-attachments.eplug.xml
+++ b/plugins/save-attachments/org-gnome-save-attachments.eplug.xml
@@ -4,7 +4,7 @@
   <e-plugin
     id="org.gnome.plugin.attachments.save"
     type="shlib"
-    location="@PLUGINDIR@/liborg-gnome-save-attachments.so"
+    location="@PLUGINDIR@/liborg-gnome-save-attachments@SOEXT@"
     _name="Save attachments">
     
     <author name="Not Zed" email="NotZed@Ximian.com"/>
diff --git a/plugins/save-calendar/ChangeLog b/plugins/save-calendar/ChangeLog
index 4b7391009a..97fb87ac9e 100644
--- a/plugins/save-calendar/ChangeLog
+++ b/plugins/save-calendar/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-02  Sankar P  <psankar@novell.com>
+
+	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
+	
+	* org-gnome-save-calendar.eplug.xml:
+	Cleanup. 
+	Fixes part of #301149
+
 2007-03-29  Matthew Barnes  <mbarnes@redhat.com>
 
 	* save-calendar.c:
diff --git a/plugins/save-calendar/org-gnome-save-calendar.eplug.xml b/plugins/save-calendar/org-gnome-save-calendar.eplug.xml
index b453d058d4..4242ba2fd1 100644
--- a/plugins/save-calendar/org-gnome-save-calendar.eplug.xml
+++ b/plugins/save-calendar/org-gnome-save-calendar.eplug.xml
@@ -2,7 +2,7 @@
 <e-plugin-list>
     <e-plugin id="org.gnome.evolution.save_calendar" type="shlib" 
 	_name="Save Selected"
-	    location="@PLUGINDIR@/liborg-gnome-save-calendar.so"> 
+	    location="@PLUGINDIR@/liborg-gnome-save-calendar@SOEXT@"> 
 	    <author name="Rodrigo Moya" email="rodrigo@novell.com"/>
 		<_description>Saves selected calendar or tasks list to disk.</_description>
 	
@@ -15,4 +15,4 @@
 			</menu>
 		</hook>
 	</e-plugin>
-</e-plugin-list>
\ No newline at end of file
+</e-plugin-list>
diff --git a/plugins/select-one-source/ChangeLog b/plugins/select-one-source/ChangeLog
index 3a1297c6ab..1f85177a4f 100644
--- a/plugins/select-one-source/ChangeLog
+++ b/plugins/select-one-source/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-02  Sankar P  <psankar@novell.com>
+
+	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
+
+	* org-gnome-select-one-source.eplug.xml:
+	Cleanup. 
+	Fixes part of #301149
+
 2006-02-13  Karsten Bräckelmann  <guenther@rudersport.de>
 
 	* org-gnome-select-one-source.eplug.xml: 
diff --git a/plugins/select-one-source/org-gnome-select-one-source.eplug.xml b/plugins/select-one-source/org-gnome-select-one-source.eplug.xml
index 8c350cfcd3..01320ce792 100644
--- a/plugins/select-one-source/org-gnome-select-one-source.eplug.xml
+++ b/plugins/select-one-source/org-gnome-select-one-source.eplug.xml
@@ -2,7 +2,7 @@
 <e-plugin-list>
     <e-plugin id="org.gnome.evolution.select_one_source" type="shlib" 
 	_name="Select one source" 
-		location="@PLUGINDIR@/liborg-gnome-select-one-source.so">
+		location="@PLUGINDIR@/liborg-gnome-select-one-source@SOEXT@">
 		<author name="JP Rosevear" email="jpr@novell.com"/>
 	       	<_description>Selects a single calendar or task source for viewing.</_description>
 	
@@ -15,4 +15,4 @@
 			</menu>
 		</hook>
 	</e-plugin>
-</e-plugin-list>
\ No newline at end of file
+</e-plugin-list>
diff --git a/plugins/subject-thread/ChangeLog b/plugins/subject-thread/ChangeLog
index 9f2b8f741a..71093fe341 100644
--- a/plugins/subject-thread/ChangeLog
+++ b/plugins/subject-thread/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-02  Sankar P  <psankar@novell.com>
+
+	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
+
+	* org-gnome-subject-thread.eplug.xml:
+	Cleanup. 
+	Fixes part of #301149
+
 2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #419524
diff --git a/plugins/subject-thread/org-gnome-subject-thread.eplug.xml b/plugins/subject-thread/org-gnome-subject-thread.eplug.xml
index 87132bbf8c..a472f0289d 100644
--- a/plugins/subject-thread/org-gnome-subject-thread.eplug.xml
+++ b/plugins/subject-thread/org-gnome-subject-thread.eplug.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <e-plugin-list>
 	<e-plugin id="org.gnome.evolution.mail_subject_thread" type="shlib" _name="Subject Threading" 
-		location="@PLUGINDIR@/liborg-gnome-subject-thread.so">
+		location="@PLUGINDIR@/liborg-gnome-subject-thread@SOEXT@">
 		<author name="JP Rosevear" email="jpr@novell.com"/>
 		<_description>Indicates if threading of messages should fall back to subject.</_description>
 	
@@ -11,4 +11,4 @@
 			</group>
 		</hook>
 	</e-plugin>
-</e-plugin-list>
\ No newline at end of file
+</e-plugin-list>