[gimp] app: port GimpAppleEventHandler to GFile too, it made opening files crash
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: port GimpAppleEventHandler to GFile too, it made opening files crash
- Date: Wed, 30 Jul 2014 19:35:19 +0000 (UTC)
commit ebdb803c33d3f8e4764225567c61a332b406b20a
Author: Michael Natterer <mitch gimp org>
Date: Wed Jul 30 21:34:27 2014 +0200
app: port GimpAppleEventHandler to GFile too, it made opening files crash
app/gui/gui-unique.c | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
---
diff --git a/app/gui/gui-unique.c b/app/gui/gui-unique.c
index 3cf65b0..7eb9517 100644
--- a/app/gui/gui-unique.c
+++ b/app/gui/gui-unique.c
@@ -260,18 +260,13 @@ gui_unique_quartz_nsopen_file_callback (GtkosxApplication *osx_app,
gchar *path,
gpointer user_data)
{
- GFile *file;
GSource *source;
GClosure *closure;
- file = g_file_new_for_path (path);
-
closure = g_cclosure_new (G_CALLBACK (gui_unique_quartz_idle_open),
- g_object_ref (file),
+ g_file_new_for_path (path),
(GClosureNotify) g_object_unref);
- g_object_unref (file);
-
g_object_watch_closure (G_OBJECT (unique_gimp), closure);
source = g_idle_source_new ();
@@ -288,8 +283,6 @@ gui_unique_quartz_nsopen_file_callback (GtkosxApplication *osx_app,
- (void) handleEvent: (NSAppleEventDescriptor *) inEvent
andReplyWith: (NSAppleEventDescriptor *) replyEvent
{
- const gchar *path;
- NSURL *url;
NSAutoreleasePool *urlpool;
NSInteger count;
NSInteger i;
@@ -300,17 +293,17 @@ gui_unique_quartz_nsopen_file_callback (GtkosxApplication *osx_app,
for (i = 1; i <= count; i++)
{
- gchar *callback_path;
- GSource *source;
- GClosure *closure;
+ NSURL *url;
+ const gchar *path;
+ GSource *source;
+ GClosure *closure;
url = [NSURL URLWithString: [[inEvent descriptorAtIndex: i] stringValue]];
path = [[url path] UTF8String];
- callback_path = g_strdup (path);
closure = g_cclosure_new (G_CALLBACK (gui_unique_quartz_idle_open),
- (gpointer) callback_path,
- (GClosureNotify) g_free);
+ g_file_new_for_path (path),
+ (GClosureNotify) g_object_unref);
g_object_watch_closure (G_OBJECT (unique_gimp), closure);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]