Mercurial > pidgin.yaz
changeset 9533:03066f174777
[gaim-migrate @ 10361]
Stu says this is ... better? Although I'm not sure how much I can
trust someone who's never heard of Dragon Warrior.
committer: Tailor Script <tailor@pidgin.im>
| author | Ethan Blanton <elb@pidgin.im> |
|---|---|
| date | Thu, 15 Jul 2004 01:59:05 +0000 |
| parents | b27ab1b8395d |
| children | 6f0c90000bb5 |
| files | src/gtkblist.c src/gtkconv.c |
| diffstat | 2 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkblist.c Wed Jul 14 22:47:20 2004 +0000 +++ b/src/gtkblist.c Thu Jul 15 01:59:05 2004 +0000 @@ -2337,7 +2337,7 @@ { N_("/Buddies/New Instant _Message..."), "<CTL>M", show_im_dialog, 0, "<StockItem>", GAIM_STOCK_IM }, { N_("/Buddies/Join a _Chat..."), "<CTL>C", gaim_gtk_blist_joinchat_show, 0, "<StockItem>", GAIM_STOCK_CHAT }, { N_("/Buddies/Get User _Info..."), "<CTL>I", show_info_dialog, 0, "<StockItem>", GAIM_STOCK_INFO }, - { N_("/Buddies/View User _Log..."), "<CTL>L", show_log_dialog, 0, "<StockItem>" }, + { N_("/Buddies/View User _Log..."), "<CTL>L", show_log_dialog, 0, NULL }, { "/Buddies/sep1", NULL, NULL, 0, "<Separator>" }, { N_("/Buddies/Show _Offline Buddies"), NULL, gaim_gtk_blist_edit_mode_cb, 1, "<CheckItem>"}, { N_("/Buddies/Show _Empty Groups"), NULL, gaim_gtk_blist_show_empty_groups_cb, 1, "<CheckItem>"},
--- a/src/gtkconv.c Wed Jul 14 22:47:20 2004 +0000 +++ b/src/gtkconv.c Thu Jul 15 01:59:05 2004 +0000 @@ -3969,7 +3969,7 @@ gtk_box_pack_start(GTK_BOX(lbox), sw, TRUE, TRUE, 0); gtk_widget_show(sw); - ls = gtk_list_store_new(CHAT_USERS_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING); + ls = gtk_list_store_new(CHAT_USERS_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING); gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(ls), CHAT_USERS_NAME_COLUMN, GTK_SORT_ASCENDING); @@ -3988,8 +3988,6 @@ rend = gtk_cell_renderer_text_new(); - gtk_tree_view_append_column(GTK_TREE_VIEW(list), col); - col = gtk_tree_view_column_new_with_attributes(NULL, rend, "text", CHAT_USERS_NAME_COLUMN, NULL); gtk_tree_view_column_set_clickable(GTK_TREE_VIEW_COLUMN(col), TRUE);