From 1494db5aa20e908b343d2ad9128b9ab33ece4bf6 Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Mon, 29 Sep 2003 09:45:04 +0000
Subject: [PATCH] r3091: Stock icons in panel and pinboard menus.

---
 ROX-Filer/Help/Changes   | 4 ++++
 ROX-Filer/src/icon.c     | 8 ++++----
 ROX-Filer/src/menu.c     | 1 +
 ROX-Filer/src/pinboard.c | 6 +++++-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ROX-Filer/Help/Changes b/ROX-Filer/Help/Changes
index 36448933..9edf8e78 100644
--- a/ROX-Filer/Help/Changes
+++ b/ROX-Filer/Help/Changes
@@ -2,6 +2,10 @@
 			A RISC OS-like filer for X
 			by Thomas Leonard
 
+29-Sep-2003
+~~~~~~~~~~~
+Stock icons in panel and pinboard menus.
+
 28-Sep-2003
 ~~~~~~~~~~~
 Added 'Customise Menu' to file menu. Use this to replace Format and Free.
diff --git a/ROX-Filer/src/icon.c b/ROX-Filer/src/icon.c
index 37d4d0c1..8ff018e9 100644
--- a/ROX-Filer/src/icon.c
+++ b/ROX-Filer/src/icon.c
@@ -132,7 +132,7 @@ enum {
 #define N_(x) x
 static GtkItemFactoryEntry menu_def[] = {
 {N_("ROX-Filer"),		NULL, NULL, 0, "<Branch>"},
-{">" N_("About ROX-Filer..."),	NULL, menu_rox_help, HELP_ABOUT, NULL},
+{">" N_("About ROX-Filer..."),	NULL, menu_rox_help, HELP_ABOUT, "<StockItem>", GTK_STOCK_DIALOG_INFO},
 {">" N_("Show Help Files"),	NULL, menu_rox_help, HELP_DIR, "<StockItem>", GTK_STOCK_HELP},
 {">" N_("Manual"),		NULL, menu_rox_help, HELP_MANUAL, NULL},
 {">",				NULL, NULL, 0, "<Separator>"},
@@ -143,9 +143,9 @@ static GtkItemFactoryEntry menu_def[] = {
 {">" N_("Info"),    		NULL, file_op, ACTION_INFO, "<StockItem>", GTK_STOCK_DIALOG_INFO},
 {">" N_("Set Run Action..."),	NULL, file_op, ACTION_RUN_ACTION, "<StockItem>", GTK_STOCK_EXECUTE},
 {">" N_("Set Icon..."),		NULL, file_op, ACTION_SET_ICON, NULL},
-{N_("Edit Item"),  		NULL, file_op, ACTION_EDIT, NULL},
-{N_("Show Location"),  		NULL, file_op, ACTION_LOCATION, NULL},
-{N_("Remove Item(s)"),		NULL, remove_items, 0, NULL},
+{N_("Edit Item"),  		NULL, file_op, ACTION_EDIT, "<StockItem>", GTK_STOCK_PROPERTIES},
+{N_("Show Location"),  		NULL, file_op, ACTION_LOCATION, "<StockItem>", GTK_STOCK_JUMP_TO},
+{N_("Remove Item(s)"),		NULL, remove_items, 0, "<StockItem>", GTK_STOCK_REMOVE},
 {"",				NULL, NULL, 0, "<Separator>"},
 {N_("Backdrop..."),		NULL, set_backdrop, 0, NULL},
 };
diff --git a/ROX-Filer/src/menu.c b/ROX-Filer/src/menu.c
index dbcea389..4eab8239 100644
--- a/ROX-Filer/src/menu.c
+++ b/ROX-Filer/src/menu.c
@@ -442,6 +442,7 @@ GtkWidget *make_send_to_item(DirItem *ditem, const char *label,
 
 		gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
 				gtk_image_new_from_pixbuf(pixbuf));
+		gtk_widget_show_all(item);
 	}
 	else
 		item = gtk_menu_item_new_with_label(label);
diff --git a/ROX-Filer/src/pinboard.c b/ROX-Filer/src/pinboard.c
index 57cfee4e..e6276da7 100644
--- a/ROX-Filer/src/pinboard.c
+++ b/ROX-Filer/src/pinboard.c
@@ -1978,13 +1978,17 @@ static void pin_icon_set_tip(PinIcon *pi)
 static void pinboard_show_menu(GdkEventButton *event, PinIcon *pi)
 {
 	int		pos[3];
+	GList		*list;
 
 	pos[0] = event->x_root;
 	pos[1] = event->y_root;
-	pos[2] = 1;
 
 	icon_prepare_menu((Icon *) pi, TRUE);
 
+	list = gtk_container_get_children(GTK_CONTAINER(icon_menu));
+	pos[2] = g_list_length(list) - 6;
+	g_list_free(list);
+
 	gtk_menu_popup(GTK_MENU(icon_menu), NULL, NULL,
 			position_menu,
 			(gpointer) pos, event->button, event->time);
-- 
2.11.4.GIT