Support old-style message contexts, too.

[~andy/gtk] / gtk / gtkclipboard-quartz.c

diff --git a/gtk/gtkclipboard-quartz.c b/gtk/gtkclipboard-quartz.c
index 9a79c259471c693fabbb7a8ddd95b2c7855bb63f..e86feeffa122cfed37b58e5e92fc292adac3d89c 100644 (file)
--- a/gtk/gtkclipboard-quartz.c
+++ b/gtk/gtkclipboard-quartz.c
@@ -30,10 +30,9 @@
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 #include "gtktextbuffer.h"
-
 #include "gtkquartz.h"
+#include "gtkalias.h"
 
 enum {
   OWNER_CHANGE,
@@ -106,8 +105,6 @@ struct _GtkClipboardClass
   _gtk_quartz_set_selection_data_for_pasteboard (clipboard->pasteboard, &selection_data);
 
   g_free (selection_data.data);
-
-  NSLog(@"Provide data for %@", type);
 }
 
 - (void)pasteboardChangedOwner:(NSPasteboard *)sender
@@ -155,7 +152,7 @@ gtk_clipboard_get_type (void)
   
   if (!clipboard_type)
     {
-      static const GTypeInfo clipboard_info =
+      const GTypeInfo clipboard_info =
       {
        sizeof (GtkClipboardClass),
        NULL,           /* base_init */
@@ -373,8 +370,12 @@ gtk_clipboard_set_contents (GtkClipboard         *clipboard,
 {
   GtkClipboardOwner *owner;
   NSArray *types;
+  NSAutoreleasePool *pool;
+
+  pool = [[NSAutoreleasePool alloc] init];
 
   owner = [[GtkClipboardOwner alloc] initWithClipboard:clipboard];
+
   types = _gtk_quartz_target_entries_to_pasteboard_types (targets, n_targets);
 
   clipboard->user_data = user_data;
@@ -386,6 +387,8 @@ gtk_clipboard_set_contents (GtkClipboard         *clipboard,
 
   [clipboard->pasteboard declareTypes:types owner:owner];
 
+  [pool release];
+
   return true;
 }
 
@@ -722,6 +725,17 @@ gtk_clipboard_request_rich_text (GtkClipboard                    *clipboard,
   /* FIXME: Implement */
 }
 
+
+guint8 *
+gtk_clipboard_wait_for_rich_text (GtkClipboard  *clipboard,
+                                  GtkTextBuffer *buffer,
+                                  GdkAtom       *format,
+                                  gsize         *length)
+{
+  /* FIXME: Implement */
+  return NULL;
+}
+
 /**
  * gtk_clipboard_request_image:
  * @clipboard: a #GtkClipboard