[gnome-settings-daemon] wacom: Prevent OSD flashing on primary screen

[Joaquim Manuel Pereira Rocha <jrocha src gnome org>]

commit 10895a858ba6b60f697d903bc82a28bb0d711639
Author: Joaquim Rocha <jrocha redhat com>
Date:   Thu Jul 4 18:52:52 2013 +0200

    wacom: Prevent OSD flashing on primary screen
    
    Delete the map callback and move its code to the realize one so
    the window is moved to the right monitor and set to fullscreen
    right after being resized and before being shown.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=703055

 plugins/wacom/gsd-wacom-osd-window.c |   32 ++++++++++----------------------
 1 files changed, 10 insertions(+), 22 deletions(-)
---
diff --git a/plugins/wacom/gsd-wacom-osd-window.c b/plugins/wacom/gsd-wacom-osd-window.c
index 78f0283..8a0b72e 100644
--- a/plugins/wacom/gsd-wacom-osd-window.c
+++ b/plugins/wacom/gsd-wacom-osd-window.c
@@ -1332,25 +1332,6 @@ display_relative_rotation (GsdWacomRotation device_rotation,
 }
 
 static void
-gsd_wacom_osd_window_mapped (GtkWidget *widget,
-                             gpointer   data)
-{
-       GsdWacomOSDWindow *osd_window = GSD_WACOM_OSD_WINDOW (widget);
-
-       g_return_if_fail (GSD_IS_WACOM_OSD_WINDOW (osd_window));
-
-       /* Position the window at its expected postion before moving
-        * to fullscreen, so the window will be on the right monitor.
-        */
-       gtk_window_move (GTK_WINDOW (osd_window),
-                        osd_window->priv->screen_area.x,
-                        osd_window->priv->screen_area.y);
-
-       gtk_window_fullscreen (GTK_WINDOW (osd_window));
-       gtk_window_set_keep_above (GTK_WINDOW (osd_window), TRUE);
-}
-
-static void
 gsd_wacom_osd_window_realized (GtkWidget *widget,
                                gpointer   data)
 {
@@ -1401,6 +1382,16 @@ gsd_wacom_osd_window_realized (GtkWidget *widget,
                                 &osd_window->priv->tablet_area.height);
        if (status == FALSE)
                osd_window->priv->tablet_area = osd_window->priv->monitor_area;
+
+       /* Position the window at its expected postion before moving
+        * to fullscreen, so the window will be on the right monitor.
+        */
+       gtk_window_move (GTK_WINDOW (osd_window),
+                        osd_window->priv->screen_area.x,
+                        osd_window->priv->screen_area.y);
+
+       gtk_window_fullscreen (GTK_WINDOW (osd_window));
+       gtk_window_set_keep_above (GTK_WINDOW (osd_window), TRUE);
 }
 
 static void
@@ -1608,9 +1599,6 @@ gsd_wacom_osd_window_new (GsdWacomDevice       *pad,
        g_signal_connect (GTK_WIDGET (osd_window), "realize",
                          G_CALLBACK (gsd_wacom_osd_window_realized),
                          NULL);
-       g_signal_connect (GTK_WIDGET (osd_window), "map",
-                         G_CALLBACK (gsd_wacom_osd_window_mapped),
-                         NULL);
 
        configure_button = create_osd_configure_button (osd_window);