Imported Upstream version 3.0.3

configure.ac

@@ -2,7 +2,7 @@ AC_PREREQ(2.50)
 
 m4_define([muffin_major_version], [3])
 m4_define([muffin_minor_version], [0])
-m4_define([muffin_micro_version], [0])
+m4_define([muffin_micro_version], [3])
 
 m4_define([muffin_version],
           [muffin_major_version.muffin_minor_version.muffin_micro_version])

src/compositor/meta-window-actor.c

@@ -1694,7 +1694,9 @@ meta_window_actor_new (MetaWindow *window)
   /* Hang our compositor window state off the MetaWindow for fast retrieval */
   meta_window_set_compositor_private (window, G_OBJECT (self));
   
-  if (window->layer == META_LAYER_OVERRIDE_REDIRECT)
+  if (window->type == META_WINDOW_DND)
+    window_group = info->window_group;
+  else if (window->layer == META_LAYER_OVERRIDE_REDIRECT)
     window_group = info->top_window_group;
   else if (window->type == META_WINDOW_DESKTOP)
     window_group = info->bottom_window_group;

src/core/display.c

@@ -4937,6 +4937,9 @@ meta_resize_gravity_from_tile_mode (MetaTileMode mode)
       case META_TILE_LRC:
         gravity = SouthEastGravity;
         break;
+      case META_TILE_MAXIMIZE:
+        gravity = CenterGravity;
+        break;
       default:
         break;
     }

src/core/keybindings.c

@@ -2690,11 +2690,21 @@ handle_tile_action (MetaDisplay    *display,
                   action == META_KEYBINDING_ACTION_PUSH_SNAP_UP ||
                   action == META_KEYBINDING_ACTION_PUSH_SNAP_DOWN;
 
-  MetaTileMode new_mode = get_new_tile_mode (mode, window->tile_mode);
+  MetaTileMode new_mode = get_new_tile_mode (mode, META_WINDOW_MAXIMIZED (window) ?
+                                                       META_TILE_MAXIMIZE : window->tile_mode);
   if (new_mode == window->tile_mode)
     return;
 
-  meta_window_tile (window, new_mode, snap);
+  if (new_mode == META_TILE_MAXIMIZE)
+    {
+      meta_window_maximize (window,
+                            META_MAXIMIZE_HORIZONTAL |
+                            META_MAXIMIZE_VERTICAL);
+    }
+  else
+    {
+      meta_window_tile (window, new_mode, snap);
+    }
 }
 
 static void

src/core/window.c

@@ -3474,7 +3474,7 @@ meta_window_maximize_internal (MetaWindow        *window,
     meta_window_save_rect (window);
 
   meta_window_set_tile_type (window, META_WINDOW_TILE_TYPE_NONE);
-  window->tile_mode = META_TILE_MAXIMIZE;
+  window->tile_mode = META_TILE_NONE;
   notify_tile_type (window);
   normalize_tile_state (window);
 
@@ -3733,8 +3733,8 @@ meta_window_real_tile (MetaWindow *window, gboolean force)
      meta_window_save_rect (window);
   }
 
-  window->maximized_horizontally = FALSE || window->tile_mode == META_TILE_MAXIMIZE;
-  window->maximized_vertically = FALSE || window->tile_mode == META_TILE_MAXIMIZE;
+  window->maximized_horizontally = FALSE;
+  window->maximized_vertically = FALSE;
 
   if (window->tile_mode != META_TILE_NONE) {
       if (window->snap_queued || window->resizing_tile_type == META_WINDOW_TILE_TYPE_SNAPPED) {
@@ -9944,6 +9944,7 @@ update_tile_mode (MetaWindow *window)
       case META_TILE_LRC:
       case META_TILE_TOP:
       case META_TILE_BOTTOM:
+      case META_TILE_MAXIMIZE:
           if (!META_WINDOW_TILED_OR_SNAPPED (window))
               window->tile_mode = META_TILE_NONE;
           break;
@@ -10096,18 +10097,19 @@ meta_window_handle_mouse_grab_op_event (MetaWindow *window,
                                event->xbutton.x_root,
                                event->xbutton.y_root,
                                TRUE);
-
-              /* If a tiled window has been dragged free with a
-               * mouse resize without snapping back to the tiled
-               * state, it will end up with an inconsistent tile
-               * mode on mouse release; cleaning the mode earlier
-               * would break the ability to snap back to the tiled
-               * state, so we wait until mouse release.
-               */
-              if (window->tile_type == META_WINDOW_TILE_TYPE_NONE)
-                update_tile_mode (window);
             }
+
+          /* If a tiled window has been dragged free with a
+           * mouse resize without snapping back to the tiled
+           * state, it will end up with an inconsistent tile
+           * mode on mouse release; cleaning the mode earlier
+           * would break the ability to snap back to the tiled
+           * state, so we wait until mouse release.
+           */
+          if (window->tile_type == META_WINDOW_TILE_TYPE_NONE)
+            update_tile_mode (window);
         }
+
       window->maybe_retile_maximize = FALSE;
       meta_display_end_grab_op (window->display, event->xbutton.time);
       break;

src/ui/frames.c

@@ -234,20 +234,20 @@ static void
 update_style_contexts (MetaFrames *frames)
 {
   GtkStyleContext *style;
-  GList *variants, *variant;
+  GList *variant_list, *variant;
 
   if (frames->normal_style)
     g_object_unref (frames->normal_style);
   frames->normal_style = create_style_context (frames, NULL);
 
-  variants = g_hash_table_get_keys (frames->style_variants);
-  for (variant = variants; variant; variant = variants->next)
+  variant_list = g_hash_table_get_keys (frames->style_variants);
+  for (variant = variant_list; variant; variant = variant->next)
     {
       style = create_style_context (frames, (char *)variant->data);
       g_hash_table_insert (frames->style_variants,
                            g_strdup (variant->data), style);
     }
-  g_list_free (variants);
+  g_list_free (variant_list);
 }
 
 static void