Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/silc/chat.c	Thu Feb 15 22:45:52 2018 -0600
+++ b/libpurple/protocols/silc/chat.c	Thu Feb 15 22:53:57 2018 -0600
@@ -889,31 +889,31 @@
 	if (strstr(chname, "[Private Group]"))
 		return NULL;
 
-	act = purple_menu_action_new(_("Get Info"),
+	act = purple_action_menu_new(_("Get Info"),
 	                           PURPLE_CALLBACK(silcpurple_chat_getinfo_menu),
 	                           NULL, NULL);
 	m = g_list_append(m, act);
 
 	if (chu) {
-		act = purple_menu_action_new(_("Add Private Group"),
+		act = purple_action_menu_new(_("Add Private Group"),
 		                           PURPLE_CALLBACK(silcpurple_chat_prv),
 		                           NULL, NULL);
 		m = g_list_append(m, act);
 	}
 
 	if (chu && mode & SILC_CHANNEL_UMODE_CHANFO) {
-		act = purple_menu_action_new(_("Channel Authentication"),
+		act = purple_action_menu_new(_("Channel Authentication"),
 		                           PURPLE_CALLBACK(silcpurple_chat_chauth),
 		                           NULL, NULL);
 		m = g_list_append(m, act);
 
 		if (channel->mode & SILC_CHANNEL_MODE_FOUNDER_AUTH) {
-			act = purple_menu_action_new(_("Reset Permanent"),
+			act = purple_action_menu_new(_("Reset Permanent"),
 			                           PURPLE_CALLBACK(silcpurple_chat_permanent_reset),
 			                           NULL, NULL);
 			m = g_list_append(m, act);
 		} else {
-			act = purple_menu_action_new(_("Set Permanent"),
+			act = purple_action_menu_new(_("Set Permanent"),
 			                           PURPLE_CALLBACK(silcpurple_chat_permanent),
 			                           NULL, NULL);
 			m = g_list_append(m, act);
@@ -921,42 +921,42 @@
 	}
 
 	if (chu && mode & SILC_CHANNEL_UMODE_CHANOP) {
-		act = purple_menu_action_new(_("Set User Limit"),
+		act = purple_action_menu_new(_("Set User Limit"),
 		                           PURPLE_CALLBACK(silcpurple_chat_ulimit),
 		                           NULL, NULL);
 		m = g_list_append(m, act);
 
 		if (channel->mode & SILC_CHANNEL_MODE_TOPIC) {
-			act = purple_menu_action_new(_("Reset Topic Restriction"),
+			act = purple_action_menu_new(_("Reset Topic Restriction"),
 			                           PURPLE_CALLBACK(silcpurple_chat_resettopic),
 			                           NULL, NULL);
 			m = g_list_append(m, act);
 		} else {
-			act = purple_menu_action_new(_("Set Topic Restriction"),
+			act = purple_action_menu_new(_("Set Topic Restriction"),
 			                           PURPLE_CALLBACK(silcpurple_chat_settopic),
 			                           NULL, NULL);
 			m = g_list_append(m, act);
 		}
 
 		if (channel->mode & SILC_CHANNEL_MODE_PRIVATE) {
-			act = purple_menu_action_new(_("Reset Private Channel"),
+			act = purple_action_menu_new(_("Reset Private Channel"),
 			                           PURPLE_CALLBACK(silcpurple_chat_resetprivate),
 			                           NULL, NULL);
 			m = g_list_append(m, act);
 		} else {
-			act = purple_menu_action_new(_("Set Private Channel"),
+			act = purple_action_menu_new(_("Set Private Channel"),
 			                           PURPLE_CALLBACK(silcpurple_chat_setprivate),
 			                           NULL, NULL);
 			m = g_list_append(m, act);
 		}
 
 		if (channel->mode & SILC_CHANNEL_MODE_SECRET) {
-			act = purple_menu_action_new(_("Reset Secret Channel"),
+			act = purple_action_menu_new(_("Reset Secret Channel"),
 			                           PURPLE_CALLBACK(silcpurple_chat_resetsecret),
 			                           NULL, NULL);
 			m = g_list_append(m, act);
 		} else {
-			act = purple_menu_action_new(_("Set Secret Channel"),
+			act = purple_action_menu_new(_("Set Secret Channel"),
 			                           PURPLE_CALLBACK(silcpurple_chat_setsecret),
 			                           NULL, NULL);
 			m = g_list_append(m, act);
@@ -968,7 +968,7 @@
 		wb = silc_calloc(1, sizeof(*wb));
 		wb->sg = sg;
 		wb->channel = channel;
-		act = purple_menu_action_new(_("Draw On Whiteboard"),
+		act = purple_action_menu_new(_("Draw On Whiteboard"),
 		                           PURPLE_CALLBACK(silcpurple_chat_wb),
 		                           (void *)wb, NULL);
 		m = g_list_append(m, act);