dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor cleanups. 

2008-08-06  Sven Neumann  <sven@gimp.org>

	* app/gui/gimpdbusservice.c: minor cleanups.


svn path=/trunk/; revision=26398
This commit is contained in:
Sven Neumann 2008-08-06 08:15:36 +00:00 committed by Sven Neumann
parent 115598c276
commit 597dc249cf
2 changed files with 72 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2008-08-06 Sven Neumann <sven@gimp.org>
* app/gui/gimpdbusservice.c: minor cleanups.
2008-08-05 Martin Nordholts <martinn@svn.gnome.org> 2008-08-05 Martin Nordholts <martinn@svn.gnome.org>
* app/display/gimpdisplayshell-scale.c (gimp_display_shell_scale): * app/display/gimpdisplayshell-scale.c (gimp_display_shell_scale):

129
app/gui/gimpdbusservice.c
View File

@ -46,19 +46,21 @@ typedef struct
} OpenData; } OpenData;
static void gimp_dbus_service_class_init (GimpDBusServiceClass *klass); static void gimp_dbus_service_class_init (GimpDBusServiceClass *klass);
static void gimp_dbus_service_init (GimpDBusService *service);
static void gimp_dbus_service_dispose (GObject *object);
static void gimp_dbus_service_finalize (GObject *object);
static void gimp_dbus_service_queue_open (GimpDBusService *service, static void gimp_dbus_service_init (GimpDBusService *service);
const gchar *uri, static void gimp_dbus_service_dispose (GObject *object);
gboolean as_new); static void gimp_dbus_service_finalize (GObject *object);
static OpenData * gimp_dbus_service_open_data_new (GimpDBusService *service, static gboolean gimp_dbus_service_queue_open (GimpDBusService *service,
const gchar *uri, const gchar *uri,
gboolean as_new); gboolean as_new);
static void gimp_dbus_service_open_data_free (OpenData *data);
static gboolean gimp_dbus_service_open_idle (GimpDBusService *service);
static OpenData * gimp_dbus_service_open_data_new (GimpDBusService *service,
const gchar *uri,
gboolean as_new);
static void gimp_dbus_service_open_data_free (OpenData *data);
G_DEFINE_TYPE (GimpDBusService, gimp_dbus_service, G_TYPE_OBJECT) G_DEFINE_TYPE (GimpDBusService, gimp_dbus_service, G_TYPE_OBJECT)
@ -141,12 +143,7 @@ gimp_dbus_service_open (GimpDBusService *service,
g_return_val_if_fail (uri != NULL, FALSE); g_return_val_if_fail (uri != NULL, FALSE);
g_return_val_if_fail (success != NULL, FALSE); g_return_val_if_fail (success != NULL, FALSE);
gimp_dbus_service_queue_open (service, uri, FALSE); *success = gimp_dbus_service_queue_open (service, uri, FALSE);
/* The call always succeeds as it is handled in one way or another.
* Even presenting an error message is considered success ;-)
*/
*success = TRUE;
return TRUE; return TRUE;
} }
@ -161,12 +158,7 @@ gimp_dbus_service_open_as_new (GimpDBusService *service,
g_return_val_if_fail (uri != NULL, FALSE); g_return_val_if_fail (uri != NULL, FALSE);
g_return_val_if_fail (success != NULL, FALSE); g_return_val_if_fail (success != NULL, FALSE);
gimp_dbus_service_queue_open (service, uri, TRUE); *success = gimp_dbus_service_queue_open (service, uri, TRUE);
/* The call always succeeds as it is handled in one way or another.
* Even presenting an error message is considered success ;-)
*/
*success = TRUE;
return TRUE; return TRUE;
} }
@ -186,6 +178,59 @@ gimp_dbus_service_activate (GimpDBusService *service,
return TRUE; return TRUE;
} }
/*
* Adds a request to open a file to the end of the queue and
* starts an idle source if it is not already running.
*/
static gboolean
gimp_dbus_service_queue_open (GimpDBusService *service,
const gchar *uri,
gboolean as_new)
{
g_queue_push_tail (service->queue,
gimp_dbus_service_open_data_new (service, uri, as_new));
if (! service->source)
{
service->source = g_idle_source_new ();
g_source_set_callback (service->source,
(GSourceFunc) gimp_dbus_service_open_idle, service,
NULL);
g_source_attach (service->source, NULL);
g_source_unref (service->source);
}
/* The call always succeeds as it is handled in one way or another.
* Even presenting an error message is considered success ;-)
*/
return TRUE;
}
/*
* Idle callback that removes the first request from the queue and
* handles it. If there are no more requests, the idle source is
* removed.
*/
static gboolean
gimp_dbus_service_open_idle (GimpDBusService *service)
{
OpenData *data = g_queue_pop_tail (service->queue);
if (data)
{
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;
}
static OpenData * static OpenData *
gimp_dbus_service_open_data_new (GimpDBusService *service, gimp_dbus_service_open_data_new (GimpDBusService *service,
const gchar *uri, const gchar *uri,
@ -206,43 +251,5 @@ gimp_dbus_service_open_data_free (OpenData *data)
g_slice_free (OpenData, data); g_slice_free (OpenData, data);
} }
static gboolean
gimp_dbus_service_open_idle (GimpDBusService *service)
{
OpenData *data = g_queue_pop_tail (service->queue);
if (data)
{
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;
}
static void
gimp_dbus_service_queue_open (GimpDBusService *service,
const gchar *uri,
gboolean as_new)
{
g_queue_push_tail (service->queue,
gimp_dbus_service_open_data_new (service, uri, as_new));
if (! service->source)
{
service->source = g_idle_source_new ();
g_source_set_callback (service->source,
(GSourceFunc) gimp_dbus_service_open_idle, service,
NULL);
g_source_attach (service->source, NULL);
g_source_unref (service->source);
}
}
#endif /* HAVE_DBUS_GLIB */ #endif /* HAVE_DBUS_GLIB */