banshee r3557 - in trunk/banshee: . src/Extensions/Banshee.NotificationArea src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea

[abock svn gnome org]

Author: abock
Date: Wed Mar 26 23:23:13 2008
New Revision: 3557
URL: http://svn.gnome.org/viewvc/banshee?rev=3557&view=rev

Log:
2008-03-26  Aaron Bockover  <abock gnome org>

    * src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.dll.config:
    * src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationArea.cs:
    Change the default DllImport for libX11 directly to libX11.so.6 and then
    provide a .config file map that distributors could override if necessary



Added:
   trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.dll.config
Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationArea.cs
   trunk/banshee/src/Extensions/Banshee.NotificationArea/Makefile.am

Added: trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.dll.config
==============================================================================
--- (empty file)
+++ trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.dll.config	Wed Mar 26 23:23:13 2008
@@ -0,0 +1,4 @@
+<configuration>
+  <dllmap dll="libgdk-x11-2.0.so.0" target="libgdk-x11-2.0.so.0"/>
+  <dllmap dll="libX11.so.6" target="libX11.so.6"/>
+</configuration>

Modified: trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationArea.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationArea.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationArea.cs	Wed Mar 26 23:23:13 2008
@@ -346,36 +346,36 @@
 	[DllImport ("libgdk-x11-2.0.so.0")]
 	private static extern int gdk_error_trap_pop ();
 
-	[DllImport ("libX11")]
+	[DllImport ("libX11.so.6")]
 	private extern static IntPtr XInternAtom(IntPtr display, string atom_name, bool only_if_exists);
 
-	[DllImport ("libX11")]
+	[DllImport ("libX11.so.6")]
 	private extern static void XGrabServer (IntPtr display);
 
-	[DllImport ("libX11")]
+	[DllImport ("libX11.so.6")]
 	private extern static void XUngrabServer (IntPtr display);
 
-	[DllImport ("libX11")]
+	[DllImport ("libX11.so.6")]
 	private extern static int XFlush (IntPtr display);
 
-	[DllImport ("libX11")]
+	[DllImport ("libX11.so.6")]
 	private extern static int XSync (IntPtr display, bool discard);
 
-	[DllImport ("libX11")]
+	[DllImport ("libX11.so.6")]
 	private extern static int XFree (IntPtr display);
 
-	[DllImport ("libX11")]
+	[DllImport ("libX11.so.6")]
 	private extern static IntPtr XGetSelectionOwner (IntPtr display, IntPtr atom);
 
-	[DllImport ("libX11")]
+	[DllImport ("libX11.so.6")]
 	private extern static IntPtr XSelectInput (IntPtr display, IntPtr window, IntPtr mask);
 
-	[DllImport ("libX11")]
-	private extern static int XSendEvent(IntPtr display, IntPtr window, bool propagate, IntPtr event_mask, 
+	[DllImport ("libX11.so.6")]
+	private extern static int XSendEvent (IntPtr display, IntPtr window, bool propagate, IntPtr event_mask, 
 					     ref XClientMessageEvent send_event);
 
-	[DllImport("libX11")]
-	private extern static int XGetWindowProperty(IntPtr display, IntPtr w, IntPtr property, IntPtr long_offset, 
+	[DllImport ("libX11.so.6")]
+	private extern static int XGetWindowProperty (IntPtr display, IntPtr w, IntPtr property, IntPtr long_offset, 
 						     IntPtr long_length, bool deleteProp, IntPtr req_type,
 						     out IntPtr actual_type_return, out int actual_format_return, 
 						     out IntPtr nitems_return, out IntPtr bytes_after_return, 

Modified: trunk/banshee/src/Extensions/Banshee.NotificationArea/Makefile.am
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.NotificationArea/Makefile.am	(original)
+++ trunk/banshee/src/Extensions/Banshee.NotificationArea/Makefile.am	Wed Mar 26 23:23:13 2008
@@ -27,3 +27,6 @@
 
 include $(top_srcdir)/build/build.mk
 
+module_SCRIPTS += Banshee.NotificationArea.dll.config
+EXTRA_DIST += Banshee.NotificationArea.dll.config
+