aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--libempathy-gtk/empathy-new-chatroom-dialog.c14
-rw-r--r--libempathy/empathy-tp-roomlist.c6
3 files changed, 11 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 5370bc7cd..25097478e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
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:
* libempathy/Makefile.am:
* configure.ac: Use libtool -version-info. Fixes bug #460579
diff --git a/libempathy-gtk/empathy-new-chatroom-dialog.c b/libempathy-gtk/empathy-new-chatroom-dialog.c
index 1c84c70bd..7b5adc011 100644
--- 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 a91d1ba07..99b30b64c 100644
--- 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");