[gtk+/gtk-2.90] Remove deprecated code from GdkDnd



commit 2a15a4ce9e0ccce208edfd77e014d93a302fb86d
Author: Javier Jardón <javierjc1982 gmail com>
Date:   Fri Oct 9 17:27:03 2009 +0200

    Remove deprecated code from GdkDnd

 docs/dnd_internals.txt              |    2 --
 docs/reference/gdk/gdk-sections.txt |    2 --
 docs/reference/gdk/tmpl/dnd.sgml    |   14 --------------
 gdk/directfb/gdkdnd-directfb.c      |   16 ++--------------
 gdk/gdk.symbols                     |    4 ----
 gdk/gdkdnd.h                        |    5 -----
 gdk/quartz/gdkdnd-quartz.c          |   12 ------------
 gdk/win32/gdkdnd-win32.c            |   16 ----------------
 gdk/x11/gdkdnd-x11.c                |   28 ----------------------------
 9 files changed, 2 insertions(+), 97 deletions(-)
---
diff --git a/docs/dnd_internals.txt b/docs/dnd_internals.txt
index 62312ef..fc5afce 100644
--- a/docs/dnd_internals.txt
+++ b/docs/dnd_internals.txt
@@ -62,8 +62,6 @@ used by anything other than the DND code in GTK+.
 /* Drag and Drop */
 
 GdkDragContext * gdk_drag_context_new        (void);
-void             gdk_drag_context_ref        (GdkDragContext *context);
-void             gdk_drag_context_unref      (GdkDragContext *context);
 
 These create and refcount GdkDragContexts in a
 straightforward manner.
diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt
index 0b565b4..9714b3d 100644
--- a/docs/reference/gdk/gdk-sections.txt
+++ b/docs/reference/gdk/gdk-sections.txt
@@ -1221,14 +1221,12 @@ gdk_drag_context_new
 gdk_drag_drop
 gdk_drag_find_window
 gdk_drag_find_window_for_screen
-gdk_drag_context_ref
 gdk_drag_begin
 gdk_drag_motion
 gdk_drop_finish
 gdk_drag_get_protocol
 gdk_drag_get_protocol_for_display
 GdkDragProtocol
-gdk_drag_context_unref
 GdkDragContext
 GdkDragAction
 gdk_drag_status
diff --git a/docs/reference/gdk/tmpl/dnd.sgml b/docs/reference/gdk/tmpl/dnd.sgml
index b3c360d..3d1b521 100644
--- a/docs/reference/gdk/tmpl/dnd.sgml
+++ b/docs/reference/gdk/tmpl/dnd.sgml
@@ -91,13 +91,6 @@ the GTK+ documentation for more information.
 @protocol: 
 
 
-<!-- ##### FUNCTION gdk_drag_context_ref ##### -->
-<para>
-</para>
-
- context: 
-
-
 <!-- ##### FUNCTION gdk_drag_begin ##### -->
 <para>
 </para>
@@ -166,13 +159,6 @@ which DND is done.
 @GDK_DRAG_PROTO_OLE2: The complex OLE2 DND protocol (not implemented).
 @GDK_DRAG_PROTO_LOCAL: Intra-application DND.
 
-<!-- ##### FUNCTION gdk_drag_context_unref ##### -->
-<para>
-</para>
-
- context: 
-
-
 <!-- ##### STRUCT GdkDragContext ##### -->
 <para>
 A <structname>GdkDragContext</structname> holds information about a 
diff --git a/gdk/directfb/gdkdnd-directfb.c b/gdk/directfb/gdkdnd-directfb.c
index 2691279..c72b5c6 100644
--- a/gdk/directfb/gdkdnd-directfb.c
+++ b/gdk/directfb/gdkdnd-directfb.c
@@ -150,18 +150,6 @@ gdk_drag_context_new (void)
   return (GdkDragContext *) g_object_new (gdk_drag_context_get_type (), NULL);
 }
 
