GNOME.org
 

banshee r4711 - in trunk/banshee: . build/m4/banshee build/osx src/Backends/Banshee.Unix/Banshee.IO.Unix src/Core/Banshee.Core src/Core/Banshee.Core/Banshee.Base src/Core/Banshee.Widgets src/Core/Banshee.Widgets/Banshee.Widgets src/Dap/Banshee.Dap/Banshee.Dap src/Extensions/Banshee.MultimediaKeys src/Libraries/Hyena.Gui src/Libraries/Hyena.Gui/Hyena.Gui

Author: abock
Date: Tue Oct 21 21:03:00 2008
New Revision: 4711
URL: http://svn.gnome.org/viewvc/banshee?rev=4711&view=rev

Log:
2008-10-21  Aaron Bockover  <abock gnome org>

    This is round one of Eoin's core fixes for OS X support. This commit
    yields an almost running Banshee. Getting very close. (BGO #557190)

    * src/Extensions/Banshee.MultimediaKeys/Makefile.am: Only enable if
    we are on GNOME

    * src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs: Don't initialize DAP
    service without a HardwareManager instance. Necessary on OS X until we
    have a backend implemented

    * src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:
    * 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/CairoExtensions.cs:
    * src/Libraries/Hyena.Gui/Hyena.Gui/PangoCairoHelper.cs:
    * src/Libraries/Hyena.Gui/Hyena.Gui/CompositeUtils.cs:
    * src/Libraries/Hyena.Gui/Hyena.Gui/PixbufImageSurface.cs: Fixed up all
    DllImport attributes to import directly against the Win32 target, to be
    remapped to proper libraries on linux or osx through the newly fixed
    dll map config files

    * src/Core/Banshee.Widgets/Banshee.Widgets.dll.config:
    * src/Core/Banshee.Core/Banshee.Core.dll.config:
    * src/Libraries/Hyena.Gui/Hyena.Gui.dll.config: Made sure all dll maps
    will work on Win32 without a .config, map these fixed up names to proper
    .so or .dylib targets depending on whether the os is linux or osx

    * src/Core/Banshee.Core/Makefile.am: Include the new .config file

    * build/m4/banshee/osx.m4: OS X specific check

    * build/m4/banshee/dap-njb.m4: Removed, obsolete

    * build/osx/build.env: Fix up ACLOCAL_FLAGS

    * build/osx/autogen.sh: Pass --enable-osx

    * build/osx/oss-40-managed-libs.targets: Added ige-mac-integration-sharp,
    removed mono-addins since that's part of the Mono 2.0 SDK

    * configure.ac: Added --enable-osx configure option, currently just
    makes sure we have ige-mac-integration-sharp. It should also check that we
    actually have OS X



Added:
   trunk/banshee/build/m4/banshee/osx.m4
   trunk/banshee/src/Core/Banshee.Core/Banshee.Core.dll.config
Removed:
   trunk/banshee/build/m4/banshee/dap-njb.m4
Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/build/osx/autogen.sh
   trunk/banshee/build/osx/build.env
   trunk/banshee/build/osx/oss-40-managed-libs.targets
   trunk/banshee/configure.ac
   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/Core/Banshee.Core/Makefile.am
   trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets.dll.config
   trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs
   trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs
   trunk/banshee/src/Extensions/Banshee.MultimediaKeys/Makefile.am
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui.dll.config
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui/CairoExtensions.cs
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui/CompositeUtils.cs
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui/PangoCairoHelper.cs
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui/PixbufImageSurface.cs

Added: trunk/banshee/build/m4/banshee/osx.m4
==============================================================================
--- (empty file)
+++ trunk/banshee/build/m4/banshee/osx.m4	Tue Oct 21 21:03:00 2008
@@ -0,0 +1,22 @@
+AC_DEFUN([BANSHEE_CHECK_OSX],
+[
+    IGEMACINTEGRATIONSHARP_REQUIRED=0.6
+
+	AC_ARG_ENABLE(osx, AC_HELP_STRING([--enable-osx], [Enable OSX support]), enable_osx=$enableval, enable_osx="no")
+
+	if test "x$enable_osx" = "xyes"; then
+        dnl FIXME: detect osx
+	    have_osx="yes"
+
+        PKG_CHECK_MODULES(IGEMACINTEGRATIONSHARP, 
+	        ige-mac-integration-sharp >= $IGEMACINTEGRATIONSHARP_REQUIRED,
+	        have_igemacintegrationsharp=yes, have_igemacintegrationsharp=no)
+	
+        if test "x$have_igemacintegrationsharp" = "xno"; then
+	        AC_MSG_ERROR([ige-mac-integration-sharp was not found or is not up to date. Please install ige-mac-integration-sharp of at least version $IGEMACINTEGRATIONSHARP_REQUIRED])
+	    fi
+	    AC_SUBST(IGEMACINTEGRATIONSHARP_LIBS)
+	fi
+
+	AM_CONDITIONAL(ENABLE_OSX, test "x$have_osx" = "xyes")
+])

Modified: trunk/banshee/build/osx/autogen.sh
==============================================================================
--- trunk/banshee/build/osx/autogen.sh	(original)
+++ trunk/banshee/build/osx/autogen.sh	Tue Oct 21 21:03:00 2008
@@ -29,7 +29,8 @@
 	--disable-ipod \
 	--disable-boo \
 	--disable-gnome \
-	--disable-docs
+	--disable-docs \
+	--enable-osx
 
 mv configure.ac.orig configure.ac
 

Modified: trunk/banshee/build/osx/build.env
==============================================================================
--- trunk/banshee/build/osx/build.env	(original)
+++ trunk/banshee/build/osx/build.env	Tue Oct 21 21:03:00 2008
@@ -18,4 +18,4 @@
 export LDFLAGS="-L$MONO_SDK_PATH/lib $LDFLAGS"
 export CFLAGS="-I$BUILD_PREFIX/inlcude -isysroot $MAC_SDK_PATH -mmacosx-version-min=10.4 -I$MONO_SDK_PATH/include $CFLAGS"
 export LD_LIBRARY_PATH="$MONO_SDK_PATH/lib:$LD_LIBRARY_PATH"
-export ACLOCAL_FLAGS="-I $MONO_SDK_PATH/share/aclocal"
+export ACLOCAL_FLAGS="-I $MONO_SDK_PATH/share/aclocal -I /opt/local/share/aclocal"

Modified: trunk/banshee/build/osx/oss-40-managed-libs.targets
==============================================================================
--- trunk/banshee/build/osx/oss-40-managed-libs.targets	(original)
+++ trunk/banshee/build/osx/oss-40-managed-libs.targets	Tue Oct 21 21:03:00 2008
@@ -5,4 +5,5 @@
     "ndesk-dbus        0.6.0         %n-%v     %d.tar.gz   ${NDBUS_DOWNLOAD_URI}"
     "ndesk-dbus-glib   0.4.1         %n-%v     %d.tar.gz   ${NDBUS_DOWNLOAD_URI}"
     "taglib-sharp      2.0.3.0       %n-%v     %d.tar.gz   http://www.taglib-sharp.com/Download/%f    --disable-docs"
+    "ige-mac-integration-sharp 0.8.2 %n-%v     %d.tar.gz   http://randomrules.org/files/%f";
 )

