[gtk-mac-integration] Change namespace on create_cgimage_from_pixbuf



commit d807a6e78ba4efcee67f9e4d730858bed1c5a9d4
Author: John Ralls <jralls ceridwen us>
Date:   Tue Feb 14 20:47:02 2012 -0800

    Change namespace on create_cgimage_from_pixbuf
    
    
    Introspection will barf because gtk is already taken.

 src/gtk-mac-dock.c             |    4 ++--
 src/gtk-mac-image-utils.c      |    2 +-
 src/gtk-mac-image-utils.h      |    2 +-
 src/gtkosxapplication_quartz.c |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/gtk-mac-dock.c b/src/gtk-mac-dock.c
index 8398d53..93e5806 100644
--- a/src/gtk-mac-dock.c
+++ b/src/gtk-mac-dock.c
@@ -316,7 +316,7 @@ gtk_mac_dock_set_icon_from_pixbuf (GtkMacDock *dock,
     {
       CGImageRef image;
 
-      image = gtk_create_cgimage_from_pixbuf (pixbuf);
+      image = gtkosx_create_cgimage_from_pixbuf (pixbuf);
       SetApplicationDockTileImage (image);
       CGImageRelease (image);
     }
@@ -361,7 +361,7 @@ gtk_mac_dock_set_overlay_from_pixbuf (GtkMacDock  *dock,
 
   if (pixbuf)
     {
-      image = gtk_create_cgimage_from_pixbuf (pixbuf);
+      image = gtkosx_create_cgimage_from_pixbuf (pixbuf);
       OverlayApplicationDockTileImage (image);
       CGImageRelease (image);
     }
diff --git a/src/gtk-mac-image-utils.c b/src/gtk-mac-image-utils.c
index c3f7b25..1bdaa69 100644
--- a/src/gtk-mac-image-utils.c
+++ b/src/gtk-mac-image-utils.c
@@ -26,7 +26,7 @@
 #include "gtk-mac-image-utils.h"
 
 CGImageRef
-gtk_create_cgimage_from_pixbuf (GdkPixbuf *pixbuf)
+gtkosx_create_cgimage_from_pixbuf (GdkPixbuf *pixbuf)
 {
   CGColorSpaceRef   colorspace;
   CGDataProviderRef data_provider;
diff --git a/src/gtk-mac-image-utils.h b/src/gtk-mac-image-utils.h
index ac0d62f..6d03969 100644
--- a/src/gtk-mac-image-utils.h
+++ b/src/gtk-mac-image-utils.h
@@ -25,7 +25,7 @@
 
 G_BEGIN_DECLS
 
-CGImageRef gtk_create_cgimage_from_pixbuf (GdkPixbuf *pixbuf);
+CGImageRef gtkosx_create_cgimage_from_pixbuf (GdkPixbuf *pixbuf);
 
 G_END_DECLS
 
diff --git a/src/gtkosxapplication_quartz.c b/src/gtkosxapplication_quartz.c
index fbf3be0..e6cb439 100644
--- a/src/gtkosxapplication_quartz.c
+++ b/src/gtkosxapplication_quartz.c
@@ -901,7 +901,7 @@ nsimage_from_pixbuf(GdkPixbuf *pixbuf)
   NSImage* newImage = nil;
 
   g_return_val_if_fail (pixbuf !=  NULL, NULL);
-  image = gtk_create_cgimage_from_pixbuf (pixbuf);
+  image = gtkosx_create_cgimage_from_pixbuf (pixbuf);
   // Get the image dimensions.
   imageRect.size.height = CGImageGetHeight(image);
   imageRect.size.width = CGImageGetWidth(image);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]