pidgin.yaz: src/gtkblist.c comparison

comparison src/gtkblist.c @ 12333:354af9ab4ed3

[gaim-migrate @ 14637] Put plugin actions within a submenu named after the plugin committer: Tailor Script <tailor@pidgin.im>

author	Mark Doliner <mark@kingant.net>
date	Mon, 05 Dec 2005 02:18:43 +0000
parents	607108495e92
children	2823118073fa

comparison

equal deleted inserted replaced

-:720fb68418d8
+:354af9ab4ed3
 	{ N_("/Tools/Buddy _Pounces"), NULL, gaim_gtk_pounces_manager_show, 0, "<StockItem>", GAIM_STOCK_POUNCE },
 	{ N_("/Tools/Plu_gins"), "<CTL>U", gaim_gtk_plugin_dialog_show, 0, "<StockItem>", GAIM_STOCK_PLUGIN },
 	{ N_("/Tools/Pr_eferences"), "<CTL>P", gaim_gtk_prefs_show, 0, "<StockItem>", GTK_STOCK_PREFERENCES },
 	{ N_("/Tools/Pr_ivacy"), NULL, gaim_gtk_privacy_dialog_show, 0, "<StockItem>", GTK_STOCK_DIALOG_ERROR },
 	{ "/Tools/sep2", NULL, NULL, 0, "<Separator>" },
-	{ N_("/Tools/_Debug Window"), NULL, toggle_debug, 0, "<StockItem>", GAIM_STOCK_DEBUG },
 	{ N_("/Tools/_File Transfers"), "<CTL>T", gaim_show_xfer_dialog, 0, "<StockItem>", GAIM_STOCK_FILE_TRANSFER },
 	{ N_("/Tools/R_oom List"), NULL, gaim_gtk_roomlist_dialog_show, 0, "<StockItem>", GTK_STOCK_INDEX },
 	{ N_("/Tools/View System _Log"), NULL, gtk_blist_show_systemlog_cb, 0, "<StockItem>", GAIM_STOCK_LOG },
 	{ "/Tools/sep3", NULL, NULL, 0, "<Separator>" },
 	{ N_("/Tools/Mute _Sounds"), "<CTL>S", gaim_gtk_blist_mute_sounds_cb, 0, "<CheckItem>"},
 	/* Help */
 	{ N_("/_Help"), NULL, NULL, 0, "<Branch>" },
 	{ N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP },
