Fix Room listing. Fixes bug #460416 (Sjoerd Simons).

2007-07-26 Xavier Claessens  <xclaesse@gmail.com>

	* libempathy-gtk/empathy-new-chatroom-dialog.c:
	* libempathy/empathy-tp-roomlist.c: Fix Room listing. Fixes bug #460416
	(Sjoerd Simons).

svn path=/trunk/; revision=201

diff --git a/ChangeLog b/ChangeLog
index 5370bc7cde38a2ce48c1671b7f686e7c1a55f31c..25097478e6bc7a572d09112d40f2419eed047195 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-26 Xavier Claessens  <xclaesse@gmail.com>
+
+       * libempathy-gtk/empathy-new-chatroom-dialog.c:
+       * libempathy/empathy-tp-roomlist.c: Fix Room listing. Fixes bug #460416
+       (Sjoerd Simons).
+
 2007-07-26 Xavier Claessens  <xclaesse@gmail.com>
 
        * libempathy-gtk/Makefile.am:

diff --git a/libempathy-gtk/empathy-new-chatroom-dialog.c b/libempathy-gtk/empathy-new-chatroom-dialog.c
index 1c84c70bd3206cc5d48e522ed8c9e76bf938a206..7b5adc011134175f0762eec811858161a72d37ba 100644 (file)
--- a/libempathy-gtk/empathy-new-chatroom-dialog.c
+++ b/libempathy-gtk/empathy-new-chatroom-dialog.c
@@ -73,7 +73,6 @@ typedef struct {
 } EmpathyNewChatroomDialog;
 
 enum {
-       COL_IMAGE,
        COL_NAME,
        COL_ROOM,
        COL_COUNT
@@ -277,13 +276,6 @@ new_chatroom_dialog_model_add_columns (EmpathyNewChatroomDialog *dialog)
        view = GTK_TREE_VIEW (dialog->treeview);
        gtk_tree_view_set_headers_visible (view, FALSE);
 
-       /* Chatroom pointer */
-       column = gtk_tree_view_column_new ();
-       gtk_tree_view_column_set_title (column, _("Chat Rooms"));
-
-       cell = gtk_cell_renderer_pixbuf_new ();
-       gtk_tree_view_column_pack_start (column, cell, FALSE);
-
        cell = gtk_cell_renderer_text_new ();
        g_object_set (cell,
                      "xpad", (guint) 4,
@@ -291,7 +283,10 @@ new_chatroom_dialog_model_add_columns (EmpathyNewChatroomDialog *dialog)
                      "ellipsize", PANGO_ELLIPSIZE_END,
                      NULL);
 
-       gtk_tree_view_column_pack_start (column, cell, TRUE);
+       column = gtk_tree_view_column_new_with_attributes (_("Chat Rooms"),
+                                                          cell,
+                                                          "text", COL_NAME,
+                                                          NULL);
 
        gtk_tree_view_column_set_expand (column, TRUE);
        gtk_tree_view_append_column (view, column);
@@ -478,7 +473,6 @@ new_chatroom_dialog_model_selection_changed (GtkTreeSelection         *selection
        gtk_entry_set_text (GTK_ENTRY (dialog->entry_server), server ? server : "");
        gtk_entry_set_text (GTK_ENTRY (dialog->entry_room), room ? room : "");
 
-       g_free (server);
        g_free (room);
 }
 

diff --git a/libempathy/empathy-tp-roomlist.c b/libempathy/empathy-tp-roomlist.c
index a91d1ba07d165cd03087682e2618a20581b60ea6..99b30b64c41ba9356f5f645bd9227ec9c58dc52d 100644 (file)
--- a/libempathy/empathy-tp-roomlist.c
+++ b/libempathy/empathy-tp-roomlist.c
@@ -314,8 +314,6 @@ tp_roomlist_got_rooms_cb (DBusGProxy        *roomlist_iface,
 
        priv = GET_PRIV (list);
 
-       g_print ("Got negsghgfdhgfdhgfdw room !!!");
-
        for (i = 0; i < room_list->len; i++) {
                EmpathyChatroom *chatroom;
                gchar           *room_id;
@@ -329,9 +327,7 @@ tp_roomlist_got_rooms_cb (DBusGProxy        *roomlist_iface,
                room_struct = g_ptr_array_index (room_list, i);
                handle = g_value_get_uint (g_value_array_get_nth (room_struct, 0));
                channel_type = g_value_get_string (g_value_array_get_nth (room_struct, 1));
-               info = g_value_get_boxed (g_value_array_get_nth (room_struct, 0));
-
-               g_print ("Got new room !!!");
+               info = g_value_get_boxed (g_value_array_get_nth (room_struct, 2));
 
                /* Create the chatroom */
                room_name = g_hash_table_lookup (info, "name");