Modified: trunk/banshee/configure.ac
==============================================================================
--- trunk/banshee/configure.ac	(original)
+++ trunk/banshee/configure.ac	Tue Oct 21 21:03:00 2008
@@ -75,6 +75,9 @@
 dnl Required dependencies (managed/core)
 BANSHEE_CHECK_GTK_SHARP
 
+dnl OS X (optional through --enable-osx)
+BANSHEE_CHECK_OSX
+
 PKG_CHECK_MODULES(SQLITE, sqlite3 >= 3.4)
 
 dnl GNOME (optional)
@@ -246,6 +249,7 @@
     Boo Scripting:     ${enable_boo}
     X11 Video Support: ${have_xvidmode}
     GNOME Support:     ${enable_gnome}
+    OSX Support:       ${enable_osx}
     Graphics System:   ${GRAPHICS_SUBSYSTEM}
 
     Unit Tests:        ${do_tests}	(requires nunit >= ${NUNIT_REQUIRED})

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	Tue Oct 21 21:03:00 2008
@@ -38,7 +38,7 @@
 {
     public class Directory : IDirectory
     {
-        [System.Runtime.InteropServices.DllImport ("libglib-2.0.so.0")]
+        [System.Runtime.InteropServices.DllImport ("libglib-2.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	Tue Oct 21 21:03:00 2008
@@ -120,7 +120,7 @@
             return result;
         }
         
-        [DllImport("libglib-2.0.so.0")]
+        [DllImport("libglib-2.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	Tue Oct 21 21:03:00 2008
@@ -176,10 +176,10 @@
             get { return Scheme == System.Uri.UriSchemeFile; }
         }
         
-        [DllImport ("libglib-2.0.so.0")]
+        [DllImport ("libglib-2.0.dll")]
         private static extern IntPtr g_filename_to_uri (IntPtr filename, IntPtr hostname, IntPtr error);
 
-        [DllImport ("libglib-2.0.so.0")]
+        [DllImport ("libglib-2.0.dll")]
         private static extern IntPtr g_filename_from_uri (IntPtr uri, IntPtr hostname, IntPtr error);
     }
 }

Added: trunk/banshee/src/Core/Banshee.Core/Banshee.Core.dll.config
==============================================================================
--- (empty file)
+++ trunk/banshee/src/Core/Banshee.Core/Banshee.Core.dll.config	Tue Oct 21 21:03:00 2008
@@ -0,0 +1,4 @@
+<configuration>
+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0" os="linux"/>
+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.dylib" os="osx"/>
+</configuration>
\ No newline at end of file

Modified: trunk/banshee/src/Core/Banshee.Core/Makefile.am
==============================================================================
--- trunk/banshee/src/Core/Banshee.Core/Makefile.am	(original)
+++ trunk/banshee/src/Core/Banshee.Core/Makefile.am	Tue Oct 21 21:03:00 2008
@@ -73,3 +73,5 @@
 
 include $(top_srcdir)/build/build.mk
 
+EXTRA_DIST += Banshee.Core.dll.config
+module_SCRIPTS += Banshee.Core.dll.config
\ No newline at end of file

Modified: trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets.dll.config
==============================================================================
--- trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets.dll.config	(original)
+++ trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets.dll.config	Tue Oct 21 21:03:00 2008
@@ -1,3 +1,4 @@
 <configuration>
-  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0"/>
+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0" os="linux"/>
+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.0.dylib" os="osx"/>
 </configuration>

Modified: trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs	Tue Oct 21 21:03:00 2008
@@ -338,7 +338,7 @@
         private static extern void g_signal_stop_emission_by_name(IntPtr o, string signal);
         
         // In case there's no map provided by the assembly .config file
-        [DllImport("libgobject-2.0.so.0", EntryPoint="g_signal_stop_emission_by_name")]
+        [DllImport("libgobject-2.0-0.dll", EntryPoint="g_signal_stop_emission_by_name")]
         private static extern void g_signal_stop_emission_by_name_fallback(IntPtr o, string signal);
             
         private void OnWidgetEventAfter(object o, WidgetEventAfterArgs args)
@@ -696,7 +696,7 @@
             private static extern void g_type_query(IntPtr type, IntPtr query);
             
             // In case there's no map provided by the assembly .config file
-            [DllImport("libgobject-2.0.so.0", EntryPoint="g_type_query")]
+            [DllImport("libgobject-2.0-0.dll", EntryPoint="g_type_query")]
             private static extern void g_type_query_fallback(IntPtr type, IntPtr query);
 
             private int min_slider_size_offset = -1;

Modified: trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs	Tue Oct 21 21:03:00 2008
@@ -58,7 +58,7 @@
         public void DelayedInitialize ()
         {
             lock (sync) {
-                if (initialized)
+                if (initialized || ServiceManager.HardwareManager == null)
                     return;
 
                 sources = new Dictionary<string, DapSource> ();

Modified: trunk/banshee/src/Extensions/Banshee.MultimediaKeys/Makefile.am
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.MultimediaKeys/Makefile.am	(original)
+++ trunk/banshee/src/Extensions/Banshee.MultimediaKeys/Makefile.am	Tue Oct 21 21:03:00 2008
@@ -7,5 +7,8 @@
 
 RESOURCES = Resources/Banshee.MultimediaKeys.addin.xml
 
+if ENABLE_GNOME
 include $(top_srcdir)/build/build.mk
-
+else
+EXTRA_DIST = $(SOURCES) $(RESOURCES)
+endif

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	Tue Oct 21 21:03:00 2008
@@ -1,8 +1,15 @@
 <configuration>
-  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0.so.0"/>
-  <dllmap dll="libgdk-2.0-0.dll" target="libgdk-x11-2.0.so.0"/>
+  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0.so.0" os="linux"/>
+  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0.so.0" os="linux"/>
+  <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="libglib-2.0-0.dll" target="libglib-2.0.so.0"/>
-  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0"/>
-  <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0.so.0"/>
+  <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"/>
 </configuration>

Modified: trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui/CairoExtensions.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui/CairoExtensions.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui/CairoExtensions.cs	Tue Oct 21 21:03:00 2008
@@ -360,7 +360,7 @@
         
         private static bool native_push_pop_exists = true;
         
-        [DllImport ("libcairo.so.2")]
+        [DllImport ("libcairo-2.dll")]
         private static extern void cairo_push_group (IntPtr ptr);
         private static CairoInteropCall cairo_push_group_call = new CairoInteropCall ("PushGroup");
         
@@ -379,7 +379,7 @@
             }
         }
         
-        [DllImport ("libcairo.so.2")]
+        [DllImport ("libcairo-2.dll")]
         private static extern void cairo_pop_group_to_source (IntPtr ptr);
         private static CairoInteropCall cairo_pop_group_to_source_call = new CairoInteropCall ("PopGroupToSource");
         

Modified: trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui/CompositeUtils.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui/CompositeUtils.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui/CompositeUtils.cs	Tue Oct 21 21:03:00 2008
@@ -35,14 +35,14 @@
 {
     public static class CompositeUtils 
     {
-        [DllImport ("libgdk-2.0-0.dll")]
+        [DllImport ("libgdk-win32-2.0-0.dll")]
         private static extern IntPtr gdk_screen_get_rgba_visual (IntPtr screen);
 
         [DllImport ("libgtk-win32-2.0-0.dll")]
         private static extern void gtk_widget_input_shape_combine_mask (IntPtr raw, IntPtr shape_mask, 
             int offset_x, int offset_y);
 
-        [DllImport ("libgdk-2.0-0.dll")]
+        [DllImport ("libgdk-win32-2.0-0.dll")]
         private static extern IntPtr gdk_screen_get_rgba_colormap (IntPtr screen);
         
         public static Colormap GetRgbaColormap (Screen screen)
@@ -89,11 +89,11 @@
             return null;
         }
 
-        [DllImport ("libgdk-2.0-0.dll")]
+        [DllImport ("libgdk-win32-2.0-0.dll")]
         private static extern void gdk_property_change (IntPtr window, IntPtr property, IntPtr type, 
             int format, int mode, uint [] data, int nelements);
 
-        [DllImport ("libgdk-2.0-0.dll")]
+        [DllImport ("libgdk-win32-2.0-0.dll")]
         private static extern void gdk_property_change (IntPtr window, IntPtr property, IntPtr type, 
             int format, int mode, byte [] data, int nelements);
       
@@ -107,7 +107,7 @@
             gdk_property_change (win.Handle, property.Handle, type.Handle, 8, (int)mode,  data, data.Length);
         }
 
-        [DllImport ("libgdk-2.0-0.dll")]
+        [DllImport ("libgdk-win32-2.0-0.dll")]
         private static extern bool gdk_x11_screen_supports_net_wm_hint (IntPtr screen, IntPtr property);
 
         public static bool SupportsHint (Screen screen, string name)
@@ -120,7 +120,7 @@
             }
         }
 
