[gtk+/gtk-3-8] Bug 667759 - gtkdnd-quartz.c is missing annotations for introspection



commit 948767960f8f6d4430d255447ebaf19432819201
Author: John Ralls <jralls ceridwen us>
Date:   Fri May 3 10:31:47 2013 -0700

    Bug 667759 - gtkdnd-quartz.c is missing annotations for introspection
    
    Work around this by introspecting gtkclipboard.c and gtkdnd.c instead
    of the quartz alternatives.
    
    Note that this is temporary: The implementation of GdkSelection
    will make the quartz alternatives unnecessary. See bug 571582.

 gtk/Makefile.am |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 90487fb..7b106a4 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1265,13 +1265,24 @@ LDADDS =                                                                \
        $(GTK_DEP_LIBS)
 
 if HAVE_INTROSPECTION
+# The Quartz clipboard and dnd files aren't annotated for
+# introspection. Rather than copy the annotations over from the
+# regular files, exclude the quartz ones:
 introspection_files = \
     $(filter-out %private.h gtktextdisplay.h gtktextlayout.h, $(gtkinclude_HEADERS) 
$(deprecatedinclude_HEADERS)) \
-    $(gtk_base_c_sources) \
+    $(filter-out  gtkclipboard-quartz.c gtkdnd-quartz.c, \
+    $(gtk_base_c_sources)) \
     gtkprintoperation-unix.c \
     gtktypebuiltins.h \
     gtktypebuiltins.c
 
+# And include the regular ones:
+if USE_QUARTZ
+introspection_files += \
+    gtkclipboard.c \
+    gtkdnd.c
+endif
+
 if USE_X11
 introspection_files += \
     gtksocket.c \


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