diff -r 96593c46d85c -r 76b701912a9d pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Sat Apr 26 16:56:31 2014 +0200
+++ b/pidgin/gtkconv.c	Sat Apr 26 19:55:55 2014 +0200
@@ -4167,8 +4167,7 @@
 	PurpleE2eeState *state;
 	PurpleE2eeProvider *provider;
 	GtkWidget *menu;
-	PurpleE2eeConvMenuCallback menu_cb;
-	GList *menu_actions = NULL, *it;
+	GList *menu_actions, *it;
 	GtkWidget *e2ee_image;
 
 	gtkconv = pidgin_conv_window_get_active_gtkconv(win);
@@ -4206,11 +4205,8 @@
 	gtk_widget_set_tooltip_text(win->menu->e2ee,
 		purple_e2ee_state_get_name(state));
 
-	menu_cb = purple_e2ee_provider_get_conv_menu_cb(provider);
-	if (menu_cb)
-		menu_actions = menu_cb(conv);
-
-	for (it = g_list_first(menu_actions); it; it = g_list_next(it)) {
+	menu_actions = purple_e2ee_provider_get_conv_menu_actions(provider, conv);
+	for (it = menu_actions; it; it = g_list_next(it)) {
 		PurpleMenuAction *action = it->data;
 
 		gtk_widget_show_all(