# HG changeset patch # User Richard Laager # Date 1170646655 0 # Node ID 2286aac436947df5c1a8eb28cb0c481305d9f86b # Parent 7ebe32203e67f61876ace74da5b2d6844e71bf5a# Parent 0b5db3387dedfe023f55f2d18df90b89fbda350e merge of '0d5d80abe3087a1a7c7e47fb7b0c226936a3e5e5' and '7d7d9644534bad89792e5e0d891bece00e51e968' diff -r 7ebe32203e67 -r 2286aac43694 console/libgnt/gnttree.c --- a/console/libgnt/gnttree.c Mon Feb 05 03:37:10 2007 +0000 +++ b/console/libgnt/gnttree.c Mon Feb 05 03:37:35 2007 +0000 @@ -1195,17 +1195,16 @@ tree->top = get_prev(row); else tree->top = get_next(row); - if (tree->current == row) - tree->current = tree->top; } - else if (tree->current == row) + if (tree->current == row) { if (tree->current != tree->root) tree->current = get_prev(row); else tree->current = get_next(row); + tree_selection_changed(tree, row, tree->current); } - else if (tree->bottom == row) + if (tree->bottom == row) { tree->bottom = get_prev(row); } diff -r 7ebe32203e67 -r 2286aac43694 pidgin/gtkblist.c --- a/pidgin/gtkblist.c Mon Feb 05 03:37:10 2007 +0000 +++ b/pidgin/gtkblist.c Mon Feb 05 03:37:35 2007 +0000 @@ -2717,9 +2717,9 @@ /* Buddies menu */ { N_("/_Buddies"), NULL, NULL, 0, "", NULL }, { N_("/Buddies/New Instant _Message..."), "M", pidgindialogs_im, 0, "", PIDGIN_STOCK_IM }, - { N_("/Buddies/Join a _Chat..."), "C", pidgin_blist_joinchat_show, 0, "", PIDGIN_STOCK_CHAT }, + { N_("/Buddies/Join a _Chat..."), "C", pidgin_blist_joinchat_show, 0, "", NULL }, { N_("/Buddies/Get User _Info..."), "I", pidgindialogs_info, 0, "", PIDGIN_STOCK_INFO }, - { N_("/Buddies/View User _Log..."), "L", pidgindialogs_log, 0, "", PIDGIN_STOCK_LOG }, + { N_("/Buddies/View User _Log..."), "L", pidgindialogs_log, 0, "", NULL }, { "/Buddies/sep1", NULL, NULL, 0, "", NULL }, { N_("/Buddies/Show _Offline Buddies"), NULL, pidgin_blist_edit_mode_cb, 1, "", NULL }, { N_("/Buddies/Show _Empty Groups"), NULL, pidgin_blist_show_empty_groups_cb, 1, "", NULL }, @@ -2735,25 +2735,25 @@ /* Accounts menu */ { N_("/_Accounts"), NULL, NULL, 0, "", NULL }, - { N_("/Accounts/Add\\/Edit"), "A", pidgin_accounts_window_show, 0, "", PIDGIN_STOCK_ACCOUNTS }, + { N_("/Accounts/Add\\/Edit"), "A", pidgin_accounts_window_show, 0, "", NULL }, /* Tools */ { N_("/_Tools"), NULL, NULL, 0, "", NULL }, - { N_("/Tools/Buddy _Pounces"), NULL, pidgin_pounces_manager_show, 0, "", PIDGIN_STOCK_POUNCE }, + { N_("/Tools/Buddy _Pounces"), NULL, pidgin_pounces_manager_show, 0, "", NULL }, { N_("/Tools/Plu_gins"), "U", pidgin_plugin_dialog_show, 0, "", PIDGIN_STOCK_PLUGIN }, { N_("/Tools/Pr_eferences"), "P", pidgin_prefs_show, 0, "", GTK_STOCK_PREFERENCES }, - { N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "", PIDGIN_STOCK_DIALOG_ERROR }, + { N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "", NULL }, { "/Tools/sep2", NULL, NULL, 0, "", NULL }, - { N_("/Tools/_File Transfers"), "T", pidginxfer_dialog_show, 0, "", PIDGIN_STOCK_FILE_TRANSFER }, - { N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "", GTK_STOCK_INDEX }, - { N_("/Tools/System _Log"), NULL, gtk_blist_show_systemlog_cb, 0, "", PIDGIN_STOCK_LOG }, + { N_("/Tools/_File Transfers"), "T", pidginxfer_dialog_show, 0, "", NULL }, + { N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "", NULL }, + { N_("/Tools/System _Log"), NULL, gtk_blist_show_systemlog_cb, 0, "", NULL }, { "/Tools/sep3", NULL, NULL, 0, "", NULL }, { N_("/Tools/Mute _Sounds"), "S", pidgin_blist_mute_sounds_cb, 0, "", NULL }, /* Help */ { N_("/_Help"), NULL, NULL, 0, "", NULL }, { N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "", GTK_STOCK_HELP }, - { N_("/Help/_Debug Window"), NULL, toggle_debug, 0, "", PIDGIN_STOCK_DEBUG }, + { N_("/Help/_Debug Window"), NULL, toggle_debug, 0, "", NULL }, { N_("/Help/_About"), NULL, pidgindialogs_about, 0, "", PIDGIN_STOCK_ABOUT }, }; diff -r 7ebe32203e67 -r 2286aac43694 pidgin/gtkconv.c --- a/pidgin/gtkconv.c Mon Feb 05 03:37:10 2007 +0000 +++ b/pidgin/gtkconv.c Mon Feb 05 03:37:35 2007 +0000 @@ -2731,7 +2731,7 @@ { N_("/Conversation/_Find..."), NULL, menu_find_cb, 0, "", GTK_STOCK_FIND }, - { N_("/Conversation/View _Log"), NULL, menu_view_log_cb, 0, "", PIDGIN_STOCK_LOG }, + { N_("/Conversation/View _Log"), NULL, menu_view_log_cb, 0, "", NULL }, { N_("/Conversation/_Save As..."), NULL, menu_save_as_cb, 0, "", GTK_STOCK_SAVE_AS }, { N_("/Conversation/Clea_r Scrollback"), "L", menu_clear_cb, 0, "", GTK_STOCK_CLEAR }, @@ -2740,17 +2740,17 @@ { N_("/Conversation/Se_nd File..."), NULL, menu_send_file_cb, 0, "", PIDGIN_STOCK_FILE_TRANSFER }, { N_("/Conversation/Add Buddy _Pounce..."), NULL, menu_add_pounce_cb, - 0, "", PIDGIN_STOCK_POUNCE }, + 0, "", NULL }, { N_("/Conversation/_Get Info"), "O", menu_get_info_cb, 0, "", PIDGIN_STOCK_INFO }, { N_("/Conversation/In_vite..."), NULL, menu_invite_cb, 0, - "", PIDGIN_STOCK_INVITE }, + "", NULL }, { N_("/Conversation/M_ore"), NULL, NULL, 0, "", NULL }, { "/Conversation/sep2", NULL, NULL, 0, "", NULL }, { N_("/Conversation/Al_ias..."), NULL, menu_alias_cb, 0, - "", PIDGIN_STOCK_EDIT }, + "", NULL }, { N_("/Conversation/_Block..."), NULL, menu_block_cb, 0, "", PIDGIN_STOCK_BLOCK }, { N_("/Conversation/_Unblock..."), NULL, menu_unblock_cb, 0, @@ -2762,13 +2762,6 @@ { "/Conversation/sep3", NULL, NULL, 0, "", NULL }, - { N_("/Conversation/Insert Lin_k..."), NULL, menu_insert_link_cb, 0, - "", PIDGIN_STOCK_LINK }, - { N_("/Conversation/Insert Imag_e..."), NULL, menu_insert_image_cb, 0, - "", PIDGIN_STOCK_IMAGE }, - - { "/Conversation/sep4", NULL, NULL, 0, "", NULL }, - { N_("/Conversation/_Close"), NULL, menu_close_conv_cb, 0, "", GTK_STOCK_CLOSE }, @@ -5700,6 +5693,7 @@ gtk_widget_show(win->menu.invite); gtk_widget_show(win->menu.alias); gtk_widget_hide(win->menu.block); + gtk_widget_hide(win->menu.unblock); gtk_widget_hide(win->menu.show_icon); if ((account == NULL) || gaim_blist_find_chat(account, gaim_conversation_get_name(conv)) == NULL) {