Unity Greeter

Merge lp:~aacid/unity-greeter/revert_bad_dead_code_removal into lp:unity-greeter

  1. revert_bad_dead_code_removal
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Merged at revision: 543
Proposed branch: lp:~aacid/unity-greeter/revert_bad_dead_code_removal
Merge into: lp:unity-greeter
Diff against target: 29 lines (+8/-0)
1 file modified
src/remote-login-service.vala (+8/-0)
To merge this branch: bzr merge lp:~aacid/unity-greeter/revert_bad_dead_code_removal
Reviewer Review Type Date Requested Status
Unity Greeter Development Team Pending
Review via email: mp+121568@code.launchpad.net

Commit message

Revert "remove dead code" by Robert

This is needed to match dbus API of the methods

Otherwise you get

[+18.36s] CRITICAL: g_variant_get_variant: assertion `g_variant_is_of_type (value, G_VARIANT_TYPE_VARIANT)' failed
[+18.36s] CRITICAL: g_variant_iter_loop: assertion `g_variant_is_of_type (GVSI(iter)->value, G_VARIANT_TYPE_ARRAY)' failed
[+18.36s] CRITICAL: g_variant_get_variant: assertion `g_variant_is_of_type (value, G_VARIANT_TYPE_VARIANT)' failed
[+18.36s] CRITICAL: g_variant_iter_loop: assertion `g_variant_is_of_type (GVSI(iter)->value, G_VARIANT_TYPE_ARRAY)' failed
[+18.36s] CRITICAL: g_variant_get_variant: assertion `g_variant_is_of_type (value, G_VARIANT_TYPE_VARIANT)' failed
[+18.36s] CRITICAL: g_variant_iter_loop: assertion `g_variant_is_of_type (GVSI(iter)->value, G_VARIANT_TYPE_ARRAY)' failed

Description of the change

Revert "remove dead code" by Robert

This is needed to match dbus API of the methods

Otherwise you get

[+18.36s] CRITICAL: g_variant_get_variant: assertion `g_variant_is_of_type (value, G_VARIANT_TYPE_VARIANT)' failed
[+18.36s] CRITICAL: g_variant_iter_loop: assertion `g_variant_is_of_type (GVSI(iter)->value, G_VARIANT_TYPE_ARRAY)' failed
[+18.36s] CRITICAL: g_variant_get_variant: assertion `g_variant_is_of_type (value, G_VARIANT_TYPE_VARIANT)' failed
[+18.36s] CRITICAL: g_variant_iter_loop: assertion `g_variant_is_of_type (GVSI(iter)->value, G_VARIANT_TYPE_ARRAY)' failed
[+18.36s] CRITICAL: g_variant_get_variant: assertion `g_variant_is_of_type (value, G_VARIANT_TYPE_VARIANT)' failed
[+18.36s] CRITICAL: g_variant_iter_loop: assertion `g_variant_is_of_type (GVSI(iter)->value, G_VARIANT_TYPE_ARRAY)' failed

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/remote-login-service.vala'
2--- src/remote-login-service.vala 2012-08-27 22:32:05 +0000
3+++ src/remote-login-service.vala 2012-08-28 09:13:32 +0000
4@@ -19,10 +19,17 @@
5 struct RemoteServerField
6 {
7 public string type;
8+ public bool required;
9 public Variant default_value;
10 public HashTable<string, Variant> properties;
11 }
12
13+struct RemoteServerApplication
14+{
15+ public string application_id;
16+ public int pin_position;
17+}
18+
19 struct RemoteServer
20 {
21 public string type;
22@@ -30,6 +37,7 @@
23 public string url;
24 public bool last_used_server;
25 public RemoteServerField[] fields;
26+ public RemoteServerApplication[] applications;
27 }
28
29 [DBus (name = "com.canonical.RemoteLogin")]

Subscribers

People subscribed via source and target branches