display: Unset grab_frame_action in meta_display_end_grab_op

Otherwise, if the user had moved the windows around using a mouse,
they can not be moved beyond the top edge of the primary monitor when
the tray needs to be brought up, . This is because
constrain_titlebar_visible looks at grab_frame_action and thinks that
the movement is being caused by the user trying to move the windows up
by grabbing the frame.

Fixes: https://bugzilla.gnome.org/677215

NEWS

@@ -1,14 +1,3 @@
-3.5.5
-=====
-* Fix flickering around windows when using window group [Tom; #681221]
-
-Contributor(s):
-  Tom Beckmann
-
-Translations:
-  Chao-Hsiung Liao [zh_HK, zh_TW], Matej Urbančič [sl], Fran Diéguez [gl],
-  Мирослав Николић [sr, sr@latin], Yaron Shahrabani [he], Kjartan Maraas [nb]
-
 3.5.4
 =====
 * Make it possible to reimplement move-to-workspace keybindings from plugins

configure.in

@@ -2,7 +2,7 @@ AC_PREREQ(2.50)
 
 m4_define([mutter_major_version], [3])
 m4_define([mutter_minor_version], [5])
-m4_define([mutter_micro_version], [5])
+m4_define([mutter_micro_version], [4])
 
 m4_define([mutter_version],
           [mutter_major_version.mutter_minor_version.mutter_micro_version])

po/gl.po

@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-31 02:02+0200\n"
-"PO-Revision-Date: 2012-07-31 02:02+0200\n"
+"POT-Creation-Date: 2012-06-25 00:08+0200\n"
+"PO-Revision-Date: 2012-06-25 00:09+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician <gnome-l10n-gl@gnome.org>\n"
 "Language: gl\n"
@@ -57,16 +57,16 @@ msgstr "Evento de campá"
 msgid "Unknown window information request: %d"
 msgstr "Petición de información de xanela descoñecida: %d"
 
-#: ../src/core/delete.c:114
+#: ../src/core/delete.c:111
 #, c-format
-msgid "%s is not responding."
-msgstr "%s non está respondendo."
+msgid "<tt>%s</tt> is not responding."
+msgstr "<tt>%s</tt> non está respondendo."
 
-#: ../src/core/delete.c:118
+#: ../src/core/delete.c:114
 msgid "Application is not responding."
 msgstr "O Aplicativo non está respondendo."
 
-#: ../src/core/delete.c:123
+#: ../src/core/delete.c:119
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -74,11 +74,11 @@ msgstr ""
 "Pode elixir esperar un momento para ver se continúa ou forzar ao aplicativo "
 "a pechar completamente."
 
-#: ../src/core/delete.c:130
+#: ../src/core/delete.c:126
 msgid "_Wait"
 msgstr "Espe_rar"
 
-#: ../src/core/delete.c:130
+#: ../src/core/delete.c:126
 msgid "_Force Quit"
 msgstr "_Forzar a saída"
 
@@ -92,7 +92,7 @@ msgstr "Falta a extensión %s que se require para a composición"
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Produciuse un fallo ao abrir a pantalla do X Window System «%s»\n"
 
-#: ../src/core/keybindings.c:844
+#: ../src/core/keybindings.c:852
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -161,7 +161,7 @@ msgstr "Imprimir versión"
 msgid "Mutter plugin to use"
 msgstr "Engadido de mutter que usar"
 
-#: ../src/core/prefs.c:1065
+#: ../src/core/prefs.c:1064
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -169,14 +169,14 @@ msgstr ""
 "Desactiváronse os arranxos para aplicativos danados. Pode que algúns "
 "aplicativos non se comporten correctamente.\n"
 
-#: ../src/core/prefs.c:1140
+#: ../src/core/prefs.c:1139
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr ""
 "Non foi posíbel analizar a descrición do tipo de letra «%s» da chave "
 "GSettings %s\n"
 
-#: ../src/core/prefs.c:1206
+#: ../src/core/prefs.c:1205
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -185,7 +185,7 @@ msgstr ""
 "«%s» atopados na base de datos de configuración non é un valor válido para o "
 "modificador do botón do rato\n"
 
-#: ../src/core/prefs.c:1724
+#: ../src/core/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -194,7 +194,7 @@ msgstr ""
 "«%s» atopados na base de datos de configuración non é un valor válido para a "
 "combinación de teclas «%s»\n"
 
-#: ../src/core/prefs.c:1821
+#: ../src/core/prefs.c:1820
 #, c-format
 msgid "Workspace %d"
 msgstr "Espazo de traballo %d"

po/he.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity.HEAD.he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-24 22:26+0300\n"
-"PO-Revision-Date: 2012-07-24 22:26+0200\n"
+"POT-Creation-Date: 2012-07-10 22:43+0300\n"
+"PO-Revision-Date: 2012-07-10 22:44+0200\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "Language: he\n"
@@ -47,24 +47,24 @@ msgstr "אירוע פעמון"
 msgid "Unknown window information request: %d"
 msgstr "Unknown window information request: %d"
 
-#: ../src/core/delete.c:114
+#: ../src/core/delete.c:111
 #, c-format
-msgid "%s is not responding."
-msgstr "%s אינו מגיב"
+msgid "<tt>%s</tt> is not responding."
+msgstr " <tt>%s</tt> אינו מגיב"
 
-#: ../src/core/delete.c:118
+#: ../src/core/delete.c:114
 msgid "Application is not responding."
 msgstr "היישום אינו מגיב."
 
-#: ../src/core/delete.c:123
+#: ../src/core/delete.c:119
 msgid "You may choose to wait a short while for it to continue or force the application to quit entirely."
 msgstr "באפשרותך להמתין זמן קצר ולתת ליישום להמשיך או להכריח את היישום להסתיים."
 
-#: ../src/core/delete.c:130
+#: ../src/core/delete.c:126
 msgid "_Wait"
 msgstr "ה_מתנה"
 
-#: ../src/core/delete.c:130
+#: ../src/core/delete.c:126
 msgid "_Force Quit"
 msgstr "_אילוץ סגירה"
 
@@ -78,7 +78,7 @@ msgstr "Missing %s extension required for compositing"
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Failed to open X Window System display '%s'\n"
 
-#: ../src/core/keybindings.c:844
+#: ../src/core/keybindings.c:852
 #, c-format
 msgid "Some other program is already using the key %s with modifiers %x as a binding\n"
 msgstr "תוכנית אחרת כבר משתמשת במקש %s עם המקש %x כצירוף\n"
@@ -279,7 +279,7 @@ msgid "Window manager error: "
 msgstr "Window manager error: "
 
 #. first time through
-#: ../src/core/window.c:7234
+#: ../src/core/window.c:7237
 #, c-format
 msgid "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER window as specified in the ICCCM.\n"
 msgstr "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER window as specified in the ICCCM.\n"
@@ -291,7 +291,7 @@ msgstr "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADE
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7899
+#: ../src/core/window.c:7902
 #, c-format
 msgid "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %d x %d and max size %d x %d; this doesn't make much sense.\n"
 msgstr "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %d x %d and max size %d x %d; this doesn't make much sense.\n"

po/nb.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutter 3.5.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-25 16:30+0200\n"
-"PO-Revision-Date: 2012-07-25 16:30+0200\n"
+"POT-Creation-Date: 2012-07-10 07:57+0200\n"
+"PO-Revision-Date: 2012-07-10 07:58+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-no@lister.ping.uio.no>\n"
 "Language: \n"
@@ -45,16 +45,16 @@ msgstr "Klokkehendelse"
 msgid "Unknown window information request: %d"
 msgstr "Ukjent forespørsel om vindusinformasjon: %d"
 
-#: ../src/core/delete.c:114
+#: ../src/core/delete.c:111
 #, c-format
-msgid "%s is not responding."
-msgstr "%s svarer ikke."
+msgid "<tt>%s</tt> is not responding."
+msgstr "<tt>%s</tt> svarer ikke."
 
-#: ../src/core/delete.c:118
+#: ../src/core/delete.c:114
 msgid "Application is not responding."
 msgstr "Programmet svarer ikke."
 
-#: ../src/core/delete.c:123
+#: ../src/core/delete.c:119
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -62,11 +62,11 @@ msgstr ""
 "Du kan velge å vente en kort stund for å se om det fortsetter eller tvinge "
 "programmet til å avslutte helt."
 
-#: ../src/core/delete.c:130
+#: ../src/core/delete.c:126
 msgid "_Wait"
 msgstr "_Vent"
 
-#: ../src/core/delete.c:130
+#: ../src/core/delete.c:126
 msgid "_Force Quit"
 msgstr "_Tvungen nedstenging"
 
@@ -80,7 +80,7 @@ msgstr "Mangler utvidelsen %s som kreves for komposittfunksjon"
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Feil under åpning av X Window System skjerm «%s»\n"
 
-#: ../src/core/keybindings.c:844
+#: ../src/core/keybindings.c:852
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -307,7 +307,7 @@ msgid "Window manager error: "
 msgstr "Feil i vindushåndterer: "
 
 #. first time through
-#: ../src/core/window.c:7234
+#: ../src/core/window.c:7237
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -323,7 +323,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7899
+#: ../src/core/window.c:7902
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "

po/sl.po

@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-07-17 07:18+0000\n"
-"PO-Revision-Date: 2012-07-19 09:58+0100\n"
+"POT-Creation-Date: 2012-06-06 11:44+0000\n"
+"PO-Revision-Date: 2012-06-08 21:23+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: \n"
@@ -51,24 +51,24 @@ msgstr "Dogodek zvonjenja"
 msgid "Unknown window information request: %d"
 msgstr "Zahteva izpisa podrobnosti neznanega okna: %d"
 
-#: ../src/core/delete.c:114
+#: ../src/core/delete.c:111
 #, c-format
-msgid "%s is not responding."
-msgstr "Program %s se ne odziva."
+msgid "<tt>%s</tt> is not responding."
+msgstr "<tt>%s</tt> se ne odziva."
 
-#: ../src/core/delete.c:118
+#: ../src/core/delete.c:114
 msgid "Application is not responding."
 msgstr "Program se ne odziva."
 
-#: ../src/core/delete.c:123
+#: ../src/core/delete.c:119
 msgid "You may choose to wait a short while for it to continue or force the application to quit entirely."
 msgstr "Lahko še malo počakate, če program morda spet začne delovati, ali pa vsilite končanje delovanja."
 
-#: ../src/core/delete.c:130
+#: ../src/core/delete.c:126
 msgid "_Wait"
 msgstr "_Počakaj"
 
-#: ../src/core/delete.c:130
+#: ../src/core/delete.c:126
 msgid "_Force Quit"
 msgstr "_Vsili konec"
 
@@ -83,7 +83,7 @@ msgid "Failed to open X Window System display '%s'\n"
 msgstr "Ni mogoče odpreti zaslona '%s' okenskega sistema X\n"
 
 # G:1 K:0 O:0
-#: ../src/core/keybindings.c:844
+#: ../src/core/keybindings.c:852
 #, c-format
 msgid "Some other program is already using the key %s with modifiers %x as a binding\n"
 msgstr "Tipko %s s spremenilnikom %x uporablja že nek drug program\n"
@@ -143,27 +143,27 @@ msgstr "Izpiši različico"
 msgid "Mutter plugin to use"
 msgstr "Vstavek Mutter za uporabo"
 
-#: ../src/core/prefs.c:1065
+#: ../src/core/prefs.c:1064
 msgid "Workarounds for broken applications disabled. Some applications may not behave properly.\n"
 msgstr "Obhodi za pokvarjene programe so onemogočeni. Nekateri programi se morda ne bodo odzivali na pričakovan način.\n"
 
-#: ../src/core/prefs.c:1140
+#: ../src/core/prefs.c:1139
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr "Ni mogoče razčleniti opisa pisave \"%s\" iz ključa GSettings %s\n"
 
-#: ../src/core/prefs.c:1206
+#: ../src/core/prefs.c:1205
 #, c-format
 msgid "\"%s\" found in configuration database is not a valid value for mouse button modifier\n"
 msgstr "\"%s\", najden v podatkovni zbirki nastavitev, ni veljaven spremenilnik za miškine gumbe.\n"
 
-#: ../src/core/prefs.c:1724
+#: ../src/core/prefs.c:1723
 #, c-format
 msgid "\"%s\" found in configuration database is not a valid value for keybinding \"%s\"\n"
 msgstr "\"%s\", najden v podatkovni zbirki nastavitev, ni veljaven ključ za tipkovno bližnjico \"%s\"\n"
 
 # G:1 K:0 O:0
-#: ../src/core/prefs.c:1821
+#: ../src/core/prefs.c:1820
 #, c-format
 msgid "Workspace %d"
 msgstr "Delovna površina %d"

src/compositor/meta-window-group.c

@@ -109,7 +109,6 @@ meta_window_group_paint (ClutterActor *actor)
   ClutterActor *stage;
   cairo_rectangle_int_t visible_rect, unredirected_rect;
   GList *children, *l;
-  gfloat group_x, group_y;
 
   MetaWindowGroup *window_group = META_WINDOW_GROUP (actor);
   MetaCompScreen *info = meta_screen_get_compositor_data (window_group->screen);
@@ -119,8 +118,6 @@ meta_window_group_paint (ClutterActor *actor)
       unredirected_window_region = cairo_region_create_rectangle (&unredirected_rect);
     }
 
-  clutter_actor_get_position (CLUTTER_ACTOR (window_group), &group_x, &group_y);
-
   /* We walk the list from top to bottom (opposite of painting order),
    * and subtract the opaque area of each window out of the visible
    * region that we pass to the windows below.
@@ -193,8 +190,6 @@ meta_window_group_paint (ClutterActor *actor)
       else if (META_IS_BACKGROUND_ACTOR (l->data))
         {
           MetaBackgroundActor *background_actor = l->data;
-
-          cairo_region_translate (visible_region, - group_x, - group_y);
           meta_background_actor_set_visible_region (background_actor, visible_region);
         }
     }

src/core/display.c

@@ -3764,6 +3764,8 @@ meta_display_end_grab_op (MetaDisplay *display,
   g_signal_emit (display, display_signals[GRAB_OP_END], 0,
                  display->grab_screen, display->grab_window, display->grab_op);
 
+  display->grab_frame_action = FALSE;
+
   if (display->grab_window != NULL)
     display->grab_window->shaken_loose = FALSE;