banshee r4771 - in trunk/banshee: . src/Backends/Banshee.Unix/Banshee.IO.Unix src/Core/Banshee.Core/Banshee.Base src/Libraries/Hyena.Gui src/Libraries/Hyena.Gui/Hyena.Gui

[blorentz svn gnome org]

Author: blorentz
Date: Fri Oct 31 17:18:05 2008
New Revision: 4771
URL: http://svn.gnome.org/viewvc/banshee?rev=4771&view=rev

Log:
2008-10-31  Bertrand Lorentz  <bertrand lorentz gmail com>

	* src/Core/Banshee.Core/Banshee.Base/SafeUri.cs:
	* src/Core/Banshee.Core/Banshee.Base/Localization.cs:
	* src/Backends/Banshee.Unix/Banshee.IO.Unix/Directory.cs:
	* src/Libraries/Hyena.Gui/Hyena.Gui.dll.config:
	* src/Libraries/Hyena.Gui/Hyena.Gui/PangoCairoHelper.cs: Fix a 
	DllNotFoundException by making the DllImport statements match the dllmap
	in the .config files (BGO #557868).



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Backends/Banshee.Unix/Banshee.IO.Unix/Directory.cs
   trunk/banshee/src/Core/Banshee.Core/Banshee.Base/Localization.cs
   trunk/banshee/src/Core/Banshee.Core/Banshee.Base/SafeUri.cs
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui.dll.config
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui/PangoCairoHelper.cs

Modified: trunk/banshee/src/Backends/Banshee.Unix/Banshee.IO.Unix/Directory.cs
==============================================================================
--- trunk/banshee/src/Backends/Banshee.Unix/Banshee.IO.Unix/Directory.cs	(original)
+++ trunk/banshee/src/Backends/Banshee.Unix/Banshee.IO.Unix/Directory.cs	Fri Oct 31 17:18:05 2008
@@ -38,7 +38,7 @@
 {
     public class Directory : IDirectory
     {
-        [System.Runtime.InteropServices.DllImport ("libglib-2.0.dll")]
+        [System.Runtime.InteropServices.DllImport ("libglib-2.0-0.dll")]
         private static extern int g_mkdir_with_parents (IntPtr path, int mode);
     
         public void Create (string directory)

Modified: trunk/banshee/src/Core/Banshee.Core/Banshee.Base/Localization.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Core/Banshee.Base/Localization.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Core/Banshee.Base/Localization.cs	Fri Oct 31 17:18:05 2008
@@ -120,7 +120,7 @@
             return result;
         }
         
-        [DllImport("libglib-2.0.dll")]
+        [DllImport("libglib-2.0-0.dll")]
         private static extern IntPtr g_get_language_names();
 
         private static string [] GetLanguageNames()

Modified: trunk/banshee/src/Core/Banshee.Core/Banshee.Base/SafeUri.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Core/Banshee.Base/SafeUri.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Core/Banshee.Base/SafeUri.cs	Fri Oct 31 17:18:05 2008
@@ -176,10 +176,10 @@
             get { return Scheme == System.Uri.UriSchemeFile; }
         }
         
-        [DllImport ("libglib-2.0.dll")]
+        [DllImport ("libglib-2.0-0.dll")]
         private static extern IntPtr g_filename_to_uri (IntPtr filename, IntPtr hostname, IntPtr error);
 
-        [DllImport ("libglib-2.0.dll")]
+        [DllImport ("libglib-2.0-0.dll")]
         private static extern IntPtr g_filename_from_uri (IntPtr uri, IntPtr hostname, IntPtr error);
     }
 }

Modified: trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui.dll.config
==============================================================================
--- trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui.dll.config	(original)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui.dll.config	Fri Oct 31 17:18:05 2008
@@ -4,12 +4,12 @@
   <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0" os="linux"/>
   <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0" os="linux"/>
   <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0.so.0" os="linux"/>
-  <dllmap dll="libpangocairo-1.0.dll" target="libpangocairo-1.0.so.0" os="linux"/>
+  <dllmap dll="libpangocairo-1.0-0.dll" target="libpangocairo-1.0.so.0" os="linux"/>
 
   <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-quartz-2.0.dylib" os="osx"/>
   <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-quartz-2.0.dylib" os="osx"/>
   <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.dylib" os="osx"/>
   <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.dylib" os="osx"/>
   <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0.dylib" os="osx"/>
-  <dllmap dll="libpangocairo-1.0.dll" target="libpangocairo-1.0.dylib" os="osx"/>
+  <dllmap dll="libpangocairo-1.0-0.dll" target="libpangocairo-1.0.dylib" os="osx"/>
 </configuration>

Modified: trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui/PangoCairoHelper.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui/PangoCairoHelper.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui/PangoCairoHelper.cs	Fri Oct 31 17:18:05 2008
@@ -33,7 +33,7 @@
 {
     public static class PangoCairoHelper
     {
-        [DllImport ("libpangocairo-1.0.dll")]
+        [DllImport ("libpangocairo-1.0-0.dll")]
         private static extern void pango_cairo_show_layout (IntPtr cr, IntPtr layout);
         
         public static void ShowLayout (Cairo.Context cr, Pango.Layout layout)
@@ -42,7 +42,7 @@
                 layout == null ? IntPtr.Zero : layout.Handle);
         }
         
-        [DllImport ("libpangocairo-1.0.dll")]
+        [DllImport ("libpangocairo-1.0-0.dll")]
         private static extern IntPtr pango_cairo_create_layout (IntPtr cr);
 
         public static Pango.Layout CreateLayout (Cairo.Context cr) 
@@ -51,7 +51,7 @@
             return GLib.Object.GetObject (raw_ret) as Pango.Layout;
         }
         
-        [DllImport ("libpangocairo-1.0.dll")]
+        [DllImport ("libpangocairo-1.0-0.dll")]
         private static extern void pango_cairo_layout_path (IntPtr cr, IntPtr layout);
 
         public static void LayoutPath (Cairo.Context cr, Pango.Layout layout, 
@@ -61,7 +61,7 @@
                 layout == null ? IntPtr.Zero : layout.Handle);
         }
         
-        [DllImport ("libpangocairo-1.0.dll")]
+        [DllImport ("libpangocairo-1.0-0.dll")]
         private static extern void pango_cairo_context_set_resolution (IntPtr pango_context, double dpi);
         
         public static void ContextSetResolution (Pango.Context context, double dpi)
@@ -69,7 +69,7 @@
             pango_cairo_context_set_resolution (context == null ? IntPtr.Zero : context.Handle, dpi);
         }
         
-        [DllImport ("libpangocairo-1.0.dll")]
+        [DllImport ("libpangocairo-1.0-0.dll")]
         private static extern IntPtr pango_layout_get_context (IntPtr layout);
         
         public static Pango.Context LayoutGetContext (Pango.Layout layout)