[gnome-panel] Fix panels in separate x screens

[Jeremy Bicha <jbicha src gnome org>]

commit 3bee9c86f8c31ba0048ac52fefad2222b9ea53c2
Author: Alberts Muktupavels <alberts muktupavels gmail com>
Date:   Mon May 20 10:55:56 2013 -0400

    Fix panels in separate x screens
    
    1) Don't set screen to default screen when it exist.
    2) Set screen for menu, otherwise menu always appears on first screen.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=689610

 gnome-panel/panel-toplevel.c   |    2 +-
 libpanel-applet/panel-applet.c |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/gnome-panel/panel-toplevel.c b/gnome-panel/panel-toplevel.c
index 6a11fc3..8cf91c7 100644
--- a/gnome-panel/panel-toplevel.c
+++ b/gnome-panel/panel-toplevel.c
@@ -4455,7 +4455,7 @@ panel_toplevel_settings_bind_set_screen (const GValue       *value,
 {
        GdkScreen *screen = g_value_get_object (value);
 
-       if (!screen || GDK_IS_SCREEN (screen))
+       if (!screen || !GDK_IS_SCREEN (screen))
                screen = gdk_screen_get_default ();
 
        return g_variant_new ("i", gdk_screen_get_number (screen));
diff --git a/libpanel-applet/panel-applet.c b/libpanel-applet/panel-applet.c
index cee436c..806d427 100644
--- a/libpanel-applet/panel-applet.c
+++ b/libpanel-applet/panel-applet.c
@@ -1141,6 +1141,8 @@ panel_applet_position_menu (GtkMenu   *menu,
        applet = PANEL_APPLET (widget);
 
        screen = gtk_widget_get_screen (widget);
+       
+       gtk_menu_set_screen(menu, screen);
 
        gtk_widget_get_preferred_size (GTK_WIDGET (menu), &requisition, NULL);
        gdk_window_get_origin (gtk_widget_get_window (widget),