[glib] Move a confusing comment to the right place
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Move a confusing comment to the right place
- Date: Sat, 23 Oct 2010 10:16:09 +0000 (UTC)
commit 7c735b05f7a00c728e23a366128ffb56fee58b4e
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Oct 23 12:01:51 2010 +0200
Move a confusing comment to the right place
gio/gapplication.c | 6 ------
gio/gapplicationimpl-dbus.c | 3 +++
2 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/gio/gapplication.c b/gio/gapplication.c
index 6522aaa..f79302f 100644
--- a/gio/gapplication.c
+++ b/gio/gapplication.c
@@ -884,12 +884,6 @@ g_application_register (GApplication *application,
if (!application->priv->is_registered)
{
gboolean is_remote;
- gboolean try;
-
- /* don't try to be the primary instance if
- * G_APPLICATION_IS_LAUNCHER was specified.
- */
- try = !(application->priv->flags & G_APPLICATION_IS_LAUNCHER);
application->priv->impl =
g_application_impl_register (application, application->priv->id,
diff --git a/gio/gapplicationimpl-dbus.c b/gio/gapplicationimpl-dbus.c
index e41f01e..893c96b 100644
--- a/gio/gapplicationimpl-dbus.c
+++ b/gio/gapplicationimpl-dbus.c
@@ -271,6 +271,9 @@ g_application_impl_register (GApplication *application,
impl->object_path = application_path_from_appid (appid);
+ /* don't try to be the primary instance if
+ * G_APPLICATION_IS_LAUNCHER was specified.
+ */
if (flags & G_APPLICATION_IS_LAUNCHER)
{
impl->object_id = 0;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]