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

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-06-19 14:35:27 +0300 (Tue, 19 Jun 2007)
New Revision: 12377

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gdk/x11/gdkwindow-x11.c
Log:
2007-06-19  Xan Lopez  <xan.lopez at nokia.com>

	* gdk/x11/gdkwindow-x11.c (show_window_internal): drop MAEMO_CHANGES code
	to use _NET_WM_STATE data on the object as property mode for XChangeProperty.


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-06-19 11:30:08 UTC (rev 12376)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-06-19 11:35:27 UTC (rev 12377)
@@ -1,3 +1,8 @@
+2007-06-19  Xan Lopez  <xan.lopez at nokia.com>
+
+	* gdk/x11/gdkwindow-x11.c (show_window_internal): drop MAEMO_CHANGES code
+	to use _NET_WM_STATE data on the object as property mode for XChangeProperty.
+
 2007-06-13  Tomas Junnonen  <tomas.junnonen at nokia.com>
 
 	* gtk/gtkenums.h, gtk/gtktextview.c: Add HILDON_GTK_INPUT_MODE_MULTILINE

Modified: projects/haf/trunk/gtk+/gdk/x11/gdkwindow-x11.c
===================================================================
--- projects/haf/trunk/gtk+/gdk/x11/gdkwindow-x11.c	2007-06-19 11:30:08 UTC (rev 12376)
+++ projects/haf/trunk/gtk+/gdk/x11/gdkwindow-x11.c	2007-06-19 11:35:27 UTC (rev 12377)
@@ -1284,9 +1284,6 @@
   GdkToplevelX11 *toplevel;
   Atom atoms[9];
   gint i;
-#ifdef MAEMO_CHANGES
-  gint propmode;
-#endif /* MAEMO_CHANGES */
 
   private = (GdkWindowObject*) window;
   toplevel = _gdk_x11_window_get_toplevel (window);
@@ -1296,14 +1293,6 @@
 
   update_wm_hints (window, TRUE);
 
-#ifdef MAEMO_CHANGES
-  /* If the window has _NET_WM_STATE key specified, use it as the property mode */
-  propmode = (gint)g_object_get_data (G_OBJECT (window), "_NET_WM_STATE");
-
-  if (!propmode)
-    propmode = PropModeReplace;
-#endif /* MAEMO_CHANGES */
-  
   /* We set the spec hints regardless of whether the spec is supported,
    * since it can't hurt and it's kind of expensive to check whether
    * it's supported.
@@ -1376,19 +1365,10 @@
                        xwindow,
 		       gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_STATE"),
                        XA_ATOM, 32,
-#ifdef MAEMO_CHANGES
-		       propmode,
-#else  /* !MAEMO_CHANGES */
                        PropModeReplace,
-#endif /* !MAEMO_CHANGES */
                        (guchar*) atoms, i);
     }
-#ifdef MAEMO_CHANGES
-    /* Don't delete the property, unless we are replacing it */
-  else if (propmode == PropModeReplace)
-#else  /* !MAEMO_CHANGES */
   else
-#endif /* !MAEMO_CHANGES */
     {
       XDeleteProperty (xdisplay,
                        xwindow,