gtk+ r19494 - in branches/gtk-2-10: . gdk/win32

[bratsche svn gnome org]

Author: bratsche
Date: Thu Feb  7 19:27:10 2008
New Revision: 19494
URL: http://svn.gnome.org/viewvc/gtk+?rev=19494&view=rev

Log:
2008-02-07  Cody Russell  <bratsche gnome org>

	Merge from trunk:

        * gdk/win32/gdkevents-win32.c
        * gdk/win32/gdkwindow-win32.c: Fixed two declarations in the middle
        of a block that were causing compile problems on old
        compilers. (#515053, reported by Kazuki IWAMOTO)



Modified:
   branches/gtk-2-10/ChangeLog
   branches/gtk-2-10/gdk/win32/gdkevents-win32.c
   branches/gtk-2-10/gdk/win32/gdkwindow-win32.c

Modified: branches/gtk-2-10/gdk/win32/gdkevents-win32.c
==============================================================================
--- branches/gtk-2-10/gdk/win32/gdkevents-win32.c	(original)
+++ branches/gtk-2-10/gdk/win32/gdkevents-win32.c	Thu Feb  7 19:27:10 2008
@@ -2870,23 +2870,27 @@
       break;
 
      case WM_MOUSEACTIVATE:
-       if (gdk_window_get_window_type (window) == GDK_WINDOW_TEMP 
-	   || !((GdkWindowObject *)window)->accept_focus)
-	 {
-	   *ret_valp = MA_NOACTIVATE;
-	   return_val = TRUE;
-	 }
-
-       GdkWindow *tmp = _gdk_modal_current ();
-
-       if (tmp != NULL)
-	 {
-	   if (gdk_window_get_toplevel (window) != tmp)
-	     {
-	       *ret_valp = MA_NOACTIVATEANDEAT;
-	       return_val = TRUE;
-	     }
-	 }
+       {
+	 GdkWindow *tmp;
+
+	 if (gdk_window_get_window_type (window) == GDK_WINDOW_TEMP 
+	     || !((GdkWindowObject *)window)->accept_focus)
+	   {
+	     *ret_valp = MA_NOACTIVATE;
+	     return_val = TRUE;
+	   }
+
+	 tmp = _gdk_modal_current ();
+
+	 if (tmp != NULL)
+	   {
+	     if (gdk_window_get_toplevel (window) != tmp)
+	       {
+		 *ret_valp = MA_NOACTIVATEANDEAT;
+		 return_val = TRUE;
+	       }
+	   }
+       }
 
        break;
 

Modified: branches/gtk-2-10/gdk/win32/gdkwindow-win32.c
==============================================================================
--- branches/gtk-2-10/gdk/win32/gdkwindow-win32.c	(original)
+++ branches/gtk-2-10/gdk/win32/gdkwindow-win32.c	Thu Feb  7 19:27:10 2008
@@ -2093,6 +2093,8 @@
 void
 _gdk_remove_modal_window (GdkWindow *window)
 {
+  GSList *tmp;
+
   g_return_if_fail (window != NULL);
 
   /* It's possible to be NULL here if someone sets the modal hint of the window
@@ -2102,7 +2104,7 @@
 
   /* Find the requested window in the stack and remove it.  Yeah, I realize this
    * means we're not a 'real stack', strictly speaking.  Sue me. :) */
-  GSList *tmp = g_slist_find (modal_window_stack, window);
+  tmp = g_slist_find (modal_window_stack, window);
   if (tmp != NULL)
     {
       modal_window_stack = g_slist_delete_link (modal_window_stack, tmp);