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

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-03-13 15:34:46 +0200 (Tue, 13 Mar 2007)
New Revision: 10543

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/gdkwindow-x11.c
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c
Log:
2007-03-13  Michael Natterer  <mitch at imendio.com>

	* gdk/gdkwindow.h (enum GdkWindowTypeHint): remove
	GDK_WINDOW_TYPE_HINT_MESSAGE.

	* gdk/x11/gdkwindow-x11.c (gdk_window_set_type_hint)
	(gdk_window_get_type_hint): remove compat support for
	TYPE_HINT_MESSAGE.

	* gtk/gtkmenu.c (gtk_menu_window_visibility_notify_event): use
	TYPE_HINT_NOTIFICATION instead of TYPE_HINT_MESSAGE.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-03-13 13:23:35 UTC (rev 10542)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-03-13 13:34:46 UTC (rev 10543)
@@ -1,3 +1,15 @@
+2007-03-13  Michael Natterer  <mitch at imendio.com>
+
+	* gdk/gdkwindow.h (enum GdkWindowTypeHint): remove
+	GDK_WINDOW_TYPE_HINT_MESSAGE.
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_set_type_hint)
+	(gdk_window_get_type_hint): remove compat support for
+	TYPE_HINT_MESSAGE.
+
+	* gtk/gtkmenu.c (gtk_menu_window_visibility_notify_event): use
+	TYPE_HINT_NOTIFICATION instead of TYPE_HINT_MESSAGE.
+
 2007-03-13  Xan Lopez  <xan.lopez at nokia.com>
 
 	* gtk/gtkwindow.h:

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/gdkwindow.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/gdkwindow.h	2007-03-13 13:23:35 UTC (rev 10542)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/gdkwindow.h	2007-03-13 13:34:46 UTC (rev 10543)
@@ -139,10 +139,6 @@
   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

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-03-13 13:23:35 UTC (rev 10542)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkwindow-x11.c	2007-03-13 13:34:46 UTC (rev 10543)
@@ -2277,11 +2277,9 @@
     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;
@@ -2298,22 +2296,6 @@
       atom = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_WINDOW_TYPE_DND");
       break;
     default:
-#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.
-       */
-      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;
-	}
-#endif /* MAEMO_CHANGES */
       g_warning ("Unknown hint %d passed to gdk_window_set_type_hint", hint);
       /* Fall thru */
     case GDK_WINDOW_TYPE_HINT_NORMAL:
@@ -2394,10 +2376,6 @@
 	    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;
-#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;
-#endif /* MAEMO_CHANGES */
         }
 
       if (type_return != None && data != NULL)

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c	2007-03-13 13:23:35 UTC (rev 10542)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c	2007-03-13 13:34:46 UTC (rev 10543)
@@ -5139,8 +5139,8 @@
           gdk_error_trap_push ();
           type = gdk_window_get_type_hint (win);
           if (!gdk_error_trap_pop () &&
-              (type != GDK_WINDOW_TYPE_HINT_MESSAGE)
-              && (type != GDK_WINDOW_TYPE_HINT_MENU))
+              (type != GDK_WINDOW_TYPE_HINT_NOTIFICATION) &&
+              (type != GDK_WINDOW_TYPE_HINT_MENU))
             {
               /* A non-message and non-menu window above us; close. */
               deactivate = TRUE;