Merge lp:~teemperor/pantheon-greeter/fix-1014974 into lp:~elementary-pantheon/pantheon-greeter/trunk

[Raphael Isemann]

Fix should be obvious.

[Tom Beckmann (tombeckmann)]

One thing that should be corrected when merging, add a space after the function call, but.get_active () instead of but.get_active(). Alternatively you could use the property, but.active

review: Approve

[lp:~teemperor/pantheon-greeter/fix-1014974]

143. By Raphael Isemann on 2013-02-10

changed get_active() to property

=== modified file 'src/LoginBox.vala'
--- src/LoginBox.vala	2013-01-05 00:23:48 +0000
+++ src/LoginBox.vala	2013-02-10 11:14:20 +0000
@@ -163,7 +163,8 @@
             but.active = LightDM.get_sessions ().nth_data (0).key == current_session;
 
             but.toggled.connect (() => {
-                current_session = LightDM.get_sessions ().nth_data (0).key;
+                if (but.active)
+                    current_session = LightDM.get_sessions ().nth_data (0).key;
             });
 
             for (var i = 1;i < LightDM.get_sessions ().length (); i++) {
@@ -171,7 +172,10 @@
                 box.pack_start (rad, false);
                 rad.active = LightDM.get_sessions ().nth_data (i).key == current_session;
                 var identifier = LightDM.get_sessions ().nth_data (i).key;
-                rad.toggled.connect ( () => { current_session = identifier; });
+                rad.toggled.connect ( () => { 
+                    if (rad.active)
+                        current_session = identifier; 
+                });
             }
 
             this.get_stage ().add_child (pop);