[maemo-commits] [maemo-commits] r9254 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gdk gdk/x11

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Tue Jan 23 14:51:15 EET 2007 
Author: timj
Date: 2007-01-23 14:51:03 +0200 (Tue, 23 Jan 2007)
New Revision: 9254

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/gdkwindow.h
   projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkinput-x11.c
   projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkwindow-x11.c
Log:
Tue Jan 23 13:49:31 2007  Tim Janik  <timj at imendio.com>

        * gdk/x11/gdkwindow-x11.c: 
        * gdk/gdkwindow.h: conditionalize maemo chanegs with MAEMO_CHANGES.




Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-23 12:44:21 UTC (rev 9253)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-23 12:51:03 UTC (rev 9254)
@@ -1,3 +1,8 @@
+Tue Jan 23 13:49:31 2007  Tim Janik  <timj at imendio.com>
+
+	* gdk/x11/gdkwindow-x11.c: 
+	* gdk/gdkwindow.h: conditionalize maemo chanegs with MAEMO_CHANGES.
+
 Tue Jan 23 13:16:20 2007  Tim Janik  <timj at imendio.com>
 
 	* configure.in: always define -DMAEMO_CHANGES to allow 

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/gdkwindow.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/gdkwindow.h	2007-01-23 12:44:21 UTC (rev 9253)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/gdkwindow.h	2007-01-23 12:51:03 UTC (rev 9254)
@@ -133,9 +133,9 @@
   GDK_WINDOW_TYPE_HINT_UTILITY,
   GDK_WINDOW_TYPE_HINT_DOCK,
   GDK_WINDOW_TYPE_HINT_DESKTOP,
-  /* MEAMO START */
+#ifdef MAEMO_CHANGES
   GDK_WINDOW_TYPE_HINT_MESSAGE,
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
   GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU = GDK_WINDOW_TYPE_HINT_MESSAGE,	/* A drop down menu (from a menubar) */
   GDK_WINDOW_TYPE_HINT_POPUP_MENU,	/* A popup menu (from right-click) */
   GDK_WINDOW_TYPE_HINT_TOOLTIP,

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkinput-x11.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkinput-x11.c	2007-01-23 12:44:21 UTC (rev 9253)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkinput-x11.c	2007-01-23 12:51:03 UTC (rev 9254)
@@ -242,14 +242,14 @@
   gdkdev->proximityout_type = 0;
   gdkdev->changenotify_type = 0;
 
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
   /* always enable extension events to get touchscreen pressure */
   if (gdkdev->info.source == GDK_SOURCE_PEN)
     {
       if (!gdk_device_set_mode (&gdkdev->info, GDK_MODE_SCREEN))
         g_warning ("Failed to enable pressure on `%s'", gdkdev->info.name);
     }
-  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
 
   return gdkdev;
 

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkwindow-x11.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkwindow-x11.c	2007-01-23 12:44:21 UTC (rev 9253)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkwindow-x11.c	2007-01-23 12:51:03 UTC (rev 9254)
@@ -1286,13 +1286,13 @@
 
   update_wm_hints (window, TRUE);
 
-  /* MAEMO START */
+#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;
-  /* MAEMO END */
+#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
@@ -1366,15 +1366,19 @@
                        xwindow,
 		       gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_STATE"),
                        XA_ATOM, 32,
-		       /* MAEMO START */
+#ifdef MAEMO_CHANGES
 		       propmode,
-		       /* MAEMO END */
+#else  /* !MAEMO_CHANGES */
+                       PropModeReplace,
+#endif /* !MAEMO_CHANGES */
                        (guchar*) atoms, i);
     }
-  /* MAEMO START */
-  /* Don't delete the property, unless we are replacing it */
+#ifdef MAEMO_CHANGES
+    /* Don't delete the property, unless we are replacing it */
   else if (propmode == PropModeReplace)
-  /* MAEMO END */
+#else  /* !MAEMO_CHANGES */
+  else
+#endif /* !MAEMO_CHANGES */
     {
       XDeleteProperty (xdisplay,
                        xwindow,
@@ -2271,6 +2275,11 @@
     case GDK_WINDOW_TYPE_HINT_DESKTOP:
       atom = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_WINDOW_TYPE_DESKTOP");
       break;
+#ifndef MAEMO_CHANGES
+    case GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU:
+      atom = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_WINDOW_TYPE_DROPDOWN_MENU");
+      break;
+#endif /* !MAEMO_CHANGES */
     case GDK_WINDOW_TYPE_HINT_POPUP_MENU:
       atom = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_WINDOW_TYPE_POPUP_MENU");
       break;
@@ -2287,7 +2296,7 @@
       atom = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_WINDOW_TYPE_DND");
       break;
     default:
-      /* MAEMO START */
+#ifdef MAEMO_CHANGES
       /* The dropdown menu and message hints share the same integer at
        * this moment.  Remove this once the ABI restore patch has been
        * committed.
@@ -2302,7 +2311,7 @@
 	  atom = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_WINDOW_TYPE_DROPDOWN_MENU");
 	  break;
 	}
-      /* MAEMO END */
+#endif /* MAEMO_CHANGES */
       g_warning ("Unknown hint %d passed to gdk_window_set_type_hint", hint);
       /* Fall thru */
     case GDK_WINDOW_TYPE_HINT_NORMAL:
@@ -2383,10 +2392,10 @@
 	    type = GDK_WINDOW_TYPE_HINT_COMBO;
 	  else if (atom == gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_WINDOW_TYPE_DND"))
 	    type = GDK_WINDOW_TYPE_HINT_DND;
-	  /* MAEMO START */
+#ifdef MAEMO_CHANGES
 	  else if (atom == gdk_x11_get_xatom_by_name_for_display (display, "_MB_WM_WINDOW_TYPE_MESSAGE"))
 	    type = GDK_WINDOW_TYPE_HINT_MESSAGE;
-	  /* MAEMO END */
+#endif /* MAEMO_CHANGES */
         }
 
       if (type_return != None && data != NULL)
More information about the maemo-commits mailing list