gtk+ r19453 - in branches/gtk-2-12: . gdk/directfb

[neo svn gnome org]

Author: neo
Date: Fri Feb  1 10:34:47 2008
New Revision: 19453
URL: http://svn.gnome.org/viewvc/gtk+?rev=19453&view=rev

Log:
2008-02-01  Sven Neumann  <sven gimp org>

	* gdk/directfb/gdkdrawable-directfb.c
	* gdk/directfb/gdkimage-directfb.c
	* gdk/directfb/gdkinput-directfb.c
	* gdk/directfb/gdkpixmap-directfb.c
	* gdk/directfb/gdkwindow-directfb.c: applied
	directfb-deprecation-fixes.patch from Debian. Fixes build with
	GLib 2.15 deprecation of G_GNUC_FUNCTION in favor of G_STRLOC.


Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/gdk/directfb/gdkdrawable-directfb.c
   branches/gtk-2-12/gdk/directfb/gdkimage-directfb.c
   branches/gtk-2-12/gdk/directfb/gdkinput-directfb.c
   branches/gtk-2-12/gdk/directfb/gdkpixmap-directfb.c
   branches/gtk-2-12/gdk/directfb/gdkwindow-directfb.c

Modified: branches/gtk-2-12/gdk/directfb/gdkdrawable-directfb.c
==============================================================================
--- branches/gtk-2-12/gdk/directfb/gdkdrawable-directfb.c	(original)
+++ branches/gtk-2-12/gdk/directfb/gdkdrawable-directfb.c	Fri Feb  1 10:34:47 2008
@@ -476,7 +476,7 @@
                        gint         angle1,
                        gint         angle2)
 {
-  WARN_UNIMPLEMENTED (G_GNUC_FUNCTION);
+  WARN_UNIMPLEMENTED (G_STRLOC);
 }
 
 static void
@@ -560,7 +560,7 @@
                         const gchar *text,
                         gint         text_length)
 {
-  WARN_UNIMPLEMENTED (G_GNUC_FUNCTION);
+  WARN_UNIMPLEMENTED (G_STRLOC);
 }
 
 static void
@@ -572,7 +572,7 @@
                            const GdkWChar *text,
                            gint            text_length)
 {
-  WARN_UNIMPLEMENTED (G_GNUC_FUNCTION);
+  WARN_UNIMPLEMENTED (G_STRLOC);
 }
 
 static void

Modified: branches/gtk-2-12/gdk/directfb/gdkimage-directfb.c
==============================================================================
--- branches/gtk-2-12/gdk/directfb/gdkimage-directfb.c	(original)
+++ branches/gtk-2-12/gdk/directfb/gdkimage-directfb.c	Fri Feb  1 10:34:47 2008
@@ -151,7 +151,7 @@
 
   GDK_NOTE (MISC, g_print ("gdk_image_new_bitmap: %dx%d\n", w, h));
 
-  g_message ("not fully implemented %s", G_GNUC_FUNCTION);
+  g_message ("not fully implemented %s", G_STRLOC);
 
   image->bpl = (w + 7) / 8;
   image->mem = g_malloc (image->bpl * h);
@@ -209,7 +209,7 @@
       format = DSPF_ARGB;
       break;
     default:
-      g_message ("unimplemented %s for depth %d", G_GNUC_FUNCTION, depth);
+      g_message ("unimplemented %s for depth %d", G_STRLOC, depth);
       return NULL;
     }
 

Modified: branches/gtk-2-12/gdk/directfb/gdkinput-directfb.c
==============================================================================
--- branches/gtk-2-12/gdk/directfb/gdkinput-directfb.c	(original)
+++ branches/gtk-2-12/gdk/directfb/gdkinput-directfb.c	Fri Feb  1 10:34:47 2008
@@ -228,7 +228,7 @@
 gdk_device_set_mode (GdkDevice    *device,
                      GdkInputMode  mode)
 {
-  g_message ("unimplemented %s", G_GNUC_FUNCTION);
+  g_message ("unimplemented %s", G_STRLOC);
 
   return FALSE;
 }
@@ -303,7 +303,7 @@
                                 gint              mask,
                                 GdkExtensionMode  mode)
 {
-  g_message ("unimplemented %s", G_GNUC_FUNCTION);
+  g_message ("unimplemented %s", G_STRLOC);
 }
 
 GList *

Modified: branches/gtk-2-12/gdk/directfb/gdkpixmap-directfb.c
==============================================================================
--- branches/gtk-2-12/gdk/directfb/gdkpixmap-directfb.c	(original)
+++ branches/gtk-2-12/gdk/directfb/gdkpixmap-directfb.c	Fri Feb  1 10:34:47 2008
@@ -172,7 +172,7 @@
           format = DSPF_RGB32;
           break;
         default:
-          g_message ("unimplemented %s for depth %d", G_GNUC_FUNCTION, depth);
+          g_message ("unimplemented %s for depth %d", G_STRLOC, depth);
           return NULL;
         }
     }

Modified: branches/gtk-2-12/gdk/directfb/gdkwindow-directfb.c
==============================================================================
--- branches/gtk-2-12/gdk/directfb/gdkwindow-directfb.c	(original)
+++ branches/gtk-2-12/gdk/directfb/gdkwindow-directfb.c	Fri Feb  1 10:34:47 2008
@@ -2411,7 +2411,7 @@
     return;
 
   /* N/A */
-  g_message("unimplemented %s", G_GNUC_FUNCTION);
+  g_message("unimplemented %s", G_STRLOC);
 }
 
 void
@@ -2444,7 +2444,7 @@
     return FALSE;
 
   /* N/A */
-  g_message("unimplemented %s", G_GNUC_FUNCTION);
+  g_message("unimplemented %s", G_STRLOC);
 
   return FALSE;
 }
@@ -2462,7 +2462,7 @@
   if (GDK_WINDOW_DESTROYED (window))
     return;
 
-  g_message("unimplemented %s", G_GNUC_FUNCTION);
+  g_message("unimplemented %s", G_STRLOC);
 }
 
 void
@@ -2477,7 +2477,7 @@
   if (GDK_WINDOW_DESTROYED (window))
     return;
 
-  g_message("unimplemented %s", G_GNUC_FUNCTION);
+  g_message("unimplemented %s", G_STRLOC);
 }
 
 /**