diff --git a/0001-Implement-Google-OAUTH2-authentication-for-GOA-accou.patch b/0001-Implement-Google-OAUTH2-authentication-for-GOA-accou.patch deleted file mode 100644 index ede7099..0000000 --- a/0001-Implement-Google-OAUTH2-authentication-for-GOA-accou.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0bd9b3a86a71b21a9acd215c59e0e8e9108704d5 Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna -Date: Sun, 28 Oct 2012 13:25:07 +0100 -Subject: [PATCH] Implement Google OAUTH2 authentication for GOA accounts - -GOA recently switched to OAuth2 for Google accounts, so we -can use its credentials to access Google Talk without a password. - -https://bugzilla.gnome.org/show_bug.cgi?id=652546 ---- - libempathy/empathy-goa-auth-handler.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/libempathy/empathy-goa-auth-handler.c b/libempathy/empathy-goa-auth-handler.c -index ddcde17..49fc962 100644 ---- a/libempathy/empathy-goa-auth-handler.c -+++ b/libempathy/empathy-goa-auth-handler.c -@@ -182,6 +182,12 @@ got_oauth2_access_token_cb (GObject *source, - auth_cb, data); - break; - -+ case EMPATHY_SASL_MECHANISM_GOOGLE: -+ empathy_sasl_auth_google_async (data->channel, -+ goa_account_get_identity (goa_object_peek_account (data->goa_object)), -+ access_token, auth_cb, data); -+ break; -+ - default: - g_assert_not_reached (); - } -@@ -351,5 +357,6 @@ empathy_goa_auth_handler_supports (EmpathyGoaAuthHandler *self, - - mech = empathy_sasl_channel_select_mechanism (channel); - return mech == EMPATHY_SASL_MECHANISM_FACEBOOK || -- mech == EMPATHY_SASL_MECHANISM_WLM; -+ mech == EMPATHY_SASL_MECHANISM_WLM || -+ mech == EMPATHY_SASL_MECHANISM_GOOGLE; - } --- -1.8.0 - diff --git a/0001-auth-client-Don-t-unref-properties-before-creating-t.patch b/0001-auth-client-Don-t-unref-properties-before-creating-t.patch deleted file mode 100644 index 2ecc8e3..0000000 --- a/0001-auth-client-Don-t-unref-properties-before-creating-t.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 547efabcc71b16044e7776d41262c0f66aaf6eb1 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Tue, 6 Nov 2012 15:31:06 +0100 -Subject: [PATCH] auth-client: Don't unref properties before creating the - certificate - -Fixes: https://bugzilla.gnome.org/687762 ---- - libempathy/empathy-server-tls-handler.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libempathy/empathy-server-tls-handler.c b/libempathy/empathy-server-tls-handler.c -index 7a6bdf1..d58155f 100644 ---- a/libempathy/empathy-server-tls-handler.c -+++ b/libempathy/empathy-server-tls-handler.c -@@ -148,14 +148,14 @@ tls_handler_init_async (GAsyncInitable *initable, - "&o", &cert_object_path); - bus_name = tp_proxy_get_bus_name (TP_PROXY (priv->channel)); - -- g_variant_unref (properties); -- - DEBUG ("Creating an TpTLSCertificate for path %s, bus name %s", - cert_object_path, bus_name); - - priv->certificate = tp_tls_certificate_new (TP_PROXY (priv->channel), - cert_object_path, &error); - -+ g_variant_unref (properties); -+ - if (error != NULL) - { - DEBUG ("Unable to create the TpTLSCertificate: error %s", --- -1.8.0 - diff --git a/0001-empathy-call-Clean-up-the-TfChannel-before-resetting.patch b/0001-empathy-call-Clean-up-the-TfChannel-before-resetting.patch deleted file mode 100644 index b713028..0000000 --- a/0001-empathy-call-Clean-up-the-TfChannel-before-resetting.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 9a7ebcfed29a8bdb46c5d9a2032b14cc67e7ffdf Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Thu, 18 Oct 2012 10:42:36 +0200 -Subject: [PATCH 1/2] empathy-call: Clean up the TfChannel before resetting - the pipeline - -Fixes: https://bugzilla.gnome.org/686311 ---- - src/empathy-call-handler.c | 22 ++++++++++++++-------- - 1 file changed, 14 insertions(+), 8 deletions(-) - -diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c -index 3b870be..63c4f48 100644 ---- a/src/empathy-call-handler.c -+++ b/src/empathy-call-handler.c -@@ -177,6 +177,20 @@ on_call_state_changed_cb (TpCallChannel *call, - { - EmpathyCallHandlerPriv *priv = handler->priv; - -+ /* Clean up the TfChannel before bubbling the state-change signal -+ * further up. This ensures that the conference-removed signal is -+ * emitted before state-changed so that the client gets a chance -+ * to remove the conference from the pipeline before resetting the -+ * pipeline itself. -+ */ -+ if (state == TP_CALL_STATE_ENDED) -+ { -+ tp_channel_close_async (TP_CHANNEL (call), NULL, NULL); -+ priv->accept_when_initialised = FALSE; -+ tp_clear_object (&priv->call); -+ tp_clear_object (&priv->tfchannel); -+ } -+ - g_signal_emit (handler, signals[STATE_CHANGED], 0, state, - reason->dbus_reason); - -@@ -186,14 +200,6 @@ on_call_state_changed_cb (TpCallChannel *call, - tp_call_channel_accept_async (priv->call, on_call_accepted_cb, NULL); - priv->accept_when_initialised = FALSE; - } -- -- if (state == TP_CALL_STATE_ENDED) -- { -- tp_channel_close_async (TP_CHANNEL (call), NULL, NULL); -- priv->accept_when_initialised = FALSE; -- tp_clear_object (&priv->call); -- tp_clear_object (&priv->tfchannel); -- } - } - - static void --- -1.7.12.1 - diff --git a/0002-auth-client-Support-X-TELEPATHY-PASSWORD-for-GOA-acc.patch b/0002-auth-client-Support-X-TELEPATHY-PASSWORD-for-GOA-acc.patch deleted file mode 100644 index 8bc5e57..0000000 --- a/0002-auth-client-Support-X-TELEPATHY-PASSWORD-for-GOA-acc.patch +++ /dev/null @@ -1,120 +0,0 @@ -From fae5af5943f5d41d7dae71fe8389c3438d2c8891 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Mon, 5 Nov 2012 22:40:50 +0100 -Subject: [PATCH] auth-client: Support X-TELEPATHY-PASSWORD for GOA accounts - -If a provider supports more than one authentication mechanism (eg., -Google), we prefer OAuth2. - -Fixes: https://bugzilla.gnome.org/687690 ---- - libempathy/empathy-goa-auth-handler.c | 67 +++++++++++++++++++++++++++++------ - 1 file changed, 57 insertions(+), 10 deletions(-) - -diff --git a/libempathy/empathy-goa-auth-handler.c b/libempathy/empathy-goa-auth-handler.c -index 49fc962..db37eab 100644 ---- a/libempathy/empathy-goa-auth-handler.c -+++ b/libempathy/empathy-goa-auth-handler.c -@@ -196,6 +196,31 @@ got_oauth2_access_token_cb (GObject *source, - } - - static void -+got_password_passwd_cb (GObject *source, -+ GAsyncResult *result, -+ gpointer user_data) -+{ -+ GoaPasswordBased *password = (GoaPasswordBased *) source; -+ AuthData *data = user_data; -+ gchar *passwd; -+ GError *error = NULL; -+ -+ if (!goa_password_based_call_get_password_finish (password, -+ &passwd, result, &error)) -+ { -+ DEBUG ("Failed to get password: %s", error->message); -+ fail_auth (data); -+ g_clear_error (&error); -+ return; -+ } -+ -+ DEBUG ("Got password for %s", tp_proxy_get_object_path (data->account)); -+ -+ empathy_sasl_auth_password_async (data->channel, passwd, auth_cb, data); -+ g_free (passwd); -+} -+ -+static void - ensure_credentials_cb (GObject *source, - GAsyncResult *result, - gpointer user_data) -@@ -203,6 +228,9 @@ ensure_credentials_cb (GObject *source, - AuthData *data = user_data; - GoaAccount *goa_account = (GoaAccount *) source; - GoaOAuth2Based *oauth2; -+ GoaPasswordBased *password; -+ EmpathySaslMechanism mech; -+ gboolean supports_password; - gint expires_in; - GError *error = NULL; - -@@ -215,22 +243,40 @@ ensure_credentials_cb (GObject *source, - return; - } - -- /* We support only oaut2 */ -+ /* We prefer oauth2, if available */ - oauth2 = goa_object_get_oauth2_based (data->goa_object); -- if (oauth2 == NULL) -+ mech = empathy_sasl_channel_select_mechanism (data->channel); -+ if (oauth2 != NULL && mech != EMPATHY_SASL_MECHANISM_PASSWORD) - { -- DEBUG ("GoaObject does not implement oauth2"); -- fail_auth (data); -+ DEBUG ("Goa daemon has credentials for %s, get the access token", -+ tp_proxy_get_object_path (data->account)); -+ -+ goa_oauth2_based_call_get_access_token (oauth2, NULL, -+ got_oauth2_access_token_cb, data); -+ -+ g_object_unref (oauth2); - return; - } - -- DEBUG ("Goa daemon has credentials for %s, get the access token", -- tp_proxy_get_object_path (data->account)); -+ /* Else we use the password */ -+ password = goa_object_get_password_based (data->goa_object); -+ supports_password = empathy_sasl_channel_supports_mechanism (data->channel, -+ "X-TELEPATHY-PASSWORD"); -+ if (password != NULL && supports_password) -+ { -+ DEBUG ("Goa daemon has credentials for %s, get the password", -+ tp_proxy_get_object_path (data->account)); - -- goa_oauth2_based_call_get_access_token (oauth2, NULL, -- got_oauth2_access_token_cb, data); -+ /* arg_id is currently unused */ -+ goa_password_based_call_get_password (password, "", NULL, -+ got_password_passwd_cb, data); -+ -+ g_object_unref (password); -+ return; -+ } - -- g_object_unref (oauth2); -+ DEBUG ("GoaObject does not implement oauth2 or password"); -+ fail_auth (data); - } - - static void -@@ -358,5 +404,6 @@ empathy_goa_auth_handler_supports (EmpathyGoaAuthHandler *self, - mech = empathy_sasl_channel_select_mechanism (channel); - return mech == EMPATHY_SASL_MECHANISM_FACEBOOK || - mech == EMPATHY_SASL_MECHANISM_WLM || -- mech == EMPATHY_SASL_MECHANISM_GOOGLE; -+ mech == EMPATHY_SASL_MECHANISM_GOOGLE || -+ mech == EMPATHY_SASL_MECHANISM_PASSWORD; - } --- -1.7.12.1 - diff --git a/0002-empathy-call-Free-the-FsElementAddedNotifiers-on-fs-.patch b/0002-empathy-call-Free-the-FsElementAddedNotifiers-on-fs-.patch deleted file mode 100644 index b282df9..0000000 --- a/0002-empathy-call-Free-the-FsElementAddedNotifiers-on-fs-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ae68582193e0d4f49153fd426d5a9eb33d8e0d39 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Thu, 18 Oct 2012 10:55:48 +0200 -Subject: [PATCH 2/2] empathy-call: Free the FsElementAddedNotifiers on - fs-conference-removed - -Fixes: https://bugzilla.gnome.org/686314 ---- - src/empathy-call-window.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c -index 8318720..f49901b 100644 ---- a/src/empathy-call-window.c -+++ b/src/empathy-call-window.c -@@ -2446,6 +2446,9 @@ empathy_call_window_conference_removed_cb (EmpathyCallHandler *handler, - EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (user_data); - EmpathyCallWindowPriv *priv = GET_PRIV (self); - -+ g_list_free_full (priv->notifiers, g_object_unref); -+ priv->notifiers = NULL; -+ - gst_bin_remove (GST_BIN (priv->pipeline), conference); - gst_element_set_state (conference, GST_STATE_NULL); - } --- -1.7.12.1 -