-void
-gdk_drag_context_ref (GdkDragContext *context)
-{
-  g_object_ref (context);
-}
-
-void
-gdk_drag_context_unref (GdkDragContext *context)
-{
-  g_object_unref (context);
-}
-
 static GdkDragContext *
 gdk_drag_context_find (gboolean     is_source,
 		       GdkWindow   *source,
@@ -235,7 +223,7 @@ local_send_enter (GdkDragContext *context,
 
   if (current_dest_drag != NULL)
     {
-      gdk_drag_context_unref (current_dest_drag);
+      g_object_unref (current_dest_drag);
       current_dest_drag = NULL;
     }
 
@@ -627,7 +615,7 @@ gdk_drop_finish (GdkDragContext   *context,
 				       context->dest_window);
   if (src_context)
     {
-      gdk_drag_context_ref (src_context);
+      g_object_ref (src_context);
 
       event.dnd.type       = GDK_DROP_FINISHED;
       event.dnd.window     = src_context->source_window;
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index f9e7798..3b1fe7b 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -511,10 +511,6 @@ gdk_drag_abort
 gdk_drag_begin
 gdk_drag_context_get_type G_GNUC_CONST
 gdk_drag_context_new
-#ifndef GDK_DISABLE_DEPRECATED
-gdk_drag_context_ref
-gdk_drag_context_unref
-#endif
 gdk_drag_drop
 gdk_drag_drop_succeeded
 gdk_drag_find_window_for_screen
diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h
index b9f8335..beada1d 100644
--- a/gdk/gdkdnd.h
+++ b/gdk/gdkdnd.h
@@ -107,11 +107,6 @@ struct _GdkDragContextClass {
 GType            gdk_drag_context_get_type   (void) G_GNUC_CONST;
 GdkDragContext * gdk_drag_context_new        (void);
 
-#ifndef GDK_DISABLE_DEPRECATED
-void             gdk_drag_context_ref        (GdkDragContext *context);
-void             gdk_drag_context_unref      (GdkDragContext *context);
-#endif
-
 /* Destination side */
 
 void             gdk_drag_status        (GdkDragContext   *context,
diff --git a/gdk/quartz/gdkdnd-quartz.c b/gdk/quartz/gdkdnd-quartz.c
index 948b4dd..8bab2fc 100644
--- a/gdk/quartz/gdkdnd-quartz.c
+++ b/gdk/quartz/gdkdnd-quartz.c
@@ -87,18 +87,6 @@ gdk_drag_context_new (void)
   return (GdkDragContext *)g_object_new (gdk_drag_context_get_type (), NULL);
 }
 
-void            
-gdk_drag_context_ref (GdkDragContext *context)
-{
-  g_object_ref (context);
-}
-
-void            
-gdk_drag_context_unref (GdkDragContext *context)
-{
-  g_object_unref (context);
-}
-
 GdkDragContext *_gdk_quartz_drag_source_context = NULL;
 
 GdkDragContext *
diff --git a/gdk/win32/gdkdnd-win32.c b/gdk/win32/gdkdnd-win32.c
index 5b6e0f6..d690e8c 100644
--- a/gdk/win32/gdkdnd-win32.c
+++ b/gdk/win32/gdkdnd-win32.c
@@ -189,22 +189,6 @@ gdk_drag_context_new (void)
   return g_object_new (GDK_TYPE_DRAG_CONTEXT, NULL);
 }
 
-void
-gdk_drag_context_ref (GdkDragContext *context)
-{
-  g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-
-  g_object_ref (context);
-}
-
-void
-gdk_drag_context_unref (GdkDragContext *context)
-{
-  g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-
-  g_object_unref (context);
-}
-
 static GdkDragContext *
 gdk_drag_context_find (gboolean   is_source,
 		       GdkWindow *source,
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 118d793..8ffa542 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -213,34 +213,6 @@ gdk_drag_context_new (void)
   return g_object_new (GDK_TYPE_DRAG_CONTEXT, NULL);
 }
 
-/**
- * gdk_drag_context_ref:
- * @context: a #GdkDragContext.
- * 
- * Deprecated function; use g_object_ref() instead.
- **/
-void            
-gdk_drag_context_ref (GdkDragContext *context)
-{
-  g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-
-  g_object_ref (context);
-}
-
-/**
- * gdk_drag_context_unref:
- * @context: a #GdkDragContext.
- * 
- * Deprecated function; use g_object_unref() instead.
- **/
-void            
-gdk_drag_context_unref (GdkDragContext *context)
-{
-  g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-
-  g_object_unref (context);
-}
-
 static GdkDragContext *
 gdk_drag_context_find (GdkDisplay *display,
 		       gboolean    is_source,



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