From 1fc5a6fccf25ed44d39837125916f5282bf80abb Mon Sep 17 00:00:00 2001 From: Marco Barisione Date: Thu, 18 Jul 2013 15:09:35 +0100 Subject: GOA: ignore non-Telepathy accounts This fixes a crash when trying to remove a GOA account without chat support. https://bugzilla.gnome.org/show_bug.cgi?id=704469 --- goa-mc-plugin/mcp-account-manager-goa.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/goa-mc-plugin/mcp-account-manager-goa.c b/goa-mc-plugin/mcp-account-manager-goa.c index 41eb8f6eb..5072b1618 100644 --- a/goa-mc-plugin/mcp-account-manager-goa.c +++ b/goa-mc-plugin/mcp-account-manager-goa.c @@ -197,6 +197,9 @@ object_chat_changed_cb (GoaObject *object, char *name = get_tp_account_name (account); gboolean enabled; + if (name == NULL) + return; + enabled = (goa_object_peek_chat (object) != NULL); DEBUG ("%s %s", name, enabled ? "enabled" : "disabled"); @@ -292,6 +295,9 @@ _account_removed_cb (GoaClient *client, GoaAccount *account = goa_object_peek_account (object); char *name = get_tp_account_name (account); + if (name == NULL) + return; + if (self->priv->ready) g_signal_emit_by_name (self, "deleted", name); -- cgit v1.2.3 From a243fdeec4e1f6cb2aff0e7a821fd167f21932bf Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Wed, 7 Aug 2013 19:29:15 +0200 Subject: Don't dereference a NULL error libsecret returns FALSE without an error in some cases but we unconditionally dereference it, causing a crash. https://bugzilla.gnome.org/show_bug.cgi?id=692105 --- libempathy/empathy-keyring.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libempathy/empathy-keyring.c b/libempathy/empathy-keyring.c index 837b2d519..09ab4dd18 100644 --- a/libempathy/empathy-keyring.c +++ b/libempathy/empathy-keyring.c @@ -664,7 +664,8 @@ items_delete_cb (GObject *source, GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (user_data); GError *error = NULL; - if (!secret_password_clear_finish (result, &error)) + secret_password_clear_finish (result, &error); + if (error != NULL) { g_simple_async_result_set_error (simple, TP_ERROR, TP_ERROR_DOES_NOT_EXIST, "%s", error->message); -- cgit v1.2.3 From fa72bed70086dc63d06577fde43dc6ed7196e0b9 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 9 Sep 2013 15:16:05 +0200 Subject: debug-window: ellipsize the message text renderer Ridiculously long messages were crashing empathy-debugger because Pango weren't able to display them all. https://bugzilla.gnome.org/show_bug.cgi?id=696328 --- src/empathy-debug-window.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c index 0a1d7f786..948b9ef75 100644 --- a/src/empathy-debug-window.c +++ b/src/empathy-debug-window.c @@ -2063,7 +2063,12 @@ am_prepared_cb (GObject *am, (GtkTreeCellDataFunc) debug_window_level_formatter, NULL, NULL); renderer = gtk_cell_renderer_text_new (); - g_object_set (renderer, "family", "Monospace", NULL); + + g_object_set (renderer, + "family", "Monospace", + "ellipsize", PANGO_ELLIPSIZE_END, + NULL); + gtk_tree_view_insert_column_with_data_func (GTK_TREE_VIEW (self->priv->view), -1, _("Message"), renderer, (GtkTreeCellDataFunc) debug_window_message_formatter, NULL, NULL); -- cgit v1.2.3