gimp r26392 - branches/gimp-2-4/app/widgets

[neo svn gnome org]

Author: neo
Date: Tue Aug  5 17:34:03 2008
New Revision: 26392
URL: http://svn.gnome.org/viewvc/gimp?rev=26392&view=rev

Log:
Merged from trunk:

2008-08-05  Sven Neumann  <sven gimp org>

        * app/gui/gimpdbusservice.[ch]: changed refcounting and fixed a
        bug that I had introduced with the latest changes.



Modified:
   branches/gimp-2-4/app/widgets/gimpdbusservice.c
   branches/gimp-2-4/app/widgets/gimpdbusservice.h

Modified: branches/gimp-2-4/app/widgets/gimpdbusservice.c
==============================================================================
--- branches/gimp-2-4/app/widgets/gimpdbusservice.c	(original)
+++ branches/gimp-2-4/app/widgets/gimpdbusservice.c	Tue Aug  5 17:34:03 2008
@@ -2,7 +2,7 @@
  * Copyright (C) 1995 Spencer Kimball and Peter Mattis
  *
  * GimpDBusService
- * Copyright (C) 2007 Sven Neumann <sven gimp org>
+ * Copyright (C) 2007, 2008 Sven Neumann <sven gimp org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,7 +38,6 @@
 
 typedef struct
 {
-  Gimp     *gimp;
   gchar    *uri;
   gboolean  as_new;
 } OpenData;
@@ -194,7 +193,6 @@
 {
   OpenData *data = g_slice_new (OpenData);
 
-  data->gimp   = g_object_ref (service->gimp);
   data->uri    = g_strdup (uri);
   data->as_new = as_new;
 
@@ -204,25 +202,26 @@
 static void
 gimp_dbus_service_open_data_free (OpenData *data)
 {
-  g_object_unref (data->gimp);
   g_free (data->uri);
-
   g_slice_free (OpenData, data);
 }
 
 static gboolean
-gimp_dbus_service_open_idle (GQueue *queue)
+gimp_dbus_service_open_idle (GimpDBusService *service)
 {
-  OpenData *data = g_queue_pop_tail (queue);
+  OpenData *data = g_queue_pop_tail (service->queue);
 
   if (data)
     {
-      file_open_from_command_line (data->gimp, data->uri, data->as_new);
+      file_open_from_command_line (service->gimp, data->uri, data->as_new);
+
       gimp_dbus_service_open_data_free (data);
 
       return TRUE;
     }
 
+  service->source = NULL;
+
   return FALSE;
 }
 
@@ -239,8 +238,8 @@
       service->source = g_idle_source_new ();
 
       g_source_set_callback (service->source,
-                             (GSourceFunc) gimp_dbus_service_open_idle,
-                             service->queue, NULL);
+                             (GSourceFunc) gimp_dbus_service_open_idle, service,
+                             NULL);
       g_source_attach (service->source, NULL);
       g_source_unref (service->source);
     }

Modified: branches/gimp-2-4/app/widgets/gimpdbusservice.h
==============================================================================
--- branches/gimp-2-4/app/widgets/gimpdbusservice.h	(original)
+++ branches/gimp-2-4/app/widgets/gimpdbusservice.h	Tue Aug  5 17:34:03 2008
@@ -2,7 +2,7 @@
  * Copyright (C) 1995 Spencer Kimball and Peter Mattis
  *
  * GimpDBusService
- * Copyright (C) 2007 Sven Neumann <sven gimp org>
+ * Copyright (C) 2007, 2008 Sven Neumann <sven gimp org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by