[glib/wip/gapplication] [GApplication] A few fixes for the "unix" backend
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/gapplication] [GApplication] A few fixes for the "unix" backend
- Date: Wed, 19 May 2010 02:08:06 +0000 (UTC)
commit 47f3a2b5178695056802c34d91b9fdd1bffd92c7
Author: Colin Walters <walters verbum org>
Date: Tue May 18 22:07:42 2010 -0400
[GApplication] A few fixes for the "unix" backend
gio/gunixapplication.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/gio/gunixapplication.c b/gio/gunixapplication.c
index f4f8b63..939def5 100644
--- a/gio/gunixapplication.c
+++ b/gio/gunixapplication.c
@@ -94,7 +94,7 @@ application_dbus_method_call (GDBusConnection *connection,
return;
}
- g_signal_emit (app, application_signals[ACTION], g_quark_from_string (action_name), (guint)timestamp);
+ g_signal_emit (app, application_signals[ACTION], g_quark_from_string (action_name), action_name, (guint)timestamp);
g_dbus_method_invocation_return_value (invocation, NULL);
}
@@ -270,10 +270,10 @@ _g_application_platform_acquire_single_instance (const char *appid,
0, -1, NULL,
error);
if (request_result == NULL)
- goto out;
+ return FALSE;
if (strcmp (g_variant_get_type_string (request_result), "(u)") != 0)
- goto out;
+ return FALSE;
g_variant_get (request_result, "(u)", &request_status);
if (request_status == 1 || request_status == 4)
{
@@ -287,9 +287,7 @@ _g_application_platform_acquire_single_instance (const char *appid,
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "%s", errmsg);
g_free (errmsg);
}
-out:
- g_object_unref (connection);
-
+
return ret;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]