[maemo-commits] [maemo-commits] r19530 - in projects/haf/trunk/gtk+: . gdk/x11

[From: subversion at stage.maemo.org]

Author: kris
Date: 2009-11-28 21:15:56 +0200 (Sat, 28 Nov 2009)
New Revision: 19530

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gdk/x11/gdkevents-x11.c
Log:
2009-11-28  Kristian Rietveld  <kris at lanedo.com>

	* gdk/x11/gdkevents-x11.c: Add forgotten MAEMO_CHANGES around
	chunks of the last patch (November 5) applied to this file.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-11-28 11:17:23 UTC (rev 19529)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-11-28 19:15:56 UTC (rev 19530)
@@ -1,3 +1,8 @@
+2009-11-28  Kristian Rietveld  <kris at lanedo.com>
+
+	* gdk/x11/gdkevents-x11.c: Add forgotten MAEMO_CHANGES around
+	chunks of the last patch (November 5) applied to this file.
+
 2009-11-27  Christian Dywan  <christian at lanedo.com>
 
 	Fixes: NB#146722 - [Arabic] Contacts doesnt support calls if the number

Modified: projects/haf/trunk/gtk+/gdk/x11/gdkevents-x11.c
===================================================================
--- projects/haf/trunk/gtk+/gdk/x11/gdkevents-x11.c	2009-11-28 11:17:23 UTC (rev 19529)
+++ projects/haf/trunk/gtk+/gdk/x11/gdkevents-x11.c	2009-11-28 19:15:56 UTC (rev 19530)
@@ -125,8 +125,10 @@
 				     XSettingsSetting *setting,
 				     void             *data);
 
+#ifdef MAEMO_CHANGES
 static gboolean check_net_wm_check_window (GdkScreenX11 *screen_x11);
 static void fetch_net_wm_check_window     (GdkScreen *screen);
+#endif /* MAEMO_CHANGES */
 
 /* Private variable declarations
  */
@@ -236,12 +238,14 @@
 					 gdk_wm_protocols_filter,   
 					 NULL);
 
+#ifdef MAEMO_CHANGES
   /* GdkScreenX11 need this in order to see some properties. */
   fetch_net_wm_check_window (display_x11->default_screen);
   if (GDK_SCREEN_X11(display_x11->default_screen)->wmspec_check_window == None)
     /* No WM, poll for the wm_check window. */
     g_timeout_add_seconds (10, (GSourceFunc)check_net_wm_check_window,
                            display_x11->default_screen);
+#endif /* MAEMO_CHANGES */
 }
 
 void
@@ -1020,9 +1024,11 @@
           /* careful, reentrancy */
           _gdk_x11_screen_window_manager_changed (GDK_SCREEN (screen_x11));
 
+#ifdef MAEMO_CHANGES
           /* Rediscover the WM window. */
           g_timeout_add_seconds (10, (GSourceFunc)check_net_wm_check_window,
                                  screen);
+#endif /* MAEMO_CHANGES */
         }
       
       /* Eat events on this window unless someone had wrapped
@@ -2628,6 +2634,7 @@
   return xevent.xproperty.time;
 }
 
+#ifdef MAEMO_CHANGES
 static gboolean
 check_net_wm_check_window (GdkScreenX11 *screen_x11)
 {
@@ -2635,6 +2642,7 @@
     fetch_net_wm_check_window (GDK_SCREEN (screen_x11));
   return screen_x11->wmspec_check_window == None;
 }
+#endif /* MAEMO_CHANGES */
 
 static void
 fetch_net_wm_check_window (GdkScreen *screen)
@@ -2690,14 +2698,18 @@
 
   if (gdk_error_trap_pop () == Success)
     {
+#ifdef MAEMO_CHANGES
       GdkWindow *window;
 
       /* We need to create a Gdkwindow in order to notice its destruction. */
+#endif /* MAEMO_CHANGES */
       screen_x11->wmspec_check_window = *xwindow;
       screen_x11->need_refetch_net_supported = TRUE;
       screen_x11->need_refetch_wm_name = TRUE;
+#ifdef MAEMO_CHANGES
       window = gdk_window_foreign_new_for_display (display, *xwindow);
       gdk_window_set_events (window, GDK_PROPERTY_CHANGE_MASK);
+#endif /* MAEMO_CHANGES */
       
       /* Careful, reentrancy */
       _gdk_x11_screen_window_manager_changed (GDK_SCREEN (screen_x11));