Mercurial > pidgin3 / file diff

--- a/pidgin/gtkblist.c	Sat Aug 03 22:08:33 2013 +0530
+++ b/pidgin/gtkblist.c	Sat Aug 03 22:20:16 2013 +0530
@@ -8109,7 +8109,7 @@
 
 static void
 build_plugin_actions(GtkActionGroup *action_group, GString *ui, char *parent,
-		PurplePluginInfo *plugin_info)
+		PurplePlugin *plugin)
 {
 	GtkAction *menuaction;
 	PurplePluginAction *action = NULL;
@@ -8117,7 +8117,7 @@
 	char *name;
 	int count = 0;
 
-	actions = purple_plugin_info_get_actions(plugin_info);
+	actions = purple_plugin_get_actions(plugin);
 
 	for (l = actions; l != NULL; l = l->next) {
 		if (l->data) {
@@ -8382,10 +8382,7 @@
 		plugin = PURPLE_PLUGIN(l->data);
 		info = purple_plugin_get_info(plugin);
 
-		if (!info)
-			continue;
-
-		if (!purple_plugin_info_get_actions(info))
+		if (!purple_plugin_get_actions(plugin))
 			continue;
 
 		name = g_strdup_printf("plugin%d", count);
@@ -8394,7 +8391,7 @@
 		gtk_action_group_add_action(plugins_action_group, action);
 		g_string_append_printf(plugins_ui, "<menu action='%s'>", name);
 
-		build_plugin_actions(plugins_action_group, plugins_ui, name, info);
+		build_plugin_actions(plugins_action_group, plugins_ui, name, plugin);
 
 		g_string_append(plugins_ui, "</menu>");
 		count++;