diff libpurple/protocols/silc/buddy.c @ 21353:8ae227dca885

merge of '00bf7296307f96f5c68d6e5edf219fb4a50bb947' and '3468b1f73a715bd59ad22726232214da77cf67f7'
author Richard Laager <rlaager@wiktel.com>
date Fri, 16 Nov 2007 23:27:07 +0000
parents d4f95419be45 73c5f5bfeb39
children fcb848b2d669
line wrap: on
line diff
--- a/libpurple/protocols/silc/buddy.c	Fri Nov 16 23:03:22 2007 +0000
+++ b/libpurple/protocols/silc/buddy.c	Fri Nov 16 23:27:07 2007 +0000
@@ -314,7 +314,7 @@
 
 	purple_request_action_with_hint(client->application, _("Key Agreement Request"), tmp,
 			      hostname ? tmp2 : NULL, 1, gc->account, client_entry->nickname,
-			      NULL, PURPLE_REQUEST_HINT_BLIST, a, 2, _("Yes"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb),
+			      NULL, "blist", a, 2, _("Yes"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb),
 			      _("No"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb));
 }
 
@@ -453,7 +453,7 @@
 	                     _("Set IM Password"), NULL, FALSE, TRUE, NULL,
 	                     _("OK"), G_CALLBACK(silcpurple_buddy_privkey_cb),
 	                     _("Cancel"), G_CALLBACK(silcpurple_buddy_privkey_cb),
-	                     gc->account, NULL, NULL, PURPLE_REQUEST_HINT_BLIST, p);
+	                     gc->account, NULL, NULL, "blist", p);
 
 	silc_client_list_free(sg->client, sg->conn, clients);
 }
@@ -1059,7 +1059,7 @@
 	purple_request_file_with_hint(r->client->application, _("Open..."), NULL, FALSE,
 			    G_CALLBACK(silcpurple_add_buddy_ask_import),
 			    G_CALLBACK(silcpurple_add_buddy_ask_pk_cancel),
-			    purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, PURPLE_REQUEST_HINT_BLIST, r);
+			    purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, "blist", r);
 
 }
 
@@ -1072,7 +1072,7 @@
 	purple_request_action_with_hint(r->client->application, _("Add Buddy"), tmp,
 			      _("To add the buddy you must import his/her public key. "
 				"Press Import to import a public key."), 0,
-			      purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, PURPLE_REQUEST_HINT_BLIST, r, 2,
+			      purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, "blist", r, 2,
 			      _("Cancel"), G_CALLBACK(silcpurple_add_buddy_ask_pk_cb),
 			      _("_Import..."), G_CALLBACK(silcpurple_add_buddy_ask_pk_cb));
 }
@@ -1189,7 +1189,7 @@
 			      fields,
 			      _("OK"), G_CALLBACK(silcpurple_add_buddy_select_cb),
 			      _("Cancel"), G_CALLBACK(silcpurple_add_buddy_select_cancel),
-			      purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, PURPLE_REQUEST_HINT_BLIST, r);
+			      purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, "blist", r);
 }
 
 static void