Updating branch refs/heads/master to 0ba455094a0ff6351b4ddaff28f20611a3d368d6 (commit) from b42cf9f4297a0aa69678c842e72aee9f77eedfc8 (commit)
commit 0ba455094a0ff6351b4ddaff28f20611a3d368d6 Author: Jérôme Guelfucci <jero...@xfce.org> Date: Mon Jan 25 23:51:33 2010 +0100 Fix screen/monitor issues introduced while porting. settings/module.c | 4 ++-- xfce4-session/shutdown.c | 5 +---- xfce4-session/xfsm-splash-screen.c | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/settings/module.c b/settings/module.c index 4892f72..082dfba 100644 --- a/settings/module.c +++ b/settings/module.c @@ -203,8 +203,8 @@ module_test (Module *module, bzero (&engine, sizeof (engine)); /* locate monitor with pointer */ - screen = gdk_display_get_screen (display, monitor); - if (G_UNLIKELY (screen == NULL)) + screen = xfce_gdk_screen_get_active (&monitor); + if (G_UNLIKELY (screen == NULL) || (gdk_screen_get_display(screen) != display)) { screen = gdk_display_get_screen (display, 0); monitor = 0; diff --git a/xfce4-session/shutdown.c b/xfce4-session/shutdown.c index 3a3aae7..4b69e9d 100644 --- a/xfce4-session/shutdown.c +++ b/xfce4-session/shutdown.c @@ -170,7 +170,6 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea gboolean accessibility; GtkIconTheme *icon_theme; XfsmFadeout *fadeout = NULL; - GdkDisplay *display; GdkScreen *screen; GtkWidget *dialog; GtkWidget *label; @@ -266,10 +265,8 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea */ gtk_rc_reparse_all (); - display = gdk_display_get_default(); - /* get screen with pointer */ - screen = gdk_display_get_screen(display, monitor); + screen = xfce_gdk_screen_get_active (&monitor); if (screen == NULL) { screen = gdk_screen_get_default (); diff --git a/xfce4-session/xfsm-splash-screen.c b/xfce4-session/xfsm-splash-screen.c index f22ac57..d22a098 100644 --- a/xfce4-session/xfsm-splash-screen.c +++ b/xfce4-session/xfsm-splash-screen.c @@ -68,7 +68,7 @@ xfsm_splash_screen_new (GdkDisplay *display, /* locate monitor with pointer */ screen = xfce_gdk_screen_get_active (&monitor); - if (G_UNLIKELY (screen == NULL)) + if (G_UNLIKELY (screen == NULL) || (gdk_screen_get_display (screen) != display)) { screen = gdk_display_get_screen (display, 0); monitor = 0; _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits