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

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-01-24 12:13:20 +0200 (Wed, 24 Jan 2007)
New Revision: 9282

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/gdkwindow.h
Log:
2007-01-24  Michael Natterer  <mitch at imendio.com>

	* gdk/gdkwindow.h (enum GdkWindowTypeHint): do not use maemo enum
	values outside the #ifdef MAEMO_CHANGES blocks.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-24 10:12:27 UTC (rev 9281)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-24 10:13:20 UTC (rev 9282)
@@ -1,3 +1,8 @@
+2007-01-24  Michael Natterer  <mitch at imendio.com>
+
+	* gdk/gdkwindow.h (enum GdkWindowTypeHint): do not use maemo enum
+	values outside the #ifdef MAEMO_CHANGES blocks.
+
 2007-01-23  Michael Natterer  <mitch at imendio.com>
 
 	Backport configurable GtkComboBox arrow size from upstream trunk:

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-24 10:12:27 UTC (rev 9281)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/gdkwindow.h	2007-01-24 10:13:20 UTC (rev 9282)
@@ -133,15 +133,15 @@
   GDK_WINDOW_TYPE_HINT_UTILITY,
   GDK_WINDOW_TYPE_HINT_DOCK,
   GDK_WINDOW_TYPE_HINT_DESKTOP,
-#ifdef MAEMO_CHANGES
-  GDK_WINDOW_TYPE_HINT_MESSAGE,
-#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_DROPDOWN_MENU,	/* A drop down menu (from a menubar) */
   GDK_WINDOW_TYPE_HINT_POPUP_MENU,	/* A popup menu (from right-click) */
   GDK_WINDOW_TYPE_HINT_TOOLTIP,
   GDK_WINDOW_TYPE_HINT_NOTIFICATION,
   GDK_WINDOW_TYPE_HINT_COMBO,
   GDK_WINDOW_TYPE_HINT_DND
+#ifdef MAEMO_CHANGES
+  , GDK_WINDOW_TYPE_HINT_MESSAGE = GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU
+#endif /* MAEMO_CHANGES */
 } GdkWindowTypeHint;
 
 /* The next two enumeration values current match the