aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--libempathy/empathy-tp-chat.c1
-rw-r--r--libempathy/empathy-tp-roomlist.c4
3 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 596e60aee..b62144334 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2007-08-06 Xavier Claessens <xclaesse@gmail.com>
+ * libempathy/empathy-tp-chat.c: Don't forget to reverse the glist of
+ pending messages.
+
+ * libempathy/empathy-tp-roomlist.c: Fix wrong room list names when
+ listing them.
+
+2007-08-06 Xavier Claessens <xclaesse@gmail.com>
+
* libempathy-gtk/empathy-account-widget-msn.glade:
* libempathy-gtk/empathy-account-widget-msn.c: Add an Advanced section
and remove size_group.
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 691d7a2f1..077afe36e 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -681,6 +681,7 @@ empathy_tp_chat_get_pendings (EmpathyTpChat *chat)
g_value_array_free (message_struct);
}
+ messages = g_list_reverse (messages);
g_ptr_array_free (messages_list, TRUE);
diff --git a/libempathy/empathy-tp-roomlist.c b/libempathy/empathy-tp-roomlist.c
index 99b30b64c..849bfb90f 100644
--- a/libempathy/empathy-tp-roomlist.c
+++ b/libempathy/empathy-tp-roomlist.c
@@ -318,6 +318,7 @@ tp_roomlist_got_rooms_cb (DBusGProxy *roomlist_iface,
EmpathyChatroom *chatroom;
gchar *room_id;
const gchar *room_name;
+ const GValue *room_name_value;
GValueArray *room_struct;
guint handle;
const gchar *channel_type;
@@ -330,7 +331,8 @@ tp_roomlist_got_rooms_cb (DBusGProxy *roomlist_iface,
info = g_value_get_boxed (g_value_array_get_nth (room_struct, 2));
/* Create the chatroom */
- room_name = g_hash_table_lookup (info, "name");
+ room_name_value = g_hash_table_lookup (info, "name");
+ room_name = g_value_get_string (room_name_value);
room_id = empathy_inspect_handle (priv->account,
handle,
TP_HANDLE_TYPE_ROOM);