Merge lp:~mardy/account-plugins/fix-tool-identity into lp:account-plugins

[Alberto Mardegan]

account-console: don't fail on missing Identity

Also, don't let the program crash when no arguments are given, and remove
unnecessary debug output.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:79
http://s-jenkins:8080/job/account-plugins-ci/5/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=amd64/5/console
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=i386/5/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/account-plugins-ci/5//rebuild/?

review: Approve (continuous-integration)

[David King (amigadave)]

review: Approve

=== modified file 'tools/account-console'
--- tools/account-console	2012-08-29 07:54:32 +0000
+++ tools/account-console	2012-11-23 10:51:34 +0000
@@ -92,7 +92,7 @@
             value = GObject.Value()
             value.init(GObject.TYPE_UINT)
             signon_id = account.get_value(args.signon_id_field, value)
-            if signon_id != Accounts.SettingSource.NONE:
+            if signon_id != Accounts.SettingSource.NONE and value.get_uint() != 0:
                 self.identity = Signon.Identity.new_from_db(value.get_uint())
                 self.identity.query_info(self.on_info_ready, None)
             else:
@@ -124,12 +124,10 @@
 
 
     def on_credentials_stored(self, identity, id, error, account):
-        print('On credentials stored', id)
         account.set_value(self.args.signon_id_field, int(id))
         account.store(self.on_account_stored, None)
 
 
-
     def delete_account(self, args):
         self.args = args
         account = self.manager.get_account(args.account)
@@ -356,9 +354,10 @@
 subparser.set_defaults(func=app.login_account)
 
 args = parser.parse_args()
-
-main_loop = GLib.MainLoop()
-GLib.idle_add(args.func, args)
-
-main_loop.run()
+if 'func' in args:
+    main_loop = GLib.MainLoop()
+    GLib.idle_add(args.func, args)
+    main_loop.run()
+else:
+    parser.print_help()