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

[From: subversion at stage.maemo.org]

Author: kris
Date: 2007-01-03 16:02:07 +0200 (Wed, 03 Jan 2007)
New Revision: 8931

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): fix build by
	having the dropdown menu hint set the message hint.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-03 12:58:02 UTC (rev 8930)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-03 14:02:07 UTC (rev 8931)
@@ -1,5 +1,10 @@
 2007-01-03  Kristian Rietveld  <kris at imendio.com>
 
+	* gdk/x11/gdkwindow-x11.c (gdk_window_set_type_hint): fix build by
+	having the dropdown menu hint set the message hint.
+
+2007-01-03  Kristian Rietveld  <kris at imendio.com>
+
 	* gdk/x11/gdkdisplay-x11.c (gdk_display_open): allow to disable
 	XSHM via GDK_DISABLE_XSHM environment variable.
 

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 12:58:02 UTC (rev 8930)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkwindow-x11.c	2007-01-03 14:02:07 UTC (rev 8931)
@@ -2268,6 +2268,13 @@
       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");
@@ -2284,11 +2291,6 @@
     case GDK_WINDOW_TYPE_HINT_DND:
       atom = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_WINDOW_TYPE_DND");
       break;
-    /* MAEMO START */
-    case GDK_WINDOW_TYPE_HINT_MESSAGE:
-      atom = gdk_x11_get_xatom_by_name_for_display (display, "_MB_WM_WINDOW_TYPE_MESSAGE");
-      break;
-    /* MAEMO END */
     default:
       g_warning ("Unknown hint %d passed to gdk_window_set_type_hint", hint);
       /* Fall thru */