beagle r4877 - in trunk/beagle/search: . Beagle.Search.Tiles

[dbera svn gnome org]

Author: dbera
Date: Sun Nov  9 17:41:52 2008
New Revision: 4877
URL: http://svn.gnome.org/viewvc/beagle?rev=4877&view=rev

Log:
Remove hardcoded library name from the source and move it to config file - this will make it easier to patch if the soname changes.


Added:
   trunk/beagle/search/Beagle.Search.exe.config
Modified:
   trunk/beagle/search/Beagle.Search.Tiles/Application.cs
   trunk/beagle/search/Makefile.am

Modified: trunk/beagle/search/Beagle.Search.Tiles/Application.cs
==============================================================================
--- trunk/beagle/search/Beagle.Search.Tiles/Application.cs	(original)
+++ trunk/beagle/search/Beagle.Search.Tiles/Application.cs	Sun Nov  9 17:41:52 2008
@@ -17,13 +17,13 @@
 			AddSupportedFlavor (new HitFlavor (null, null, "application/x-desktop"));
 		}
 
-		[DllImport ("libgnome-desktop-2.so.2")]
+		[DllImport ("libgnome-desktop-2")]
 		static extern IntPtr gnome_desktop_item_new_from_uri (string uri, int flags, IntPtr error);
 
-		[DllImport ("libgnome-desktop-2.so.2")]
+		[DllImport ("libgnome-desktop-2")]
 		static extern string gnome_desktop_item_get_string (IntPtr ditem, string attr);
 
-		[DllImport ("libgnome-desktop-2.so.2")]
+		[DllImport ("libgnome-desktop-2")]
 		static extern void gnome_desktop_item_unref (IntPtr ditem);
 
 		IntPtr ditem;
@@ -157,7 +157,7 @@
 				base.LoadIcon (image, size);
 		}
 
-		[DllImport ("libgnome-desktop-2.so.2")]
+		[DllImport ("libgnome-desktop-2")]
 		static extern int gnome_desktop_item_launch (IntPtr ditem, IntPtr file_list, int flags, IntPtr error);
 
 		public override void Open ()

Added: trunk/beagle/search/Beagle.Search.exe.config
==============================================================================
--- (empty file)
+++ trunk/beagle/search/Beagle.Search.exe.config	Sun Nov  9 17:41:52 2008
@@ -0,0 +1,4 @@
+<configuration>
+	<dllmap dll="libgnome-desktop-2" target="libgnome-desktop-2.so.2" />
+</configuration>
+

Modified: trunk/beagle/search/Makefile.am
==============================================================================
--- trunk/beagle/search/Makefile.am	(original)
+++ trunk/beagle/search/Makefile.am	Sun Nov  9 17:41:52 2008
@@ -104,7 +104,7 @@
 	-r:Mono.Posix			\
 	-r:Mono.Cairo
 
-pkglib_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb
+pkglib_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb $(ASSEMBLY).config
 
 BIN_WRAPPERS = beagle-search