Index: gtk/gtkstatusicon.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkstatusicon.c,v
retrieving revision 1.25
diff -u -p -r1.25 gtkstatusicon.c
--- gtk/gtkstatusicon.c	8 Oct 2006 05:07:23 -0000	1.25
+++ gtk/gtkstatusicon.c	17 Nov 2006 23:41:48 -0000
@@ -60,6 +60,7 @@ enum
   PROP_ICON_NAME,
   PROP_STORAGE_TYPE,
   PROP_SIZE,
+  PROP_SCREEN,
   PROP_VISIBLE,
   PROP_BLINKING
 };
@@ -192,6 +193,14 @@ gtk_status_icon_class_init (GtkStatusIco
 						     GTK_PARAM_READABLE));
 
   g_object_class_install_property (gobject_class,
+				   PROP_SCREEN,
+				   g_param_spec_object ("screen",
+ 							P_("Screen"),
+ 							P_("The screen where this status icon will be displayed"),
+							GDK_TYPE_SCREEN,
+ 							GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (gobject_class,
 				   PROP_BLINKING,
 				   g_param_spec_boolean ("blinking",
 							 P_("Blinking"),
@@ -509,6 +518,9 @@ gtk_status_icon_set_property (GObject   
     case PROP_ICON_NAME:
       gtk_status_icon_set_from_icon_name (status_icon, g_value_get_string (value));
       break;
+    case PROP_SCREEN:
+      gtk_status_icon_set_screen (status_icon, g_value_get_object (value));
+      break;
     case PROP_BLINKING:
       gtk_status_icon_set_blinking (status_icon, g_value_get_boolean (value));
       break;
@@ -562,6 +574,9 @@ gtk_status_icon_get_property (GObject   
     case PROP_SIZE:
       g_value_set_int (value, gtk_status_icon_get_size (status_icon));
       break;
+    case PROP_SCREEN:
+      g_value_set_object (value, gtk_status_icon_get_screen (status_icon));
+      break;
     case PROP_BLINKING:
       g_value_set_boolean (value, gtk_status_icon_get_blinking (status_icon));
       break;
@@ -1282,6 +1297,50 @@ gtk_status_icon_get_size (GtkStatusIcon 
   g_return_val_if_fail (GTK_IS_STATUS_ICON (status_icon), 0);
 
   return status_icon->priv->size;
+}
+
+/**
+ * gtk_status_icon_set_screen:
+ * @status_icon: a #GtkStatusIcon
+ * @screen: a #GdkScreen
+ *
+ * Sets the #GdkScreen where @status_icon is displayed; if
+ * the icon is already mapped, it will be unmapped, and
+ * then remapped on the new screen.
+ *
+ * Since: 2.12
+ */
+void
+gtk_status_icon_set_screen (GtkStatusIcon *status_icon,
+                            GdkScreen     *screen)
+{
+  g_return_if_fail (GDK_IS_SCREEN (screen));
+
+#ifdef GDK_WINDOWING_X11
+  gtk_window_set_screen (GTK_WINDOW (status_icon->priv->tray_icon), screen);
+#endif
+}
+
+/** 
+ * gtk_status_icon_get_screen:
+ * @window: a #GtkStatusIcon.
+ *
+ * Returns the #GdkScreen associated with @status_icon.
+ *
+ * Return value: a #GdkScreen.
+ *
+ * Since: 2.12
+ */
+GdkScreen *
+gtk_status_icon_get_screen (GtkStatusIcon *status_icon)
+{
+  g_return_val_if_fail (GTK_IS_STATUS_ICON (status_icon), NULL);
+
+#ifdef GDK_WINDOWING_X11   
+  return gtk_window_get_screen (GTK_WINDOW (status_icon->priv->tray_icon));
+#else
+  return gdk_screen_get_default ();
+#endif
 }
 
 /**
Index: gtk/gtkstatusicon.h
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkstatusicon.h,v
retrieving revision 1.4
diff -u -p -r1.4 gtkstatusicon.h
--- gtk/gtkstatusicon.h	25 May 2006 05:53:41 -0000	1.4
+++ gtk/gtkstatusicon.h	17 Nov 2006 23:41:48 -0000
@@ -91,6 +91,10 @@ G_CONST_RETURN gchar *gtk_status_icon_ge
 
 gint                  gtk_status_icon_get_size           (GtkStatusIcon      *status_icon);
 
+void                  gtk_status_icon_set_screen         (GtkStatusIcon      *status_icon,
+                                                          GdkScreen          *screen);
+GdkScreen            *gtk_status_icon_get_screen         (GtkStatusIcon      *status_icon);
+
 void                  gtk_status_icon_set_tooltip        (GtkStatusIcon      *status_icon,
 							  const gchar        *tooltip_text);
 
Index: tests/teststatusicon.c
===================================================================
RCS file: /cvs/gnome/gtk+/tests/teststatusicon.c,v
retrieving revision 1.3
diff -u -p -r1.3 teststatusicon.c
--- tests/teststatusicon.c	3 Nov 2005 12:09:49 -0000	1.3
+++ tests/teststatusicon.c	17 Nov 2006 23:41:48 -0000
@@ -31,10 +31,12 @@ typedef enum
 
 static TestStatus status = TEST_STATUS_INFO;
 static gint timeout = 0;
+static GSList *icons = NULL;
 
 static void
-update_icon (GtkStatusIcon *status_icon)
+update_icons (void)
 {
+  GSList *l;
   gchar *icon_name;
   gchar *tooltip;
 
@@ -49,44 +51,50 @@ update_icon (GtkStatusIcon *status_icon)
       tooltip = "Some Question ...";
     }
 
-  gtk_status_icon_set_from_icon_name (status_icon, icon_name);
-  gtk_status_icon_set_tooltip (status_icon, tooltip);
+  for (l = icons; l; l = l->next)
+    {
+      GtkStatusIcon *status_icon = l->data;
+
+      gtk_status_icon_set_from_icon_name (status_icon, icon_name);
+      gtk_status_icon_set_tooltip (status_icon, tooltip);
+    }
 }
 
 static gboolean
 timeout_handler (gpointer data)
 {
-  GtkStatusIcon *icon = GTK_STATUS_ICON (data);
-
   if (status == TEST_STATUS_INFO)
     status = TEST_STATUS_QUESTION;
   else
     status = TEST_STATUS_INFO;
 
-  update_icon (icon);
+  update_icons ();
 
   return TRUE;
 }
 
 static void
-blink_toggle_toggled (GtkToggleButton *toggle,
-		      GtkStatusIcon   *icon)
+blink_toggle_toggled (GtkToggleButton *toggle)
 {
-  gtk_status_icon_set_blinking (icon, 
-				gtk_toggle_button_get_active (toggle));
+  GSList *l;
+
+  for (l = icons; l; l = l->next)
+    gtk_status_icon_set_blinking (GTK_STATUS_ICON (l->data), 
+                                  gtk_toggle_button_get_active (toggle));
 }
 
 static void
-visible_toggle_toggled (GtkToggleButton *toggle,
-			GtkStatusIcon   *icon)
+visible_toggle_toggled (GtkToggleButton *toggle)
 {
-  gtk_status_icon_set_visible (icon, 
-			       gtk_toggle_button_get_active (toggle));
+  GSList *l;
+
+  for (l = icons; l; l = l->next)
+    gtk_status_icon_set_visible (GTK_STATUS_ICON (l->data),
+                                 gtk_toggle_button_get_active (toggle));
 }
 
 static void
-timeout_toggle_toggled (GtkToggleButton *toggle,
-			GtkStatusIcon   *icon)
+timeout_toggle_toggled (GtkToggleButton *toggle)
 {
   if (timeout)
     {
@@ -95,7 +103,7 @@ timeout_toggle_toggled (GtkToggleButton 
     }
   else
     {
-      timeout = g_timeout_add (2000, timeout_handler, icon);
+      timeout = g_timeout_add (2000, timeout_handler, NULL);
     }
 }
 
@@ -113,7 +121,8 @@ 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_screen (GTK_WINDOW (dialog), gtk_status_icon_get_screen (icon));
+      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);
@@ -130,7 +139,7 @@ icon_activated (GtkStatusIcon *icon)
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
 				    gtk_status_icon_get_visible (icon));
       g_signal_connect (toggle, "toggled", 
-			G_CALLBACK (visible_toggle_toggled), icon);
+			G_CALLBACK (visible_toggle_toggled), NULL);
 
       toggle = gtk_toggle_button_new_with_mnemonic ("_Blink the icon");
       gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->vbox), toggle, TRUE, TRUE, 6);
@@ -139,7 +148,7 @@ icon_activated (GtkStatusIcon *icon)
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
 				    gtk_status_icon_get_blinking (icon));
       g_signal_connect (toggle, "toggled", 
-			G_CALLBACK (blink_toggle_toggled), icon);
+			G_CALLBACK (blink_toggle_toggled), NULL);
 
       toggle = gtk_toggle_button_new_with_mnemonic ("_Change images");
       gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->vbox), toggle, TRUE, TRUE, 6);
@@ -148,26 +157,57 @@ icon_activated (GtkStatusIcon *icon)
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
 				    timeout != 0);
       g_signal_connect (toggle, "toggled", 
-			G_CALLBACK (timeout_toggle_toggled), icon);
+			G_CALLBACK (timeout_toggle_toggled), NULL);
     }
 
   gtk_window_present (GTK_WINDOW (dialog));
 }
 
 static void
-check_activated (GtkCheckMenuItem *item,
-		 GtkStatusIcon    *icon)
+check_activated (GtkCheckMenuItem *item)
 {
-  gtk_status_icon_set_blinking (icon, 
-				gtk_check_menu_item_get_active (item));
+  GSList *l;
+  GdkScreen *screen;
+
+  screen = NULL;
+
+  for (l = icons; l; l = l->next)
+    {
+      GtkStatusIcon *icon = l->data;
+      GdkScreen *orig_screen;
+
+      orig_screen = gtk_status_icon_get_screen (icon);
+
+      if (screen != NULL)
+        gtk_status_icon_set_screen (icon, screen);
+
+      screen = orig_screen;
+
+      gtk_status_icon_set_blinking (icon,
+                                    gtk_check_menu_item_get_active (item));
+    }
+
+  g_assert (screen != NULL);
+
+  gtk_status_icon_set_screen (GTK_STATUS_ICON (icons->data), screen);
 }
 
 static void
-do_quit (GtkMenuItem   *item,
-	 GtkStatusIcon *icon)
+do_quit (GtkMenuItem *item)
 {
-  gtk_status_icon_set_visible (icon, FALSE);
-  g_object_unref (icon);
+  GSList *l;
+
+  for (l = icons; l; l = l->next)
+    {
+      GtkStatusIcon *icon = l->data;
+
+      gtk_status_icon_set_visible (icon, FALSE);
+      g_object_unref (icon);
+    }
+
+  g_slist_free (icons);
+  icons = NULL;
+
   gtk_main_quit ();
 }
 
@@ -180,17 +220,20 @@ popup_menu (GtkStatusIcon *icon,
 
   menu = gtk_menu_new ();
 
+  gtk_menu_set_screen (GTK_MENU (menu),
+                       gtk_status_icon_get_screen (icon));
+
   menuitem = gtk_check_menu_item_new_with_label ("Blink");
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), 
 				  gtk_status_icon_get_blinking (icon));
-  g_signal_connect (menuitem, "activate", G_CALLBACK (check_activated), icon);
+  g_signal_connect (menuitem, "activate", G_CALLBACK (check_activated), NULL);
 
   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);
+  g_signal_connect (menuitem, "activate", G_CALLBACK (do_quit), NULL);
 
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 
@@ -204,22 +247,35 @@ popup_menu (GtkStatusIcon *icon,
 int
 main (int argc, char **argv)
 {
-  GtkStatusIcon *icon;
+  GdkDisplay *display;
+  guint n_screens, i;
 
   gtk_init (&argc, &argv);
 
-  icon = gtk_status_icon_new ();
-  update_icon (icon);
+  display = gdk_display_get_default ();
 
-  gtk_status_icon_set_blinking (GTK_STATUS_ICON (icon), TRUE);
+  n_screens = gdk_display_get_n_screens (display);
 
-  g_signal_connect (icon, "activate",
-		    G_CALLBACK (icon_activated), NULL);
+  for (i = 0; i < n_screens; i++)
+    {
+      GtkStatusIcon *icon;
+
+      icon = gtk_status_icon_new ();
+      gtk_status_icon_set_screen (icon, gdk_display_get_screen (display, i));
+      update_icons ();
+
+      gtk_status_icon_set_blinking (GTK_STATUS_ICON (icon), TRUE);
+
+      g_signal_connect (icon, "activate",
+                        G_CALLBACK (icon_activated), NULL);
 
-  g_signal_connect (icon, "popup-menu",
-		    G_CALLBACK (popup_menu), NULL);
+      g_signal_connect (icon, "popup-menu",
+                        G_CALLBACK (popup_menu), NULL);
+
+      icons = g_slist_append (icons, icon);
  
-  timeout = g_timeout_add (2000, timeout_handler, icon);
+      timeout = g_timeout_add (2000, timeout_handler, icon);
+    }
 
   gtk_main ();
 