-        [DllImport ("libgdk-2.0-0.dll")]
+        [DllImport ("libgdk-win32-2.0-0.dll")]
         private static extern bool gdk_screen_is_composited (IntPtr screen);
 
         public static bool IsComposited (Screen screen) 

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	Tue Oct 21 21:03:00 2008
@@ -33,7 +33,7 @@
 {
     public static class PangoCairoHelper
     {
-        [DllImport ("libpangocairo-1.0.so.0")]
+        [DllImport ("libpangocairo-1.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.so.0")]
+        [DllImport ("libpangocairo-1.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.so.0")]
+        [DllImport ("libpangocairo-1.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.so.0")]
+        [DllImport ("libpangocairo-1.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.so.0")]
+        [DllImport ("libpangocairo-1.0.dll")]
         private static extern IntPtr pango_layout_get_context (IntPtr layout);
         
         public static Pango.Context LayoutGetContext (Pango.Layout layout)

Modified: trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui/PixbufImageSurface.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui/PixbufImageSurface.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui/PixbufImageSurface.cs	Tue Oct 21 21:03:00 2008
@@ -137,7 +137,7 @@
             return (byte)(((t >> 8) + t) >> 8);
         }
         
-        [DllImport ("libcairo.so.2")]
+        [DllImport ("libcairo-2.dll")]
         private static extern Cairo.Status cairo_surface_set_user_data (IntPtr surface, 
             ref int key, IntPtr userdata, cairo_destroy_func_t destroy);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]