Consistently use this_chatroom when removing a room

diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index 3bdc5f154788b190059f4b8c6ff7828732c725ec..016a495a2d45ee5045759137e954f8d34ab812dd 100644 (file)
--- a/libempathy/empathy-chatroom-manager.c
+++ b/libempathy/empathy-chatroom-manager.c
@@ -528,11 +528,11 @@ empathy_chatroom_manager_remove (EmpathyChatroomManager *manager,
           empathy_chatroom_equal (chatroom, this_chatroom))
         {
           priv->chatrooms = g_list_delete_link (priv->chatrooms, l);
-          if (empathy_chatroom_is_favorite (chatroom))
+          if (empathy_chatroom_is_favorite (this_chatroom))
             reset_save_timeout (manager);
 
           g_signal_emit (manager, signals[CHATROOM_REMOVED], 0, this_chatroom);
-          g_signal_handlers_disconnect_by_func (chatroom, chatroom_changed_cb,
+          g_signal_handlers_disconnect_by_func (this_chatroom, chatroom_changed_cb,
               manager);
 
           g_object_unref (this_chatroom);