Index: tests/teststatusicon.c
===================================================================
RCS file: /cvs/gnome/gtk+/tests/teststatusicon.c,v
retrieving revision 1.3
diff -p -u -u -p -r1.3 teststatusicon.c
--- tests/teststatusicon.c	3 Nov 2005 12:09:49 -0000	1.3
+++ tests/teststatusicon.c	29 Apr 2006 12:38:59 -0000
@@ -22,6 +22,7 @@
  */
 
 #include <gtk/gtk.h>
+#include "prop-editor.h"
 
 typedef enum
 {
@@ -113,7 +116,7 @@ icon_activated (GtkStatusIcon *icon)
 				       GTK_BUTTONS_CLOSE,
 				       "You wanna test the status icon ?");
 
-      gtk_window_set_position (dialog, GTK_WIN_POS_CENTER);
+      gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
 
       g_object_set_data_full (G_OBJECT (icon), "test-status-icon-dialog",
 			      dialog, (GDestroyNotify) gtk_widget_destroy);
@@ -163,6 +166,20 @@ check_activated (GtkCheckMenuItem *item,
 }
 
 static void
+do_properties (GtkMenuItem   *item,
+	       GtkStatusIcon *icon)
+{
+	static GtkWidget *editor = NULL;
+
+	if (editor == NULL) {
+		editor = create_prop_editor (G_OBJECT (icon), GTK_TYPE_STATUS_ICON);
+		g_signal_connect (editor, "destroy", G_CALLBACK (gtk_widget_destroyed), &editor);
+	}
+
+	gtk_window_present (GTK_WINDOW (editor));
+}
+
+static void
 do_quit (GtkMenuItem   *item,
 	 GtkStatusIcon *icon)
 {
@@ -189,6 +206,13 @@ popup_menu (GtkStatusIcon *icon,
 
   gtk_widget_show (menuitem);
 
+  menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_PROPERTIES, NULL);
+  g_signal_connect (menuitem, "activate", G_CALLBACK (do_properties), icon);
+
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+
+  gtk_widget_show (menuitem);
+
   menuitem = gtk_menu_item_new_with_label ("Quit");
   g_signal_connect (menuitem, "activate", G_CALLBACK (do_quit), icon);
 
@@ -197,7 +221,8 @@ popup_menu (GtkStatusIcon *icon,
   gtk_widget_show (menuitem);
 
   gtk_menu_popup (GTK_MENU (menu), 
-		  NULL, NULL, NULL, NULL, 
+		  NULL, NULL,
+		  gtk_status_icon_position_menu, icon,
 		  button, activate_time);
 }
 
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/tests/Makefile.am,v
retrieving revision 1.61
diff -p -u -u -p -r1.61 Makefile.am
--- tests/Makefile.am	26 Apr 2006 12:39:25 -0000	1.61
+++ tests/Makefile.am	29 Apr 2006 12:38:59 -0000
@@ -233,6 +233,7 @@ testspinbutton_SOURCES =    	\
 	testspinbutton.c
 
 teststatusicon_SOURCES =    	\
+	prop-editor.c		\
 	teststatusicon.c
 
 testmerge_SOURCES = 		\
