gtk+ r20449 - in trunk: . gdk gdk/x11 gtk

[mitch svn gnome org]

Author: mitch
Date: Wed Jun 18 09:39:24 2008
New Revision: 20449
URL: http://svn.gnome.org/viewvc/gtk+?rev=20449&view=rev

Log:
2008-06-18  Michael Natterer  <mitch imendio com>

	* gdk/gdk.h: deprecate GdkDestroyNotify.

	* gdk/gdkevents.c
	* gdk/gdktypes.h
	* gdk/x11/gdkevents-x11.c
	* gtk/gtkmain.c: s/GdkDestroyNotify/GDestroyNotify/g.



Modified:
   trunk/ChangeLog
   trunk/gdk/gdk.h
   trunk/gdk/gdkevents.c
   trunk/gdk/gdktypes.h
   trunk/gdk/x11/gdkevents-x11.c
   trunk/gtk/gtkmain.c

Modified: trunk/gdk/gdk.h
==============================================================================
--- trunk/gdk/gdk.h	(original)
+++ trunk/gdk/gdk.h	Wed Jun 18 09:39:24 2008
@@ -102,7 +102,7 @@
 			   GdkInputCondition condition,
 			   GdkInputFunction  function,
 			   gpointer	     data,
-			   GdkDestroyNotify  destroy);
+			   GDestroyNotify    destroy);
 #endif /* !GDK_DISABLE_DEPRECATED || GTK_COMPILATION */
 #ifndef GDK_DISABLE_DEPRECATED
 gint gdk_input_add	  (gint		     source,

Modified: trunk/gdk/gdkevents.c
==============================================================================
--- trunk/gdk/gdkevents.c	(original)
+++ trunk/gdk/gdkevents.c	Wed Jun 18 09:39:24 2008
@@ -37,7 +37,7 @@
 {
   GdkInputFunction function;
   GdkInputCondition condition;
-  GdkDestroyNotify notify;
+  GDestroyNotify notify;
   gpointer data;
 };
 
@@ -1020,7 +1020,7 @@
 		    GdkInputCondition condition,
 		    GdkInputFunction  function,
 		    gpointer	      data,
-		    GdkDestroyNotify  destroy)
+		    GDestroyNotify    destroy)
 {
   guint result;
   GdkIOClosure *closure = g_new (GdkIOClosure, 1);

Modified: trunk/gdk/gdktypes.h
==============================================================================
--- trunk/gdk/gdktypes.h	(original)
+++ trunk/gdk/gdktypes.h	Wed Jun 18 09:39:24 2008
@@ -179,8 +179,12 @@
 				  gint		    source,
 				  GdkInputCondition condition);
 
+#ifndef GDK_DISABLE_DEPRECATED
+
 typedef void (*GdkDestroyNotify) (gpointer data);
 
+#endif /* GDK_DISABLE_DEPRECATED */
+
 struct _GdkPoint
 {
   gint x;

Modified: trunk/gdk/x11/gdkevents-x11.c
==============================================================================
--- trunk/gdk/x11/gdkevents-x11.c	(original)
+++ trunk/gdk/x11/gdkevents-x11.c	Wed Jun 18 09:39:24 2008
@@ -72,7 +72,7 @@
 {
   GdkInputFunction function;
   GdkInputCondition condition;
-  GdkDestroyNotify notify;
+  GDestroyNotify notify;
   gpointer data;
 };
 

Modified: trunk/gtk/gtkmain.c
==============================================================================
--- trunk/gtk/gtkmain.c	(original)
+++ trunk/gtk/gtkmain.c	Wed Jun 18 09:39:24 2008
@@ -2093,7 +2093,7 @@
 				 condition,
 				 (GdkInputFunction) gtk_invoke_input,
 				 closure,
-				 (GdkDestroyNotify) gtk_destroy_closure);
+				 (GDestroyNotify) gtk_destroy_closure);
     }
   else
     return gdk_input_add_full (source, condition, function, data, destroy);