Updating branch refs/heads/nick/1.8 to 93a7a18fb43536d04e818e91730e3d428e39265d (commit) from 85088df8925adcc26b117166a17ba6a5cc33c4e5 (commit)
commit 93a7a18fb43536d04e818e91730e3d428e39265d Author: Nick Schermer <n...@xfce.org> Date: Sat Sep 21 11:44:19 2013 +0200 Fix crash in screen changed signal. thunar/thunar-desktop-background.c | 2 +- thunar/thunar-desktop-window.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/thunar/thunar-desktop-background.c b/thunar/thunar-desktop-background.c index cab42b1..37719f6 100644 --- a/thunar/thunar-desktop-background.c +++ b/thunar/thunar-desktop-background.c @@ -453,9 +453,9 @@ thunar_desktop_background_expose (ThunarDesktopBackground *background, gdk_atom_intern_static_string ("_XROOTPMAP_ID"), atom_pixmap, 32, GDK_PROP_MODE_REPLACE, (guchar *) &pixmap_xid, 1); +#endif gdk_flush (); -#endif gdk_error_trap_pop (); } diff --git a/thunar/thunar-desktop-window.c b/thunar/thunar-desktop-window.c index 129a6f8..c3b8f50 100644 --- a/thunar/thunar-desktop-window.c +++ b/thunar/thunar-desktop-window.c @@ -121,6 +121,9 @@ thunar_desktop_window_screen_changed (GdkScreen *screen, { GdkWindow *gdk_window; + _thunar_return_if_fail (GDK_IS_SCREEN (screen)); + _thunar_return_if_fail (THUNAR_DESKTOP_WINDOW (window)); + /* release background */ if (window->background != NULL) { @@ -159,9 +162,9 @@ thunar_desktop_window_realize (GtkWidget *widget) GDK_PROP_MODE_REPLACE, (gpointer) &xid, 1); /* watch screen changes */ - g_signal_connect_swapped (G_OBJECT (screen), "size-changed", + g_signal_connect (G_OBJECT (screen), "size-changed", G_CALLBACK (thunar_desktop_window_screen_changed), widget); - g_signal_connect_swapped (G_OBJECT (screen), "monitors-changed", + g_signal_connect (G_OBJECT (screen), "monitors-changed", G_CALLBACK (thunar_desktop_window_screen_changed), widget); /* prepare bg */ _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits