diff options
author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2013-09-02 04:20:52 -0300 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2013-09-02 04:20:52 -0300 |
commit | 1e404c0da87c645c3b6a9667c9b602c5524e56b5 (patch) | |
tree | 2b94079476e0ba1aa93d2da4d95f9822e55664c3 | |
parent | 0f01c5850c0915a27a0b20d7f5d65ce88f03dcce (diff) |
gnome-online-accounts-nonprism: remove unnecessaries files
-rw-r--r-- | nonprism/gnome-online-accounts-nonprism/imap-smtp.patch | 20 | ||||
-rw-r--r-- | nonprism/gnome-online-accounts-nonprism/smtp-auth-plain.patch | 88 |
2 files changed, 0 insertions, 108 deletions
diff --git a/nonprism/gnome-online-accounts-nonprism/imap-smtp.patch b/nonprism/gnome-online-accounts-nonprism/imap-smtp.patch deleted file mode 100644 index 7213c8d1e..000000000 --- a/nonprism/gnome-online-accounts-nonprism/imap-smtp.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 034da0871ad78629f9d0df618be494dbb19157e4 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray <debarshir@gnome.org> -Date: Tue, 18 Jun 2013 10:35:42 +0000 -Subject: imap-smtp: Prevent error messages from expanding the dialog - ---- -diff --git a/src/goabackend/goaimapsmtpprovider.c b/src/goabackend/goaimapsmtpprovider.c -index d10a9d8..841327d 100644 ---- a/src/goabackend/goaimapsmtpprovider.c -+++ b/src/goabackend/goaimapsmtpprovider.c -@@ -669,6 +669,7 @@ create_account_details_ui (GoaProvider *provider, - - data->cluebar_label = gtk_label_new (""); - gtk_label_set_line_wrap (GTK_LABEL (data->cluebar_label), TRUE); -+ gtk_label_set_max_width_chars (GTK_LABEL (data->cluebar_label), 36); - gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (data->cluebar))), - data->cluebar_label); - --- -cgit v0.9.2 diff --git a/nonprism/gnome-online-accounts-nonprism/smtp-auth-plain.patch b/nonprism/gnome-online-accounts-nonprism/smtp-auth-plain.patch deleted file mode 100644 index c6782d0f6..000000000 --- a/nonprism/gnome-online-accounts-nonprism/smtp-auth-plain.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 2210bf547dc35adacbc95c0dcf4abe75a73a8368 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray <debarshir@gnome.org> -Date: Tue, 18 Jun 2013 15:27:55 +0000 -Subject: smtp-auth-plain: Handle multiline SMTP greetings - -Fixes: https://bugzilla.gnome.org/702263 ---- -diff --git a/src/goabackend/goasmtpauthplain.c b/src/goabackend/goasmtpauthplain.c -index bb783bd..77324cf 100644 ---- a/src/goabackend/goasmtpauthplain.c -+++ b/src/goabackend/goasmtpauthplain.c -@@ -167,6 +167,40 @@ smtp_auth_plain_check_454 (const gchar *response, GError **error) - - /* ---------------------------------------------------------------------------------------------------- */ - -+static gboolean -+smtp_auth_plain_check_greeting (GDataInputStream *input, GCancellable *cancellable, GError **error) -+{ -+ gboolean ret; -+ gchar *response; -+ -+ response = NULL; -+ ret = FALSE; -+ -+ greeting_again: -+ response = g_data_input_stream_read_line (input, NULL, cancellable, error); -+ if (response == NULL) -+ goto out; -+ g_debug ("< %s", response); -+ if (smtp_auth_plain_check_421 (response, error)) -+ goto out; -+ if (smtp_auth_plain_check_not_220 (response, error)) -+ goto out; -+ -+ if (response[3] == '-') -+ { -+ g_clear_pointer (&response, g_free); -+ goto greeting_again; -+ } -+ -+ ret = TRUE; -+ -+ out: -+ g_free (response); -+ return ret; -+} -+ -+/* ---------------------------------------------------------------------------------------------------- */ -+ - static gchar * - smtp_auth_plain_get_domain (GoaSmtpAuthPlain *auth, - GError **error) -@@ -563,15 +597,8 @@ goa_smtp_auth_plain_run_sync (GoaMailAuth *_auth, - - if (!auth->greeting_absent) - { -- response = g_data_input_stream_read_line (input, NULL, cancellable, error); -- if (response == NULL) -- goto out; -- g_debug ("< %s", response); -- if (smtp_auth_plain_check_421 (response, error)) -+ if (!smtp_auth_plain_check_greeting (input, cancellable, error)) - goto out; -- if (smtp_auth_plain_check_not_220 (response, error)) -- goto out; -- g_clear_pointer (&response, g_free); - } - - /* Send EHLO */ -@@ -685,15 +712,8 @@ goa_smtp_auth_plain_starttls_sync (GoaMailAuth *_auth, - - /* Check the greeting */ - -- response = g_data_input_stream_read_line (input, NULL, cancellable, error); -- if (response == NULL) -- goto out; -- g_debug ("< %s", response); -- if (smtp_auth_plain_check_421 (response, error)) -+ if (!smtp_auth_plain_check_greeting (input, cancellable, error)) - goto out; -- if (smtp_auth_plain_check_not_220 (response, error)) -- goto out; -- g_clear_pointer (&response, g_free); - - /* Send EHLO */ - --- -cgit v0.9.2 |