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

[From: subversion at stage.maemo.org]

Author: kris
Date: 2007-01-03 16:55:38 +0200 (Wed, 03 Jan 2007)
New Revision: 8934

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkwindow-x11.c
Log:
2007-01-03  Kristian Rietveld  <kris at imendio.com>

	* gdk/x11/gdkwindow-x11.c (gdk_window_set_type_hint): revert
	previous fix build patch and move the dropdown and message hint cases
	to default: as per Tim's suggestion.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-03 14:22:50 UTC (rev 8933)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-03 14:55:38 UTC (rev 8934)
@@ -1,5 +1,11 @@
 2007-01-03  Kristian Rietveld  <kris at imendio.com>
 
+	* gdk/x11/gdkwindow-x11.c (gdk_window_set_type_hint): revert
+	previous fix build patch and move the dropdown and message hint cases
+	to default: as per Tim's suggestion.
+
+2007-01-03  Kristian Rietveld  <kris at imendio.com>
+
 	* gdk/x11/gdkwindow-x11.c (utf8_is_latin1),
 	(set_text_property), (set_wm_name), (gdk_window_set_title),
 	(gdk_window_set_icon_name): disable code setting legacy ICCCM

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-03 14:22:50 UTC (rev 8933)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkwindow-x11.c	2007-01-03 14:55:38 UTC (rev 8934)
@@ -2266,16 +2266,6 @@
     case GDK_WINDOW_TYPE_HINT_DESKTOP:
       atom = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_WINDOW_TYPE_DESKTOP");
       break;
-    case GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU:
-      atom = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_WINDOW_TYPE_DROPDOWN_MENU");
-      /* MAEMO START */
-      /* The dropdown menu and message hints share the same integer at
-       * this moment.  Remove this once the platform drops the message hint
-       * and moves over to the notification hint.
-       */
-      atom = gdk_x11_get_xatom_by_name_for_display (display, "_MB_WM_WINDOW_TYPE_MESSAGE");
-      /* MAEMO END */
-      break;
     case GDK_WINDOW_TYPE_HINT_POPUP_MENU:
       atom = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_WINDOW_TYPE_POPUP_MENU");
       break;
@@ -2292,6 +2282,22 @@
       atom = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_WINDOW_TYPE_DND");
       break;
     default:
+      /* MAEMO START */
+      /* The dropdown menu and message hints share the same integer at
+       * this moment.  Remove this once the ABI restore patch has been
+       * committed.
+       */
+      if (hint == GDK_WINDOW_TYPE_HINT_MESSAGE)
+        {
+          atom = gdk_x11_get_xatom_by_name_for_display (display, "_MB_WM_WINDOW_TYPE_MESSAGE");
+	  break;
+	}
+      else if (hint == GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU)
+        {
+	  atom = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_WINDOW_TYPE_DROPDOWN_MENU");
+	  break;
+	}
+      /* MAEMO END */
       g_warning ("Unknown hint %d passed to gdk_window_set_type_hint", hint);
       /* Fall thru */
     case GDK_WINDOW_TYPE_HINT_NORMAL: