aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-08-28 18:10:35 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-08-28 18:10:35 +0800
commita8a060fb4022f07e60a7c7f97ea1591152cb89cf (patch)
tree4173acf5024ca2230a7367bccb66283cf4b40405
parent994c6fe2f4bb5f86204dea109821de3cd7d611ad (diff)
downloadgsoc2013-empathy-a8a060fb4022f07e60a7c7f97ea1591152cb89cf.tar
gsoc2013-empathy-a8a060fb4022f07e60a7c7f97ea1591152cb89cf.tar.gz
gsoc2013-empathy-a8a060fb4022f07e60a7c7f97ea1591152cb89cf.tar.bz2
gsoc2013-empathy-a8a060fb4022f07e60a7c7f97ea1591152cb89cf.tar.lz
gsoc2013-empathy-a8a060fb4022f07e60a7c7f97ea1591152cb89cf.tar.xz
gsoc2013-empathy-a8a060fb4022f07e60a7c7f97ea1591152cb89cf.tar.zst
gsoc2013-empathy-a8a060fb4022f07e60a7c7f97ea1591152cb89cf.zip
roster-window: fix crash if empathy_chatroom_manager_find() failed
This function doesn't use/set a GError so we shouldn't try to use it.
-rw-r--r--src/empathy-roster-window.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index 831922760..b953e0e83 100644
--- a/src/empathy-roster-window.c
+++ b/src/empathy-roster-window.c
@@ -1301,9 +1301,8 @@ roster_window_join_chatroom_menu_activate_cb (GSimpleAction *action,
account, room);
if (chatroom == NULL)
{
- DEBUG ("Failed to get chatroom '%s' on '%s': %s",
- room, path, error->message);
- g_error_free (error);
+ DEBUG ("Failed to get chatroom '%s' on '%s'",
+ room, path);
goto out;
}