Merge lp:~rodrigo-moya/ubuntu/maverick/tomboy/fix-sso-signals into lp:~ubuntu-desktop/tomboy/ubuntu

[Rodrigo Moya]

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-13 07:48:22 +0000
+++ debian/changelog	2010-08-18 11:33:46 +0000
@@ -1,3 +1,10 @@
+tomboy (1.3.1-1ubuntu5) maverick; urgency=low
+
+  * debian/patches/06_use_ubuntu_sso.patch:
+    - Add missing code to listen to DBus signals for Ubuntu SSO
+
+ -- Rodrigo Moya <[e-mail]>  Wed, 18 Aug 2010 10:49:38 +0200
+
 tomboy (1.3.1-1ubuntu4) maverick; urgency=low
 
   * debian/patches/06_use_ubuntu_sso.patch:

=== modified file 'debian/patches/06_use_ubuntu_sso.patch'
--- debian/patches/06_use_ubuntu_sso.patch	2010-08-13 07:48:22 +0000
+++ debian/patches/06_use_ubuntu_sso.patch	2010-08-18 11:33:46 +0000
@@ -13,10 +13,10 @@
  	$(srcdir)/Api/Tests/*.cs            \
 diff --git a/Tomboy/Addins/WebSyncService/U1SyncPreferencesWidget.cs b/Tomboy/Addins/WebSyncService/U1SyncPreferencesWidget.cs
 new file mode 100644
-index 0000000..c0859f8
+index 0000000..0c88ec1
 --- /dev/null
 +++ b/Tomboy/Addins/WebSyncService/U1SyncPreferencesWidget.cs
-@@ -0,0 +1,202 @@
+@@ -0,0 +1,290 @@
 +// Permission is hereby granted, free of charge, to any person obtaining 
 +// a copy of this software and associated documentation files (the 
 +// "Software"), to deal in the Software without restriction, including 
@@ -66,6 +66,10 @@
 +		public U1SyncPreferencesWidget (Api.OAuth oauth, string server) : base (false, 5)
 +		{
 +			sdAuth = new SyncdaemonAuthentication ();
++			sdAuth.CredentialsFound += OnCredentialsFound;
++			sdAuth.AuthenticationCancelled += OnAuthCancelled;
++			sdAuth.AuthenticationError += OnAuthError;
++
 +			this.oauth = oauth;
 +
 +			authButton = new Gtk.Button ();
@@ -97,7 +101,7 @@
 +
 +		public string Server {
 +			get {
-+				return "https://one.ubuntu.com/notes/";
++				return "https://edge.one.ubuntu.com/notes/";
 +			}
 +		}
 +
@@ -131,6 +135,30 @@
 +			sdAuth.LoginOrRegister ();
 +		}
 +
++		public void OnCredentialsFound (object sender, EventArgs args)
++		{
++			Auth.AuthorizeLocation = "https://one.ubuntu.com/oauth/authorize/";
++			Auth.AccessTokenBaseUrl = "https://one.ubuntu.com/oauth/access/";
++			Auth.RequestTokenBaseUrl = "https://one.ubuntu.com/oauth/request/";
++			Auth.ConsumerKey = sdAuth.ConsumerKey;
++			Auth.ConsumerSecret = sdAuth.ConsumerSecret;
++			Auth.Token = sdAuth.Token;
++			Auth.TokenSecret = sdAuth.TokenSecret;
++
++			authButton.Label = Catalog.GetString ("Authentication complete. Press Save to start synchronizing");
++		}
++
++		public void OnAuthCancelled (object sender, EventArgs args)
++		{
++			authButton.Label = Catalog.GetString ("Register this computer");
++			authButton.Sensitive = false;
++		}
++
++		public void OnAuthError (object sender, EventArgs args)
++		{
++		}
++
++
 +	}
 +
 +	class SyncdaemonAuthentication
@@ -145,10 +173,64 @@
 +		[DllImport("syncdaemon-1.0")]
 +		static extern IntPtr syncdaemon_daemon_get_authentication (IntPtr daemon);
 +
++		[DllImport("gobject-2.0")]
++		static extern uint g_signal_connect_data (IntPtr obj, IntPtr name, Delegate cb, IntPtr data, IntPtr p, int flags);
++
 +		public SyncdaemonAuthentication ()
 +		{
++			IntPtr native_name;
++
 +			this.syncdaemon = syncdaemon_daemon_new ();
 +			this.handle = syncdaemon_daemon_get_authentication (this.syncdaemon);
++
++			native_name = Marshaller.StringToPtrGStrdup ("credentials_found");
++			g_signal_connect_data (this.handle, native_name,
++					       new CredentialsFoundDelegate (credentials_found_cb),
++					       new IntPtr (0), new IntPtr (0), 0);
++			GLib.Marshaller.Free (native_name);
++
++			native_name = Marshaller.StringToPtrGStrdup ("authorization_cancelled");
++			g_signal_connect_data (this.handle, native_name,
++					       new AuthCancelledDelegate (auth_cancelled_cb),
++					       new IntPtr (0), new IntPtr (0), 0);
++			GLib.Marshaller.Free (native_name);
++
++			native_name = Marshaller.StringToPtrGStrdup ("error");
++			g_signal_connect_data (this.handle, native_name,
++					       new AuthErrorDelegate (auth_error_cb),
++					       new IntPtr (0), new IntPtr (0), 0);
++			GLib.Marshaller.Free (native_name);
++			
++		}
++
++		[GLib.CDeclCallback]
++		delegate void CredentialsFoundDelegate (IntPtr auth, IntPtr credentials, IntPtr user_data);
++
++		void credentials_found_cb (IntPtr auth, IntPtr credentials, IntPtr user_data)
++		{
++			Logger.Debug ("credentials_found_cb called");
++			if (this.CredentialsFound != null)
++				this.CredentialsFound (this, new EventArgs ());
++		}
++
++		[GLib.CDeclCallback]
++		delegate void AuthCancelledDelegate (IntPtr auth, IntPtr user_data);
++
++		void auth_cancelled_cb (IntPtr auth, IntPtr user_data)
++		{
++			Logger.Debug ("auth_cancelled_cb called");
++			if (this.AuthenticationCancelled != null)
++				this.AuthenticationCancelled (this, new EventArgs ());
++		}
++
++		[GLib.CDeclCallback]
++		delegate void AuthErrorDelegate (IntPtr auth, IntPtr error, IntPtr user_data);
++
++		void auth_error_cb (IntPtr auth, IntPtr error, IntPtr user_data)
++		{
++			Logger.Debug ("auth_error_cb called");
++			if (this.AuthenticationError != null)
++				this.AuthenticationError (this, new EventArgs ());
 +		}
 +
 +		[DllImport("syncdaemon-1.0")]
@@ -217,15 +299,21 @@
 +		{
 +			syncdaemon_authentication_login_or_register (this.handle);
 +		}
++
++		public event EventHandler CredentialsFound;
++
++		public event EventHandler AuthenticationCancelled;
++
++		public event EventHandler AuthenticationError;
 +	}
 +}
 \ No newline at end of file
 diff --git a/Tomboy/Addins/WebSyncService/U1SyncServiceAddin.cs b/Tomboy/Addins/WebSyncService/U1SyncServiceAddin.cs
 new file mode 100644
-index 0000000..5a94631
+index 0000000..e6143c5
 --- /dev/null
 +++ b/Tomboy/Addins/WebSyncService/U1SyncServiceAddin.cs
-@@ -0,0 +1,226 @@
+@@ -0,0 +1,229 @@
 +// Permission is hereby granted, free of charge, to any person obtaining 
 +// a copy of this software and associated documentation files (the 
 +// "Software"), to deal in the Software without restriction, including 
@@ -348,7 +436,10 @@
 +			// TODO: Is this really sufficient validation?
 +			//       Should we try a REST API request?
 +			if (prefsWidget.Auth == null ||
-+			    !prefsWidget.Auth.IsAccessToken)
++			    prefsWidget.Auth.ConsumerKey == null ||
++			    prefsWidget.Auth.ConsumerSecret == null ||
++			    prefsWidget.Auth.Token == null ||
++			    prefsWidget.Auth.TokenSecret == null)
 +				return false;
 +			SaveConfigSettings (prefsWidget.Auth, prefsWidget.Server);
 +			return true;