roster-window: fix crash if empathy_chatroom_manager_find() failed

[empathy.git] / src / empathy-roster-window.c

diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index 667267f5119496a1bf91db505b15da39689de871..b953e0e8307b32c851a59fa6dc7175b8627b273c 100644 (file)
--- 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;
     }
 
@@ -1334,6 +1333,7 @@ roster_window_favorite_chatroom_menu_add (EmpathyRosterWindow *self,
   g_menu_item_set_action_and_target (item, "win.join", "(ss)",
       name, account_path);
   g_menu_item_set_attribute (item, "room-name", "s", name);
+  g_menu_item_set_attribute (item, "account-path", "s", account_path);
   g_menu_append_item (self->priv->rooms_section, item);
 
   g_free (label);
@@ -1355,26 +1355,44 @@ roster_window_favorite_chatroom_menu_removed_cb (
 {
   GList *chatrooms;
   guint i, n;
+  TpAccount *account;
+  const gchar *account_path;
+
+  account = empathy_chatroom_get_account (chatroom);
+  account_path = tp_proxy_get_object_path (account);
 
   n = g_menu_model_get_n_items (G_MENU_MODEL (self->priv->rooms_section));
 
   for (i = 0; i < n; i++)
     {
-      gchar *name;
+      gchar *tmp;
 
       if (!g_menu_model_get_item_attribute (
             G_MENU_MODEL (self->priv->rooms_section), i,
-            "room-name", "s", &name))
+            "room-name", "s", &tmp))
         continue;
 
-      if (tp_strdiff (name, empathy_chatroom_get_name (chatroom)))
+      if (tp_strdiff (tmp, empathy_chatroom_get_name (chatroom)))
         {
-          g_free (name);
+          g_free (tmp);
+          continue;
+        }
+
+      g_free (tmp);
+
+      if (!g_menu_model_get_item_attribute (
+            G_MENU_MODEL (self->priv->rooms_section), i,
+            "account-path", "s", &tmp))
+        continue;
+
+      if (tp_strdiff (tmp, account_path))
+        {
+          g_free (tmp);
           continue;
         }
 
       g_menu_remove (self->priv->rooms_section, i);
-      g_free (name);
+      g_free (tmp);
       break;
     }
 
@@ -1707,7 +1725,7 @@ set_notebook_page (EmpathyRosterWindow *self)
         {
           if (g_settings_get_boolean (self->priv->gsettings_ui,
                 EMPATHY_PREFS_UI_SHOW_OFFLINE))
-            display_page_message (self, _("You haven't added any contact yet"),
+            display_page_message (self, _("You haven't added any contacts yet"),
                 PAGE_MESSAGE_FLAG_ADD_CONTACT);
           else
             display_page_message (self, _("No online contacts"),