+	{ N_("/Help/_Debug Window"), NULL, toggle_debug, 0, "<StockItem>", GAIM_STOCK_DEBUG },
 	{ N_("/Help/_About"), NULL, gaim_gtkdialogs_about, 0,  "<StockItem>", GAIM_STOCK_ABOUT },
 };
 /*********************************************************
 * Private Utility functions                             *
 {
 	if (pam->callback)
 		pam->callback(pam);
 }
-static GList *plugin_menu_items = NULL;
-static int plugin_menu_index = 10;
 static void
-build_plugin_actions(GtkWidget *menu, GaimPlugin *plugin, gpointer context)
+build_plugin_actions(GtkWidget *menu, GaimPlugin *plugin)
 {
-	GtkWidget *menuitem = NULL;
+	GtkWidget *menuitem;
 	GaimPluginAction *action = NULL;
-	GList *l, *ll;
+	GList *actions, *l;
-	for (l = ll = GAIM_PLUGIN_ACTIONS(plugin, context); l; l = l->next) {
+	actions = GAIM_PLUGIN_ACTIONS(plugin, NULL);
-		if (l->data) {
+	for (l = actions; l != NULL; l = l->next)
+	{
+		if (l->data)
+		{
 			action = (GaimPluginAction *) l->data;
 			action->plugin = plugin;
-			action->context = context;
+			action->context = NULL;
 			menuitem = gtk_menu_item_new_with_label(action->label);
-			if (context) {
+			gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
-				gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
-			} else {
-				plugin_menu_items = g_list_append(plugin_menu_items, menuitem);
-				plugin_menu_index++;
-				gtk_menu_shell_insert(GTK_MENU_SHELL(menu), menuitem, plugin_menu_index);
-			}
 			g_signal_connect(G_OBJECT(menuitem), "activate",
 					G_CALLBACK(plugin_act), action);
 			g_object_set_data(G_OBJECT(menuitem), "plugin_action", action);
 			gtk_widget_show(menuitem);
 		}
 		else
 			gaim_separator(menu);
 	}
-	g_list_free(ll);
+	g_list_free(actions);
 }
 static void
 modify_account_cb(GtkWidget *widget, gpointer data)
 {
 			}
 		}
 	}
 }
+static GList *plugin_submenus = NULL;
 void
 gaim_gtk_blist_update_plugin_actions(void)
 {
-	GtkWidget *menuitem;
+	GtkWidget *menuitem, *submenu;
 	GaimPlugin *plugin = NULL;
 	GList *l;
-	int count = 0;
 	GtkWidget *pluginmenu = gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools"));
-	if (pluginmenu == NULL)
+	g_return_if_fail(pluginmenu != NULL);
-		return;
+	/* Remove old plugin action submenus from the Tools menu */
-	/* Clear the old Account Actions menu */
+	for (l = plugin_submenus; l; l = l->next)
-	for (l = plugin_menu_items; l; l = l->next) {
+	{
-		GaimPluginAction *action;
+		GList *menuitems;
-		plugin_menu_index--;
-		menuitem = l->data;
+		submenu = l->data;
-		action = g_object_get_data(G_OBJECT(menuitem), "plugin_action");
-		g_free(action);
+		menuitems = gtk_container_get_children(GTK_CONTAINER(submenu));
+		while (menuitems != NULL)
-		gtk_container_remove(GTK_CONTAINER(pluginmenu), GTK_WIDGET(menuitem));
+		{
-	}
+			GaimPluginAction *action;
-	g_list_free(plugin_menu_items);
+			menuitem = menuitems->data;
-	plugin_menu_items = NULL;
+			action = g_object_get_data(G_OBJECT(menuitem), "plugin_action");
+			g_free(action);
-	/* Count the number of plugins with actions */
+			menuitems = g_list_delete_link(menuitems, menuitems);
-	for (l = gaim_plugins_get_loaded(); l; l = l->next) {
+		}
-		plugin = (GaimPlugin *) l->data;
+		gtk_container_remove(GTK_CONTAINER(pluginmenu), GTK_WIDGET(submenu));
-		if (!GAIM_IS_PROTOCOL_PLUGIN(plugin) && GAIM_PLUGIN_HAS_ACTIONS(plugin))
+	}
-			count++;
+	g_list_free(plugin_submenus);
+	plugin_submenus = NULL;
-		/* no need to count past 2, so don't */
-		if (count > 1)
+	/* Add a submenu for each plugin with custom actions */
-			break;
-	}
 	for (l = gaim_plugins_get_loaded(); l; l = l->next) {
 		plugin = (GaimPlugin *) l->data;
 		if (GAIM_IS_PROTOCOL_PLUGIN(plugin))
 			continue;
 		if (!GAIM_PLUGIN_HAS_ACTIONS(plugin))
 			continue;
-		build_plugin_actions(pluginmenu, plugin, NULL);
+		menuitem = gtk_image_menu_item_new_with_label(plugin->info->name);
+		gtk_menu_shell_append(GTK_MENU_SHELL(pluginmenu), menuitem);
+		gtk_widget_show(menuitem);
+		plugin_submenus = g_list_append(plugin_submenus, menuitem);
+		submenu = gtk_menu_new();
+		gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);
+		gtk_widget_show(submenu);
+		build_plugin_actions(submenu, plugin);
 	}
 }
 static void
 sortmethod_act(GtkCheckMenuItem *checkmenuitem, char *id)

Mercurial > pidgin.yaz

comparison src/gtkblist.c @ 12333:354af9ab4ed3