Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/silc/buddy.c	Thu Feb 15 22:45:52 2018 -0600
+++ b/libpurple/protocols/silc/buddy.c	Thu Feb 15 22:53:57 2018 -0600
@@ -1675,37 +1675,37 @@
 	if (client_entry &&
 	    silc_client_private_message_key_is_set(sg->client,
 						   sg->conn, client_entry)) {
-		act = purple_menu_action_new(_("Reset IM Key"),
+		act = purple_action_menu_new(_("Reset IM Key"),
 		                           PURPLE_CALLBACK(silcpurple_buddy_resetkey),
 		                           NULL, NULL);
 		m = g_list_append(m, act);
 	} else {
-		act = purple_menu_action_new(_("IM with Key Exchange"),
+		act = purple_action_menu_new(_("IM with Key Exchange"),
 		                           PURPLE_CALLBACK(silcpurple_buddy_keyagr),
 		                           NULL, NULL);
 		m = g_list_append(m, act);
 
-		act = purple_menu_action_new(_("IM with Password"),
+		act = purple_action_menu_new(_("IM with Password"),
 		                           PURPLE_CALLBACK(silcpurple_buddy_privkey_menu),
 		                           NULL, NULL);
 		m = g_list_append(m, act);
 	}
 
 	if (pkfile) {
-		act = purple_menu_action_new(_("Show Public Key"),
+		act = purple_action_menu_new(_("Show Public Key"),
 		                           PURPLE_CALLBACK(silcpurple_buddy_showkey),
 		                           NULL, NULL);
 		m = g_list_append(m, act);
 
 	} else {
-		act = purple_menu_action_new(_("Get Public Key..."),
+		act = purple_action_menu_new(_("Get Public Key..."),
 		                           PURPLE_CALLBACK(silcpurple_buddy_getkey_menu),
 		                           NULL, NULL);
 		m = g_list_append(m, act);
 	}
 
 	if (conn && conn->local_entry->mode & SILC_UMODE_ROUTER_OPERATOR) {
-		act = purple_menu_action_new(_("Kill User"),
+		act = purple_action_menu_new(_("Kill User"),
 		                           PURPLE_CALLBACK(silcpurple_buddy_kill),
 		                           NULL, NULL);
 		m = g_list_append(m, act);
@@ -1715,7 +1715,7 @@
 		wb = silc_calloc(1, sizeof(*wb));
 		wb->sg = sg;
 		wb->client_entry = client_entry;
-		act = purple_menu_action_new(_("Draw On Whiteboard"),
+		act = purple_action_menu_new(_("Draw On Whiteboard"),
 		                           PURPLE_CALLBACK(silcpurple_buddy_wb),
 		                           (void *)wb, NULL);
 		m = g_list_append(m, act);