Mercurial > pidgin.yaz

diff libpurple/protocols/silc10/chat.c @ 21351:7b30d02a36aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '55275a531f00a6cabade1b8bfe74eafa3c2db4ba' and 'a4922c657f183e4b124142298268ba47350a72e0'
author Richard Laager <rlaager@wiktel.com>
date Fri, 16 Nov 2007 23:01:34 +0000
parents d4f95419be45
children 8ae227dca885
line wrap: on
line diff
--- a/libpurple/protocols/silc10/chat.c	Fri Nov 16 23:01:26 2007 +0000
+++ b/libpurple/protocols/silc10/chat.c	Fri Nov 16 23:01:34 2007 +0000
@@ -291,7 +291,7 @@
 		purple_request_file_with_hint(sg->gc, _("Open Public Key..."), NULL, FALSE,
 				  G_CALLBACK(silcpurple_chat_chpk_add),
 				  G_CALLBACK(silcpurple_chat_chpk_cancel),
-				  purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, sgc);
+				  purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_HINT_CONV, sgc);
 		return;
 	}
 
@@ -423,7 +423,7 @@
 				    _("Channel Authentication"), t, fields,
 				    _("Add / Remove"), G_CALLBACK(silcpurple_chat_chpk_cb),
 				    _("OK"), G_CALLBACK(silcpurple_chat_chauth_ok),
-					purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, sgc);
+					purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_HINT_CONV, sgc);
 		return;
 	}
 	sgc->pubkeys = silc_buffer_copy(channel_pubkeys);
@@ -462,7 +462,7 @@
 			    _("Channel Authentication"), t, fields,
 			    _("Add / Remove"), G_CALLBACK(silcpurple_chat_chpk_cb),
 			    _("OK"), G_CALLBACK(silcpurple_chat_chauth_ok),
-				purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, sgc);
+				purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_HINT_CONV, sgc);
 
 	silc_argument_payload_free(chpks);
 }
@@ -598,7 +598,7 @@
 	purple_request_fields_with_hint(gc, _("Add Channel Private Group"), NULL, tmp, fields,
 			    _("Add"), G_CALLBACK(silcpurple_chat_prv_add),
 			    _("Cancel"), G_CALLBACK(silcpurple_chat_prv_cancel),
-				purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, p);
+				purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_HINT_CONV, p);
 }
 
 
@@ -728,7 +728,7 @@
 			   tmp, FALSE, FALSE, NULL,
 			   _("OK"), G_CALLBACK(silcpurple_chat_ulimit_cb),
 			   _("Cancel"), G_CALLBACK(silcpurple_chat_ulimit_cb),
-			   purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, s);
+			   purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_HINT_CONV, s);
 }
 
 static void