Unity

Merge lp:~kamstrup/unity/activation-return-respect into lp:unity

  1. activation-return-respect
  2. Merge into trunk
Proposed by Mikkel Kamstrup Erlandsen
Status: Merged
Merged at revision: 1089
Proposed branch: lp:~kamstrup/unity/activation-return-respect
Merge into: lp:unity
Diff against target: 22 lines (+3/-2)
1 file modified
src/PlaceRemote.cpp (+3/-2)
To merge this branch: bzr merge lp:~kamstrup/unity/activation-return-respect
Reviewer Review Type Date Requested Status
Neil J. Patel (community) Approve
Review via email: mp+56938@code.launchpad.net

Description of the change

Fix a small glitch that made Unity not respect the return value from Activation requests on place daemons

To post a comment you must log in.
Revision history for this message
Neil J. Patel (njpatel) wrote :

looks sexy

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/PlaceRemote.cpp'
2--- src/PlaceRemote.cpp 2011-04-06 21:47:09 +0000
3+++ src/PlaceRemote.cpp 2011-04-08 13:48:18 +0000
4@@ -536,7 +536,7 @@
5 {
6 GVariant *args;
7 GError *error = NULL;
8- guint ret = 0;
9+ guint32 ret;
10
11 args = g_dbus_proxy_call_finish ((GDBusProxy *)source, result, &error);
12 if (error)
13@@ -546,7 +546,8 @@
14 g_error_free (error);
15 return;
16 }
17-
18+
19+ g_variant_get (args, "(u)", &ret);
20 self->result_activated.emit (self->_active_uri.c_str (), (ActivationResult)ret);
21
22 g_variant_unref (args);