Mercurial > pidgin

changeset 16964:9ded461750a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '95263e6331877ad988b3369bac9a09af194fbf9d' and 'f9d4c1d18ceb6cf5153f870824ce7e727c4b9479'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Wed, 09 May 2007 04:09:56 +0000
parents 1a336cfc410e (diff) 810af35c31ce (current diff)
children 6b516b7eebc5 34d9037a228c
files
diffstat 3 files changed, 17 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed May 09 02:57:46 2007 +0000
+++ b/ChangeLog	Wed May 09 04:09:56 2007 +0000
@@ -3,6 +3,7 @@
 version 2.0.1 (??/??/????):
 	* Buddy list update speedups when buddy icons are not being
 	  displayed.  (Scott Wolchok)
+	* Custom smileys on MSN can be saved by right-clicking on them.
 
 	Finch:
 	* Userlist in chat windows, which can be turned on or off using
--- a/finch/gntblist.c	Wed May 09 02:57:46 2007 +0000
+++ b/finch/gntblist.c	Wed May 09 04:09:56 2007 +0000
@@ -955,7 +955,7 @@
 
 	prompt = g_strdup_printf(_("Please enter the new name for %s"), name);
 
-	text = PURPLE_BLIST_NODE_IS_GROUP(node) ? _("Rename") : _("Alias");
+	text = PURPLE_BLIST_NODE_IS_GROUP(node) ? _("Rename") : _("Set Alias");
 	purple_request_input(node, text, prompt, _("Enter empty string to reset the name."),
 			name, FALSE, FALSE, NULL, text, G_CALLBACK(rename_blist_node),
 			_("Cancel"), NULL,
--- a/finch/gntconv.c	Wed May 09 02:57:46 2007 +0000
+++ b/finch/gntconv.c	Wed May 09 04:09:56 2007 +0000
@@ -396,17 +396,26 @@
 	gnt_menuitem_set_callback(item, toggle_timestamps_cb, ggc);
 
 	if (purple_conversation_get_type(ggc->active_conv) == PURPLE_CONV_TYPE_IM) {
-		item = gnt_menuitem_new(_("Send File"));
-		gnt_menu_add_item(GNT_MENU(sub), item);
-		gnt_menuitem_set_callback(item, send_file_cb, ggc);
+		PurpleAccount *account = purple_conversation_get_account(ggc->active_conv);
+		PurplePluginProtocolInfo *pinfo = account->gc ? PURPLE_PLUGIN_PROTOCOL_INFO(account->gc->prpl) : NULL;
+
+		if (pinfo && pinfo->get_info) {
+			item = gnt_menuitem_new(_("Get Info"));
+			gnt_menu_add_item(GNT_MENU(sub), item);
+			gnt_menuitem_set_callback(item, get_info_cb, ggc);
+		}
 
 		item = gnt_menuitem_new(_("Add Buddy Pounce..."));
 		gnt_menu_add_item(GNT_MENU(sub), item);
 		gnt_menuitem_set_callback(item, add_pounce_cb, ggc);
 
-		item = gnt_menuitem_new(_("Get Info"));
-		gnt_menu_add_item(GNT_MENU(sub), item);
-		gnt_menuitem_set_callback(item, get_info_cb, ggc);
+		if (pinfo && pinfo->send_file &&
+				(!pinfo->can_receive_file ||
+				 	pinfo->can_receive_file(account->gc, purple_conversation_get_name(ggc->active_conv)))) {
+			item = gnt_menuitem_new(_("Send File"));
+			gnt_menu_add_item(GNT_MENU(sub), item);
+			gnt_menuitem_set_callback(item, send_file_cb, ggc);
+		}
 
 		generate_send_to_menu(ggc);
 	}