Merge branch 'master' into client-side-windows

Conflicts:
	gdk/x11/gdkwindow-x11.c

diff --cc gdk/Makefile.am
Simple merge

diff --cc gdk/win32/gdkdisplay-win32.c
Simple merge

diff --cc gdk/x11/gdkdnd-x11.c
Simple merge

diff --cc gdk/x11/gdkevents-x11.c
Simple merge

diff --cc gdk/x11/gdkproperty-x11.c
Simple merge

diff --cc gdk/x11/gdkselection-x11.c
Simple merge

diff --cc gdk/x11/gdkwindow-x11.c
index 7f783a9bee61a1789e7eaf16732bae774f54e359,77033fea76def58b7df3c226ec17349dd9dcbb7d..e29dc7b14b9473a16770c14b83aaa38e4cb04ce7
--- 1/gdk/x11/gdkwindow-x11.c
--- 2/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@@ -3323,8 -3564,9 +3325,8 @@@ gdk_window_x11_set_events (GdkWindo
    
    if (!GDK_WINDOW_DESTROYED (window))
      {
-       xevent_mask = StructureNotifyMask | PropertyChangeMask;
- 
 -      GDK_WINDOW_OBJECT (window)->event_mask = event_mask;
+       if (GDK_WINDOW_XID (window) != GDK_WINDOW_XROOTWIN (window))
+         xevent_mask = StructureNotifyMask | PropertyChangeMask;
        for (i = 0; i < _gdk_nenvent_masks; i++)
        {
          if (event_mask & (1 << (i + 1)))
@@@ -3860,9 -4219,10 +3869,9 @@@ gdk_window_set_icon_name (GdkWindow   *
                          const gchar *name)
  {
    GdkDisplay *display;
-   
+ 
 -  g_return_if_fail (GDK_IS_WINDOW (window));
 -
 -  if (GDK_WINDOW_DESTROYED (window))
 +  if (GDK_WINDOW_DESTROYED (window) ||
 +      WINDOW_IS_TOPLEVEL (window))
      return;
  
    display = gdk_drawable_get_display (window);

diff --cc tests/Makefile.am
Simple merge