diff options
Diffstat (limited to 'gnome-unstable')
| -rw-r--r-- | gnome-unstable/folks/Bug_658631_crash_at_empathy_startup.patch | 41 | ||||
| -rw-r--r-- | gnome-unstable/glib-networking/fix_G_TLS_ERROR_EOF_handling.patch | 73 |
2 files changed, 0 insertions, 114 deletions
diff --git a/gnome-unstable/folks/Bug_658631_crash_at_empathy_startup.patch b/gnome-unstable/folks/Bug_658631_crash_at_empathy_startup.patch deleted file mode 100644 index 6ba35bc02..000000000 --- a/gnome-unstable/folks/Bug_658631_crash_at_empathy_startup.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 1f85f89051e63b05e271b418687c242a83e2f296 Mon Sep 17 00:00:00 2001 -From: Philip Withnall <philip@tecnocode.co.uk> -Date: Mon, 12 Sep 2011 22:09:10 +0000 -Subject: Bug 658631 — crash at empathy startup - -In the case that a persona is removed and the individual containing that -persona is replaced by a different non-null individual which doesn't contain -that persona (because it's been removed), we need to set the persona's -individual pointer to null rather than the replacement individual. - -This stops us tripping the assertion in the setter for Persona.individual. - -Closes: bgo#658631 ---- -diff --git a/folks/individual.vala b/folks/individual.vala -index 3b6c12b..59548ee 100644 ---- a/folks/individual.vala -+++ b/folks/individual.vala -@@ -1510,7 +1510,19 @@ public class Folks.Individual : Object, - * aggregator's rewritten, it would be nice to fix this. */ - if (persona.individual == this) - { -- persona.individual = replacement_individual; -+ /* It may be the case that the persona's being removed from the -+ * individual (i.e. the replacement individual is non-null, but -+ * doesn't contain this persona). In this case, we need to set the -+ * persona's individual to null. */ -+ if (replacement_individual != null && -+ persona in replacement_individual.personas) -+ { -+ persona.individual = replacement_individual; -+ } -+ else -+ { -+ persona.individual = null; -+ } - } - } - --- -cgit v0.9.0.2 diff --git a/gnome-unstable/glib-networking/fix_G_TLS_ERROR_EOF_handling.patch b/gnome-unstable/glib-networking/fix_G_TLS_ERROR_EOF_handling.patch deleted file mode 100644 index c26f422aa..000000000 --- a/gnome-unstable/glib-networking/fix_G_TLS_ERROR_EOF_handling.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 9e2aaacafb45d51cff57dc033f4b5ad5bc1a1762 Mon Sep 17 00:00:00 2001 -From: Dan Winship <danw@gnome.org> -Date: Fri, 16 Sep 2011 15:29:29 +0000 -Subject: gnutls: fix G_TLS_ERROR_EOF handling with gnutls 3.0 - -gnutls 3.0 has a new error code for "peer closed connection without -sending a Close packet", so add some #ifdefs to do the right thing -with either 2.x or 3.x. - -https://bugzilla.gnome.org/show_bug.cgi?id=659233 ---- -diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c -index c1ede79..0f792bb 100644 ---- a/tls/gnutls/gtlsconnection-gnutls.c -+++ b/tls/gnutls/gtlsconnection-gnutls.c -@@ -132,7 +132,10 @@ struct _GTlsConnectionGnutlsPrivate - - GError *error; - GCancellable *cancellable; -- gboolean blocking, eof; -+ gboolean blocking; -+#ifndef GNUTLS_E_PREMATURE_TERMINATION -+ gboolean eof; -+#endif - GIOCondition internal_direction; - }; - -@@ -548,19 +551,22 @@ end_gnutls_io (GTlsConnectionGnutls *gnutls, - gnutls->priv->need_handshake = TRUE; - return status; - } -- else if (status == GNUTLS_E_UNEXPECTED_PACKET_LENGTH) -+ else if ( -+#ifdef GNUTLS_E_PREMATURE_TERMINATION -+ status == GNUTLS_E_PREMATURE_TERMINATION -+#else -+ status == GNUTLS_E_UNEXPECTED_PACKET_LENGTH && gnutls->priv->eof -+#endif -+ ) - { -- if (gnutls->priv->eof) -+ if (gnutls->priv->require_close_notify) - { -- if (gnutls->priv->require_close_notify) -- { -- g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_EOF, -- _("TLS connection closed unexpectedly")); -- return status; -- } -- else -- return 0; -+ g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_EOF, -+ _("TLS connection closed unexpectedly")); -+ return status; - } -+ else -+ return 0; - } - - return status; -@@ -795,8 +801,10 @@ g_tls_connection_gnutls_pull_func (gnutls_transport_ptr_t transport_data, - - if (ret < 0) - set_gnutls_error (gnutls, G_IO_IN); -+#ifndef GNUTLS_E_PREMATURE_TERMINATION - else if (ret == 0) - gnutls->priv->eof = TRUE; -+#endif - - return ret; - } --- -cgit v0.9.0.2 |