diff options
author | Matthias Clasen <mclasen@redhat.com> | 2010-12-16 21:45:57 -0500 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2010-12-21 12:07:03 -0500 |
commit | 61104d58ea4fbc63ba273770a4e85152dc08addb (patch) | |
tree | 5b397acdd2faa2971908a9a139f891c870460d42 /gtk/gtkquartz.c | |
parent | 05497c799ad2da29001534b30d53e6d8eb48cbf4 (diff) | |
download | gtk+-61104d58ea4fbc63ba273770a4e85152dc08addb.tar.gz |
Avoid unnecessary use of gdk conversion routines
We can use use gtk_selection_data_get_uris, instead of
manually doing the conversion ourselves.
Diffstat (limited to 'gtk/gtkquartz.c')
-rw-r--r-- | gtk/gtkquartz.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/gtk/gtkquartz.c b/gtk/gtkquartz.c index e8945591a4..5b440e4b41 100644 --- a/gtk/gtkquartz.c +++ b/gtk/gtkquartz.c @@ -290,30 +290,17 @@ _gtk_quartz_set_selection_data_for_pasteboard (NSPasteboard *pasteboard, } else if ([type isEqualTo:NSURLPboardType]) { - gchar **list = NULL; - int count; + gchar **uris; - count = gdk_text_property_to_utf8_list_for_display (display, - gdk_atom_intern_static_string ("UTF8_STRING"), - format, - data, - length, - &list); - - if (count > 0) + uris = gtk_selection_data_get_uris (selection_data); + if (uris != NULL) { - gchar **result; NSURL *url; - result = g_uri_list_extract_uris (list[0]); - - url = [NSURL URLWithString:[NSString stringWithUTF8String:result[0]]]; + url = [NSURL URLWithString:[NSString stringWithUTF8String:uris[0]]]; [url writeToPasteboard:pasteboard]; - - g_strfreev (result); } - - g_strfreev (list); + g_strfreev (uris); } else [pasteboard setData:[NSData dataWithBytesNoCopy:(void *)data |