keybindings: Fix ungrabbing of keys

XUngrabKey() doesn't work for XI2 grabs and XI2 doesn't provide API with similar functionality. As such, we have to refactor the code a bit to be able to call XIUngrabKeycode() for each key binding, then reload keybindings and finally grab the new ones. https://bugzilla.gnome.org/show_bug.cgi?id=697003
Grab and emit a signal when XK_ISO_Next_Group is pressed
2013-04-04 12:00:08 +02:00 · 2013-04-04 12:00:07 +02:00 · 2013-04-01 14:21:03 +02:00 · 2013-04-01 14:21:03 +02:00
20 changed files with 506 additions and 780 deletions
--- a/50
+++ b/50
@@ -1,53 +1,3 @@
-3.8.4
-=====
-* Workaround failure to bring back shell interface after fullscreen game in some situations [Adel; #701224]
-* Fix sluggish and stuck pointers moving windows [Adel, Jasper: #699777]
-* Reduce log spew [Adel, Jasper; #702564, #703970]
-* Touch screen fixes [Jasper: #697192]
-* Fix rendering of large background images [Jasper, Ray: #702283]
-
-Contributors:
- Adel Gadllah, Jasper St. Pierre, Ray Strode
-
-3.8.3
-=====
-* Add support for string-array preferences [Florian; #700223]
-* Fix shade window action [Stef; #693714]
-* Add API to freeze/unfreeze the keyboard [Rui; #697001]
-* Grab and emit a signal when XK_ISO_Next_Group is pressed [Rui; #697002]
-* Ensure events are always reported to the grab window [Rui; #701219]
-* Use new clutter_stage_set_paint_callback() function to prevent dropping
-  frames with frame synced toolkits [Owen; #698794]
-
-Contributors:
-  Rui Matos, Florian Müllner, Stef Walter, Owen W. Taylor
-
-3.8.2
-=====
-* Fix miscellaneous memory leaks [Pavel; #698710]
-* Fix binding remaining grabbed after clearing all strokes [Rui; #697000]
-* Misc fixes [Stef; #698179]
-
-Contributors:
-  Rui Matos, Pavel Vasin, Stef Walter
-
-Translations:
-  Kjartan Maraas [nb]
-
-3.8.1
-=====
-* Fix crash when getting default font [Bastien; #696814]
-* Fix ungrabbing of keybindings [Rui; #697003]
-* Misc fixes and cleanups [Jasper, Simon; #697758]
-
-Contributors:
-  Jasper Lievisse Adriaanse, Rui Matos, Simon McVittie, Bastien Nocera
-
-Translations:
-  Guillaume Desmottes [fr], Shankar Prasad [kn], Bruce Cowan [en_GB],
-  Andika Triwidada [id], Yaron Shahrabani [he], Kjartan Maraas [nb],
-  Gheyret Kenji [ug]
-
 3.8.0
 =====
 * Address major memory leak when changing backgrounds [Ray; #696157]
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.50)

 m4_define([mutter_major_version], [3])
 m4_define([mutter_minor_version], [8])
-m4_define([mutter_micro_version], [4])
+m4_define([mutter_micro_version], [0])

 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])
@@ -73,7 +73,7 @@ MUTTER_PC_MODULES="
   cairo >= 1.10.0
   gsettings-desktop-schemas >= 3.7.3
   xcomposite >= 0.2 xfixes xrender xdamage xi >= 1.6.0
-   $CLUTTER_PACKAGE >= 1.14.3
+   $CLUTTER_PACKAGE >= 1.13.5
   cogl-1.0 >= 1.13.3
 "

--- a/po/he.po
+++ b/po/he.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity.HEAD.he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-03 08:27+0300\n"
-"PO-Revision-Date: 2013-04-03 08:28+0200\n"
+"POT-Creation-Date: 2013-02-21 19:11+0200\n"
+"PO-Revision-Date: 2013-02-21 19:14+0200\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "Language: he\n"
@@ -209,16 +209,16 @@ msgstr "פיצול הצפייה מימין"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:568
+#: ../src/compositor/compositor.c:507
 #, c-format
 msgid "Another compositing manager is already running on screen %i on display \"%s\"."
 msgstr "מנהל תצוגת חלונות אחר כבר פועל במסך %i בתצוגה „%s“."

-#: ../src/compositor/meta-background.c:1064
+#: ../src/compositor/meta-background.c:1116
 msgid "background texture could not be created from file"
 msgstr "לא ניתן ליצור מרקם רקע מקובץ"

-#: ../src/core/bell.c:322
+#: ../src/core/bell.c:320
 msgid "Bell event"
 msgstr "אירוע פעמון"

@@ -248,56 +248,51 @@ msgstr "ה_מתנה"
 msgid "_Force Quit"
 msgstr "_אילוץ סגירה"

-#: ../src/core/display.c:401
+#: ../src/core/display.c:392
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Missing %s extension required for compositing"

-#: ../src/core/display.c:493
+#: ../src/core/display.c:484
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Failed to open X Window System display '%s'\n"

-#: ../src/core/keybindings.c:935
+#: ../src/core/keybindings.c:876
 #, c-format
 msgid "Some other program is already using the key %s with modifiers %x as a binding\n"
 msgstr "תכנית אחרת כבר משתמשת במקש %s עם המקש %x כצירוף\n"

-#: ../src/core/keybindings.c:1135
-#, c-format
-msgid "\"%s\" is not a valid accelerator\n"
-msgstr "\"%s\" אינו מקש האצה תקני\n"
-
-#: ../src/core/main.c:197
+#: ../src/core/main.c:196
 msgid "Disable connection to session manager"
 msgstr "Disable connection to session manager"

-#: ../src/core/main.c:203
+#: ../src/core/main.c:202
 msgid "Replace the running window manager"
 msgstr "Replace the running window manager"

-#: ../src/core/main.c:209
+#: ../src/core/main.c:208
 msgid "Specify session management ID"
 msgstr "Specify session management ID"

-#: ../src/core/main.c:214
+#: ../src/core/main.c:213
 msgid "X Display to use"
 msgstr "X Display to use"

-#: ../src/core/main.c:220
+#: ../src/core/main.c:219
 msgid "Initialize session from savefile"
 msgstr "Initialize session from savefile"

-#: ../src/core/main.c:226
+#: ../src/core/main.c:225
 msgid "Make X calls synchronous"
 msgstr "Make X calls synchronous"

-#: ../src/core/main.c:534
+#: ../src/core/main.c:494
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "Failed to scan themes directory: %s\n"

-#: ../src/core/main.c:550
+#: ../src/core/main.c:510
 #, c-format
 msgid "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
 msgstr "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@@ -323,51 +318,51 @@ msgstr "Print version"
 msgid "Mutter plugin to use"
 msgstr "תוסף ה־mutter לשימוש"

-#: ../src/core/prefs.c:1095
+#: ../src/core/prefs.c:1087
 msgid "Workarounds for broken applications disabled. Some applications may not behave properly.\n"
 msgstr "Workarounds for broken applications disabled. Some applications may not behave properly.\n"

-#: ../src/core/prefs.c:1170
+#: ../src/core/prefs.c:1162
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr "Could not parse font description \"%s\" from GSettings key %s\n"

-#: ../src/core/prefs.c:1236
+#: ../src/core/prefs.c:1228
 #, c-format
 msgid "\"%s\" found in configuration database is not a valid value for mouse button modifier\n"
 msgstr "\"%s\" found in configuration database is not a valid value for mouse button modifier\n"

-#: ../src/core/prefs.c:1788
+#: ../src/core/prefs.c:1780
 #, c-format
 msgid "\"%s\" found in configuration database is not a valid value for keybinding \"%s\"\n"
 msgstr "\"%s\" found in configuration database is not a valid value for keybinding \"%s\"\n"

-#: ../src/core/prefs.c:1887
+#: ../src/core/prefs.c:1879
 #, c-format
 msgid "Workspace %d"
 msgstr "סביבת עבודה %d"

-#: ../src/core/screen.c:691
+#: ../src/core/screen.c:673
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Screen %d on display '%s' is invalid\n"

-#: ../src/core/screen.c:707
+#: ../src/core/screen.c:689
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager; try using the --replace option to replace the current window manager.\n"
 msgstr "Screen %d on display \"%s\" already has a window manager; try using the --replace option to replace the current window manager.\n"

-#: ../src/core/screen.c:734
+#: ../src/core/screen.c:716
 #, c-format
 msgid "Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "Could not acquire window manager selection on screen %d display \"%s\"\n"

-#: ../src/core/screen.c:812
+#: ../src/core/screen.c:794
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Screen %d on display \"%s\" already has a window manager\n"

-#: ../src/core/screen.c:998
+#: ../src/core/screen.c:979
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Could not release screen %d on display \"%s\"\n"
@@ -426,45 +421,45 @@ msgstr "Unknown element %s"
 msgid "These windows do not support &quot;save current setup&quot; and will have to be restarted manually next time you log in."
 msgstr "חלונות אלו אינם תומכים ב&quot;שמירת ההגדרות הנוכחיות&quot;, ויהיה צורך באתחול ידני בכניסה הבאה שלך."

-#: ../src/core/util.c:84
+#: ../src/core/util.c:80
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "Failed to open debug log: %s\n"

-#: ../src/core/util.c:94
+#: ../src/core/util.c:90
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "Failed to fdopen() log file %s: %s\n"

-#: ../src/core/util.c:100
+#: ../src/core/util.c:96
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "Opened log file %s\n"

-#: ../src/core/util.c:119
+#: ../src/core/util.c:115
 #: ../src/tools/mutter-message.c:149
 #, c-format
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter הודר ללא תמיכה במצב פירוט\n"

-#: ../src/core/util.c:264
+#: ../src/core/util.c:259
 msgid "Window manager: "
 msgstr "Window manager: "

-#: ../src/core/util.c:412
+#: ../src/core/util.c:407
 msgid "Bug in window manager: "
 msgstr "Bug in window manager: "

-#: ../src/core/util.c:443
+#: ../src/core/util.c:438
 msgid "Window manager warning: "
 msgstr "Window manager warning: "

-#: ../src/core/util.c:471
+#: ../src/core/util.c:466
 msgid "Window manager error: "
 msgstr "Window manager error: "

 #. first time through
-#: ../src/core/window.c:7596
+#: ../src/core/window.c:7504
 #, 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"
@@ -476,7 +471,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:8320
+#: ../src/core/window.c:8228
 #, 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"
@@ -816,247 +811,247 @@ msgstr "Mod5"
 msgid "%d x %d"
 msgstr "%d x %d"

-#: ../src/ui/theme.c:236
+#: ../src/ui/theme.c:235
 msgid "top"
 msgstr "top"

-#: ../src/ui/theme.c:238
+#: ../src/ui/theme.c:237
 msgid "bottom"
 msgstr "bottom"

-#: ../src/ui/theme.c:240
+#: ../src/ui/theme.c:239
 msgid "left"
 msgstr "left"

-#: ../src/ui/theme.c:242
+#: ../src/ui/theme.c:241
 msgid "right"
 msgstr "right"

-#: ../src/ui/theme.c:270
+#: ../src/ui/theme.c:269
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "frame geometry does not specify \"%s\" dimension"

-#: ../src/ui/theme.c:289
+#: ../src/ui/theme.c:288
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "frame geometry does not specify dimension \"%s\" for border \"%s\""

-#: ../src/ui/theme.c:326
+#: ../src/ui/theme.c:325
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "Button aspect ratio %g is not reasonable"

-#: ../src/ui/theme.c:338
+#: ../src/ui/theme.c:337
 #, c-format
 msgid "Frame geometry does not specify size of buttons"
 msgstr "Frame geometry does not specify size of buttons"

-#: ../src/ui/theme.c:1051
+#: ../src/ui/theme.c:1050
 #, c-format
 msgid "Gradients should have at least two colors"
 msgstr "Gradients should have at least two colors"

-#: ../src/ui/theme.c:1203
+#: ../src/ui/theme.c:1202
 #, c-format
 msgid "GTK custom color specification must have color name and fallback in parentheses, e.g. gtk:custom(foo,bar); could not parse \"%s\""
 msgstr "GTK custom color specification must have color name and fallback in parentheses, e.g. gtk:custom(foo,bar); could not parse \"%s\""

-#: ../src/ui/theme.c:1219
+#: ../src/ui/theme.c:1218
 #, c-format
 msgid "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-_ are valid"
 msgstr "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-_ are valid"

-#: ../src/ui/theme.c:1233
+#: ../src/ui/theme.c:1232
 #, c-format
 msgid "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not fit the format"
 msgstr "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not fit the format"

-#: ../src/ui/theme.c:1278
+#: ../src/ui/theme.c:1277
 #, c-format
 msgid "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
 msgstr "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] where NORMAL is the state; could not parse \"%s\""

-#: ../src/ui/theme.c:1292
+#: ../src/ui/theme.c:1291
 #, c-format
 msgid "GTK color specification must have a close bracket after the state, e.g. gtk:fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
 msgstr "GTK color specification must have a close bracket after the state, e.g. gtk:fg[NORMAL] where NORMAL is the state; could not parse \"%s\""

-#: ../src/ui/theme.c:1303
+#: ../src/ui/theme.c:1302
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "Did not understand state \"%s\" in color specification"

-#: ../src/ui/theme.c:1316
+#: ../src/ui/theme.c:1315
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "Did not understand color component \"%s\" in color specification"

-#: ../src/ui/theme.c:1345
+#: ../src/ui/theme.c:1344
 #, c-format
 msgid "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the format"
 msgstr "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the format"

-#: ../src/ui/theme.c:1356
+#: ../src/ui/theme.c:1355
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "Could not parse alpha value \"%s\" in blended color"

-#: ../src/ui/theme.c:1366
+#: ../src/ui/theme.c:1365
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"

-#: ../src/ui/theme.c:1413
+#: ../src/ui/theme.c:1412
 #, c-format
 msgid "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
 msgstr "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"

-#: ../src/ui/theme.c:1424
+#: ../src/ui/theme.c:1423
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "Could not parse shade factor \"%s\" in shaded color"

-#: ../src/ui/theme.c:1434
+#: ../src/ui/theme.c:1433
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "Shade factor \"%s\" in shaded color is negative"

-#: ../src/ui/theme.c:1463
+#: ../src/ui/theme.c:1462
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Could not parse color \"%s\""

-#: ../src/ui/theme.c:1780
+#: ../src/ui/theme.c:1779
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "Coordinate expression contains character '%s' which is not allowed"

-#: ../src/ui/theme.c:1807
+#: ../src/ui/theme.c:1806
 #, c-format
 msgid "Coordinate expression contains floating point number '%s' which could not be parsed"
 msgstr "Coordinate expression contains floating point number '%s' which could not be parsed"

-#: ../src/ui/theme.c:1821
+#: ../src/ui/theme.c:1820
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "Coordinate expression contains integer '%s' which could not be parsed"

-#: ../src/ui/theme.c:1942
+#: ../src/ui/theme.c:1941
 #, c-format
 msgid "Coordinate expression contained unknown operator at the start of this text: \"%s\""
 msgstr "Coordinate expression contained unknown operator at the start of this text: \"%s\""

-#: ../src/ui/theme.c:1999
+#: ../src/ui/theme.c:1998
 #, c-format
 msgid "Coordinate expression was empty or not understood"
 msgstr "Coordinate expression was empty or not understood"

-#: ../src/ui/theme.c:2112
-#: ../src/ui/theme.c:2122
-#: ../src/ui/theme.c:2156
+#: ../src/ui/theme.c:2111
+#: ../src/ui/theme.c:2121
+#: ../src/ui/theme.c:2155
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr "Coordinate expression results in division by zero"

-#: ../src/ui/theme.c:2164
+#: ../src/ui/theme.c:2163
 #, c-format
 msgid "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr "Coordinate expression tries to use mod operator on a floating-point number"

-#: ../src/ui/theme.c:2220
+#: ../src/ui/theme.c:2219
 #, c-format
 msgid "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "Coordinate expression has an operator \"%s\" where an operand was expected"

-#: ../src/ui/theme.c:2229
+#: ../src/ui/theme.c:2228
 #, c-format
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "Coordinate expression had an operand where an operator was expected"

-#: ../src/ui/theme.c:2237
+#: ../src/ui/theme.c:2236
 #, c-format
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "Coordinate expression ended with an operator instead of an operand"

-#: ../src/ui/theme.c:2247
+#: ../src/ui/theme.c:2246
 #, c-format
 msgid "Coordinate expression has operator \"%c\" following operator \"%c\" with no operand in between"
 msgstr "Coordinate expression has operator \"%c\" following operator \"%c\" with no operand in between"

-#: ../src/ui/theme.c:2398
-#: ../src/ui/theme.c:2443
+#: ../src/ui/theme.c:2397
+#: ../src/ui/theme.c:2442
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "Coordinate expression had unknown variable or constant \"%s\""

-#: ../src/ui/theme.c:2497
+#: ../src/ui/theme.c:2496
 #, c-format
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "Coordinate expression parser overflowed its buffer."

-#: ../src/ui/theme.c:2526
+#: ../src/ui/theme.c:2525
 #, c-format
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "Coordinate expression had a close parenthesis with no open parenthesis"

-#: ../src/ui/theme.c:2590
+#: ../src/ui/theme.c:2589
 #, c-format
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "Coordinate expression had an open parenthesis with no close parenthesis"

-#: ../src/ui/theme.c:2601
+#: ../src/ui/theme.c:2600
 #, c-format
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "Coordinate expression doesn't seem to have any operators or operands"

-#: ../src/ui/theme.c:2814
-#: ../src/ui/theme.c:2834
-#: ../src/ui/theme.c:2854
+#: ../src/ui/theme.c:2813
+#: ../src/ui/theme.c:2833
+#: ../src/ui/theme.c:2853
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "Theme contained an expression that resulted in an error: %s\n"

-#: ../src/ui/theme.c:4500
+#: ../src/ui/theme.c:4499
 #, c-format
 msgid "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be specified for this frame style"
 msgstr "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be specified for this frame style"

-#: ../src/ui/theme.c:5011
-#: ../src/ui/theme.c:5036
+#: ../src/ui/theme.c:5010
+#: ../src/ui/theme.c:5035
 #, c-format
 msgid "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"

-#: ../src/ui/theme.c:5084
+#: ../src/ui/theme.c:5083
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Failed to load theme \"%s\": %s\n"

-#: ../src/ui/theme.c:5220
-#: ../src/ui/theme.c:5227
-#: ../src/ui/theme.c:5234
-#: ../src/ui/theme.c:5241
-#: ../src/ui/theme.c:5248
+#: ../src/ui/theme.c:5219
+#: ../src/ui/theme.c:5226
+#: ../src/ui/theme.c:5233
+#: ../src/ui/theme.c:5240
+#: ../src/ui/theme.c:5247
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "No <%s> set for theme \"%s\""

-#: ../src/ui/theme.c:5256
+#: ../src/ui/theme.c:5255
 #, c-format
 msgid "No frame style set for window type \"%s\" in theme \"%s\", add a <window type=\"%s\" style_set=\"whatever\"/> element"
 msgstr "No frame style set for window type \"%s\" in theme \"%s\", add a <window type=\"%s\" style_set=\"whatever\"/> element"

-#: ../src/ui/theme.c:5663
-#: ../src/ui/theme.c:5725
-#: ../src/ui/theme.c:5788
+#: ../src/ui/theme.c:5662
+#: ../src/ui/theme.c:5724
+#: ../src/ui/theme.c:5787
 #, c-format
 msgid "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr "User-defined constants must begin with a capital letter; \"%s\" does not"

-#: ../src/ui/theme.c:5671
-#: ../src/ui/theme.c:5733
-#: ../src/ui/theme.c:5796
+#: ../src/ui/theme.c:5670
+#: ../src/ui/theme.c:5732
+#: ../src/ui/theme.c:5795
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "Constant \"%s\" has already been defined"
@@ -1428,7 +1423,7 @@ msgstr "מלל לא מורשה בתג <%s>"
 msgid "<%s> specified twice for this theme"
 msgstr "<%s> צוין פעמיים עבור ערכת נושא זו"

-#: ../src/ui/theme-parser.c:4336
+#: ../src/ui/theme-parser.c:4334
 #, c-format
 msgid "Failed to find a valid file for theme %s\n"
 msgstr "Failed to find a valid file for theme %s\n"
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mutter 3.8.x\n"
+"Project-Id-Version: mutter 3.7.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-13 10:30+0200\n"
-"PO-Revision-Date: 2013-04-03 14:11+0200\n"
+"POT-Creation-Date: 2013-03-04 14:57+0100\n"
+"PO-Revision-Date: 2013-03-04 14:57+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-no@lister.ping.uio.no>\n"
 "Language: \n"
@@ -205,18 +205,18 @@ msgstr "Visning delt til høyre"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:568
+#: ../src/compositor/compositor.c:509
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
 "\"."
 msgstr "En annen compositing manager kjører skjerm %i på display «%s»."

-#: ../src/compositor/meta-background.c:1076
+#: ../src/compositor/meta-background.c:1180
 msgid "background texture could not be created from file"
 msgstr "bakgrunnstekstur kunne ikke lages fra fil"

-#: ../src/core/bell.c:322
+#: ../src/core/bell.c:320
 msgid "Bell event"
 msgstr "Klokkehendelse"

@@ -260,7 +260,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:970
+#: ../src/core/keybindings.c:929
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -269,41 +269,41 @@ msgstr ""
 "Et annet program bruker allerede nøkkelen %s med modifikatorer %x som "
 "binding\n"

-#: ../src/core/keybindings.c:1151
+#: ../src/core/keybindings.c:1129
 #, c-format
 msgid "\"%s\" is not a valid accelerator\n"
 msgstr "«%s» er ikke en gyldig aksellerator\n"

-#: ../src/core/main.c:197
+#: ../src/core/main.c:196
 msgid "Disable connection to session manager"
 msgstr "Deaktiver tilkobling til sesjonshåndtereren"

-#: ../src/core/main.c:203
+#: ../src/core/main.c:202
 msgid "Replace the running window manager"
 msgstr "Erstatt kjørende vindushåndterer"

-#: ../src/core/main.c:209
+#: ../src/core/main.c:208
 msgid "Specify session management ID"
 msgstr "Oppgi sesjonshåndterings-ID"

-#: ../src/core/main.c:214
+#: ../src/core/main.c:213
 msgid "X Display to use"
 msgstr "X-skjerm som skal brukes"

-#: ../src/core/main.c:220
+#: ../src/core/main.c:219
 msgid "Initialize session from savefile"
 msgstr "Initier sesjonen fra en lagret fil"

-#: ../src/core/main.c:226
+#: ../src/core/main.c:225
 msgid "Make X calls synchronous"
 msgstr "Gjør X-kall synkrone"

-#: ../src/core/main.c:534
+#: ../src/core/main.c:533
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "Feil under søk i temakatalog: %s\n"

-#: ../src/core/main.c:550
+#: ../src/core/main.c:549
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@@ -333,7 +333,7 @@ msgstr "Skriv versjonsnummer"
 msgid "Mutter plugin to use"
 msgstr "Mutter-tillegg som skal brukes"

-#: ../src/core/prefs.c:1095
+#: ../src/core/prefs.c:1087
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -341,12 +341,12 @@ msgstr ""
 "Funksjonalitet for å gå rundt ødelagte programmer er deaktivert. Noen "
 "programmer vil kanskje ikke oppføre seg korrekt.\n"

-#: ../src/core/prefs.c:1170
+#: ../src/core/prefs.c:1162
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr "Kunne ikke tolke skriftbeskrivelsen «%s» fra GSettings-nøkkel %s\n"

-#: ../src/core/prefs.c:1236
+#: ../src/core/prefs.c:1228
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -355,7 +355,7 @@ msgstr ""
 "«%s» funnet i konfigurasjonsdatabasen er ikke en gyldig verdi for endring av "
 "musknapp\n"

-#: ../src/core/prefs.c:1789
+#: ../src/core/prefs.c:1780
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -364,17 +364,17 @@ msgstr ""
 "«%s» funnet i konfigurasjonsdatabasen er ikke en gyldig verdi for "
 "tastaturbinding «%s»\n"

-#: ../src/core/prefs.c:1888
+#: ../src/core/prefs.c:1879
 #, c-format
 msgid "Workspace %d"
 msgstr "Arbeidsområde %d"

-#: ../src/core/screen.c:691
+#: ../src/core/screen.c:673
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Skjerm %d på display «%s» er ugyldig\n"

-#: ../src/core/screen.c:707
+#: ../src/core/screen.c:689
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -383,19 +383,19 @@ msgstr ""
 "Skjerm %d på display «%s» har allerede en vindushåndterer; prøv å bruke "
 "flagget --replace for å erstatte aktiv vindushåndterer.\n"

-#: ../src/core/screen.c:734
+#: ../src/core/screen.c:716
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr ""
 "Kunne ikke hente utvalg fra vinduhåndterer på skjerm %d, display «%s»\n"

-#: ../src/core/screen.c:812
+#: ../src/core/screen.c:794
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Skjerm %d på display «%s» har allerede en vinduhåndterer\n"

-#: ../src/core/screen.c:998
+#: ../src/core/screen.c:979
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Kunne ikke slippe skjerm %d på display «%s»\n"
@@ -455,44 +455,44 @@ msgstr ""
 "Disse vinduene støtter ikke &quot;lagre aktiv konfigurasjon&quot;og vil "
 "måtte startes på nytt manuelt neste gang du logger inn."

-#: ../src/core/util.c:84
+#: ../src/core/util.c:80
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "Feil under åpning av feilsøkingslogg: %s\n"

-#: ../src/core/util.c:94
+#: ../src/core/util.c:90
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "Feil under fdopen() av loggfil %s: %s\n"

-#: ../src/core/util.c:100
+#: ../src/core/util.c:96
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "Åpnet loggfil %s\n"

-#: ../src/core/util.c:119 ../src/tools/mutter-message.c:149
+#: ../src/core/util.c:115 ../src/tools/mutter-message.c:149
 #, c-format
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter er kompilert uten støtte for «verbose» modus\n"

-#: ../src/core/util.c:264
+#: ../src/core/util.c:259
 msgid "Window manager: "
 msgstr "Vindushåndterer: "

-#: ../src/core/util.c:412
+#: ../src/core/util.c:407
 msgid "Bug in window manager: "
 msgstr "Feil i vindushåndterer: "

-#: ../src/core/util.c:443
+#: ../src/core/util.c:438
 msgid "Window manager warning: "
 msgstr "Advarsel fra vindushåndterer: "

-#: ../src/core/util.c:471
+#: ../src/core/util.c:466
 msgid "Window manager error: "
 msgstr "Feil i vindushåndterer: "

 #. first time through
-#: ../src/core/window.c:7598
+#: ../src/core/window.c:7539
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -508,7 +508,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:8322
+#: ../src/core/window.c:8263
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@@ -685,8 +685,6 @@ msgid ""
 "If enabled, new windows that are initially the size of the monitor "
 "automatically get maximized."
 msgstr ""
-"Nye vinduer som i utgangspunktet er samme størrelse som skjermen vil "
-"automatisk bli maksimert hvis denne slås på."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:19
 msgid "Select window from tab popup"
@@ -900,48 +898,48 @@ msgstr "Mod5"
 msgid "%d x %d"
 msgstr "%d x %d"

-#: ../src/ui/theme.c:236
+#: ../src/ui/theme.c:235
 msgid "top"
 msgstr "topp"

-#: ../src/ui/theme.c:238
+#: ../src/ui/theme.c:237
 msgid "bottom"
 msgstr "bunn"

-#: ../src/ui/theme.c:240
+#: ../src/ui/theme.c:239
 msgid "left"
 msgstr "venstre"

-#: ../src/ui/theme.c:242
+#: ../src/ui/theme.c:241
 msgid "right"
 msgstr "høyre"

-#: ../src/ui/theme.c:270
+#: ../src/ui/theme.c:269
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "rammegeometrien spesifiserer ikke «%s»-dimensjon"

-#: ../src/ui/theme.c:289
+#: ../src/ui/theme.c:288
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "rammegeometri spesifiserer ikke dimensjon «%s» for kant «%s»"

-#: ../src/ui/theme.c:326
+#: ../src/ui/theme.c:325
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "Aspektrate %g for knapp er ikke fornuftig"

-#: ../src/ui/theme.c:338
+#: ../src/ui/theme.c:337
 #, c-format
 msgid "Frame geometry does not specify size of buttons"
 msgstr "Rammegeometrien spesifiserer ikke størrelse på knapper"

-#: ../src/ui/theme.c:1051
+#: ../src/ui/theme.c:1050
 #, c-format
 msgid "Gradients should have at least two colors"
 msgstr "Gradienter må ha minst to farger"

-#: ../src/ui/theme.c:1203
+#: ../src/ui/theme.c:1202
 #, c-format
 msgid ""
 "GTK custom color specification must have color name and fallback in "
@@ -950,7 +948,7 @@ msgstr ""
 "Egendefinert GTK-fargespesifikasjon må ha fargenavn og reserve i parantes, f."
 "eks gtk:custom(foo,bar); kunne ikke lese «%s»"

-#: ../src/ui/theme.c:1219
+#: ../src/ui/theme.c:1218
 #, c-format
 msgid ""
 "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-"
@@ -959,7 +957,7 @@ msgstr ""
 "Ugyldig tegn «%c» i parameter color_name for gtk:custom, kun A-Za-z0-9-_ er "
 "gyldig"

-#: ../src/ui/theme.c:1233
+#: ../src/ui/theme.c:1232
 #, c-format
 msgid ""
 "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
@@ -968,7 +966,7 @@ msgstr ""
 "Gtk:custom-format er «gtk:custom(color_name,fallback)», «%s» passer ikke i "
 "formatet"

-#: ../src/ui/theme.c:1278
+#: ../src/ui/theme.c:1277
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -977,7 +975,7 @@ msgstr ""
 "GTK-fargespesifikasjon må ha tilstand i klammer, f.eks. gtk:fg[NORMAL], hvor "
 "NORMAL er tilstanden; kunne ikke lese «%s»"

-#: ../src/ui/theme.c:1292
+#: ../src/ui/theme.c:1291
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -986,17 +984,17 @@ msgstr ""
 "GTK-fargespesifikasjon må ha en avsluttende klamme etter tilstanden, f.eks. "
 "gtk:fg[NORMAL], hvor NORMAL er tilstanden; kunne ikke lese «%s»"

-#: ../src/ui/theme.c:1303
+#: ../src/ui/theme.c:1302
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "Forsto ikke tilstand «%s» i fargespesifikasjonen"

-#: ../src/ui/theme.c:1316
+#: ../src/ui/theme.c:1315
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "Forsto ikke fargekomponent «%s» i fargespesifikasjonen"

-#: ../src/ui/theme.c:1345
+#: ../src/ui/theme.c:1344
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@@ -1005,56 +1003,56 @@ msgstr ""
 "Blandingsformat er «blend/bg_color/fg_color/alpha», «%s» passer ikke i "
 "formatet"

-#: ../src/ui/theme.c:1356
+#: ../src/ui/theme.c:1355
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "Kunne ikke lese alpha-verdi «%s» i blandet farge"

-#: ../src/ui/theme.c:1366
+#: ../src/ui/theme.c:1365
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "Alpha-verdi «%s» i blandet farge er ikke mellom 0.0 og 1.0"

-#: ../src/ui/theme.c:1413
+#: ../src/ui/theme.c:1412
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
 msgstr ""
 "Skyggeformatet er «shade/base_color/factor», «%s» passer ikke i formatet"

-#: ../src/ui/theme.c:1424
+#: ../src/ui/theme.c:1423
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "Kunne ikke lese skyggefaktor «%s» i skyggelagt farge"

-#: ../src/ui/theme.c:1434
+#: ../src/ui/theme.c:1433
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "Skyggefaktor «%s» i skyggelagt farge er negativ"

-#: ../src/ui/theme.c:1463
+#: ../src/ui/theme.c:1462
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Kunne ikke lese farge «%s»"

-#: ../src/ui/theme.c:1780
+#: ../src/ui/theme.c:1779
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "Koordinatuttrykk inneholder tegn «%s» som ikke er tillatt"

-#: ../src/ui/theme.c:1807
+#: ../src/ui/theme.c:1806
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr "Koordinatuttrykk inneholder flyttall «%s» som ikke kunne tolkes"

-#: ../src/ui/theme.c:1821
+#: ../src/ui/theme.c:1820
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "Koordinatuttrykk inneholder heltall «%s» som ikke kunne tolkes"

-#: ../src/ui/theme.c:1942
+#: ../src/ui/theme.c:1941
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@@ -1063,39 +1061,39 @@ msgstr ""
 "Koordinatuttrykket inneholdt en ukjent operator ved begynnelsen av denne "
 "teksten: «%s»"

-#: ../src/ui/theme.c:1999
+#: ../src/ui/theme.c:1998
 #, c-format
 msgid "Coordinate expression was empty or not understood"
 msgstr "Koordinatuttrykket var tomt eller ble ikke forstått"

-#: ../src/ui/theme.c:2112 ../src/ui/theme.c:2122 ../src/ui/theme.c:2156
+#: ../src/ui/theme.c:2111 ../src/ui/theme.c:2121 ../src/ui/theme.c:2155
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr "Koordinatuttrykket resulterer i divisjon med null"

-#: ../src/ui/theme.c:2164
+#: ../src/ui/theme.c:2163
 #, c-format
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr "Koordinatuttrykket prøver å bruke mod-operator på et flyttall"

-#: ../src/ui/theme.c:2220
+#: ../src/ui/theme.c:2219
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "Koordinatuttrykket har en operator «%s» hvor en operand var ventet"

-#: ../src/ui/theme.c:2229
+#: ../src/ui/theme.c:2228
 #, c-format
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "Koordinatuttrykket hadde en operand hvor en operator var ventet"

-#: ../src/ui/theme.c:2237
+#: ../src/ui/theme.c:2236
 #, c-format
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "Koordinatuttrykket sluttet med en operator i stedet for en operand"

-#: ../src/ui/theme.c:2247
+#: ../src/ui/theme.c:2246
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -1104,38 +1102,38 @@ msgstr ""
 "Koordinatuttrykket har en operator «%c» etter en operator «%c» og ingen "
 "operand mellom dem."

-#: ../src/ui/theme.c:2398 ../src/ui/theme.c:2443
+#: ../src/ui/theme.c:2397 ../src/ui/theme.c:2442
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "Koordinatuttrykket haddeen ukjent variabel eller konstant «%s»"

-#: ../src/ui/theme.c:2497
+#: ../src/ui/theme.c:2496
 #, c-format
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "Tolkeren for koordinatuttrykk oversteg buffergrensen."

-#: ../src/ui/theme.c:2526
+#: ../src/ui/theme.c:2525
 #, c-format
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "Koordinatuttrykket hadde en parantes slutt uten parantes start"

-#: ../src/ui/theme.c:2590
+#: ../src/ui/theme.c:2589
 #, c-format
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "Koordinatuttrykket hadde en åpen parantes uten en avsluttende parantes"

-#: ../src/ui/theme.c:2601
+#: ../src/ui/theme.c:2600
 #, c-format
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr ""
 "Koordinatuttrykket ser ikke ut til å ha noen operatorer eller operander"

-#: ../src/ui/theme.c:2814 ../src/ui/theme.c:2834 ../src/ui/theme.c:2854
+#: ../src/ui/theme.c:2813 ../src/ui/theme.c:2833 ../src/ui/theme.c:2853
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "Tema inneholdt et uttrykk som resulterte i en feil: %s\n"

-#: ../src/ui/theme.c:4500
+#: ../src/ui/theme.c:4499
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -1144,25 +1142,25 @@ msgstr ""
 "<button function=«%s» state=«%s» draw_ops=«ett-eller-annet»/> må "
 "spesifiseres for denne rammestilen"

-#: ../src/ui/theme.c:5011 ../src/ui/theme.c:5036
+#: ../src/ui/theme.c:5010 ../src/ui/theme.c:5035
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 "Mangler <frame state=«%s» resize=«%s» focus=«%s» stil=«ett-eller-annet»/>"

-#: ../src/ui/theme.c:5084
+#: ../src/ui/theme.c:5083
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Klarte ikke å laste tema «%s»: %s\n"

-#: ../src/ui/theme.c:5220 ../src/ui/theme.c:5227 ../src/ui/theme.c:5234
-#: ../src/ui/theme.c:5241 ../src/ui/theme.c:5248
+#: ../src/ui/theme.c:5219 ../src/ui/theme.c:5226 ../src/ui/theme.c:5233
+#: ../src/ui/theme.c:5240 ../src/ui/theme.c:5247
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "<%s> er ikke satt for tema «%s»"

-#: ../src/ui/theme.c:5256
+#: ../src/ui/theme.c:5255
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -1171,14 +1169,14 @@ msgstr ""
 "Ingen rammestil satt for vindutype «%s» i tema «%s», legg til et <window "
 "type=«%s» style_set=«ett-eller-annet»/>-element"

-#: ../src/ui/theme.c:5663 ../src/ui/theme.c:5725 ../src/ui/theme.c:5788
+#: ../src/ui/theme.c:5662 ../src/ui/theme.c:5724 ../src/ui/theme.c:5787
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr ""
 "Brukerdefinerte konstanter må begynne med stor bokstav; «%s» gjør ikke det"

-#: ../src/ui/theme.c:5671 ../src/ui/theme.c:5733 ../src/ui/theme.c:5796
+#: ../src/ui/theme.c:5670 ../src/ui/theme.c:5732 ../src/ui/theme.c:5795
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "Konstant «%s» er allerede definert"
@@ -1559,7 +1557,7 @@ msgstr "Ingen tekst er tillatt inne i element <%s>"
 msgid "<%s> specified twice for this theme"
 msgstr "<%s> spesifisert to ganger for dette temaet"

-#: ../src/ui/theme-parser.c:4336
+#: ../src/ui/theme-parser.c:4334
 #, c-format
 msgid "Failed to find a valid file for theme %s\n"
 msgstr "Fant ikke en gyldig fil for tema %s\n"
--- a/po/ug.po
+++ b/po/ug.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-03-31 13:47+0000\n"
-"PO-Revision-Date: 2013-04-06 18:40+0900\n"
+"POT-Creation-Date: 2013-02-20 15:50+0000\n"
+"PO-Revision-Date: 2013-02-25 18:42+0900\n"
 "Last-Translator: Gheyret Kenji <gheyret@gmail.com>\n"
 "Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
 "Language: \n"
@@ -208,18 +208,18 @@ msgstr "كۆزنەكنىڭ ئوڭ تەرىپىدە كۆرسەتسۇن"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:568
+#: ../src/compositor/compositor.c:507
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
 "\"."
 msgstr "كۆرسەتكۈچ «%2$s» نىڭدىكى ئېكران %1$i دا بۆلەك باشقۇرغۇچ ئىجرا قىلىنىۋاتىدۇ."

-#: ../src/compositor/meta-background.c:1064
+#: ../src/compositor/meta-background.c:1116
 msgid "background texture could not be created from file"
 msgstr "ھۆججەتتىن تەگلىك texture نى قۇرغىلى بولمايدۇ"

-#: ../src/core/bell.c:322
+#: ../src/core/bell.c:320
 msgid "Bell event"
 msgstr "قوڭغۇراق ھادىسىسى"

@@ -251,59 +251,53 @@ msgstr "كۈت(_W)"
 msgid "_Force Quit"
 msgstr "مەجبۇرى ئاخىرلاشتۇر(_F)"

-#: ../src/core/display.c:401
+#: ../src/core/display.c:392
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "بىرىكتۈرۈش ئۈچۈن زۆرۈر بولغان كېڭەيتىلمە %s يوق"

-#: ../src/core/display.c:493
+#: ../src/core/display.c:485
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "‏X كۆزنەك سىستېمىسى كۆرسەتكۈچى ‹%s› نى ئېچىش مەغلۇپ بولدى\n"

-#: ../src/core/keybindings.c:935
+#: ../src/core/keybindings.c:876
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
 "binding\n"
 msgstr "باشقا پروگرامما %s كۇنۇپكىسى بىلەن سۈپەتلىگۈچى كۇنۇپكا %x نىڭ بىرىكمىسىنى ئىشلىتىۋاتىدۇ\n"

-#: ../src/core/keybindings.c:1135
-#, c-format
-#| msgid "\"%s\" is not a valid value for focus attribute"
-msgid "\"%s\" is not a valid accelerator\n"
-msgstr "«%s» ئىناۋەتلىك  تېزلەتكۈچ ئەمەس\n"
-
-#: ../src/core/main.c:197
+#: ../src/core/main.c:196
 msgid "Disable connection to session manager"
 msgstr "ئەڭگىمە باشقۇرغۇچقا باغلىنىشنى ئىناۋەتسىز قىل"

-#: ../src/core/main.c:203
+#: ../src/core/main.c:202
 msgid "Replace the running window manager"
 msgstr "ئىجرا قىلىنىۋاتقان كۆزنەك باشقۇرغۇچنى ئالماشتۇر"

-#: ../src/core/main.c:209
+#: ../src/core/main.c:208
 msgid "Specify session management ID"
 msgstr "ئەڭگىمە باشقۇرغۇ ID سېنى بەلگىلە"

-#: ../src/core/main.c:214
+#: ../src/core/main.c:213
 msgid "X Display to use"
 msgstr "ئىشلىتىدىغان X كۆرسەتكۈچى"

-#: ../src/core/main.c:220
+#: ../src/core/main.c:219
 msgid "Initialize session from savefile"
 msgstr "ساقلانغان ھۆججەتتىن ئەڭگىمەنى دەسلەپلەشتۈرۈش"

-#: ../src/core/main.c:226
+#: ../src/core/main.c:225
 msgid "Make X calls synchronous"
 msgstr "X نى قەدەمداش قىلىپ ئىشلەت"

-#: ../src/core/main.c:534
+#: ../src/core/main.c:494
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "ئۆرنەكلەر مۇندەرىجىسىنى ئىزدەش مەغلۇپ بولدى: %s\n"

-#: ../src/core/main.c:550
+#: ../src/core/main.c:510
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@@ -330,60 +324,60 @@ msgstr "نەشرىنى باس"
 msgid "Mutter plugin to use"
 msgstr "ئىشلىتىدىغان Mutter قىستۇرمىسى"

-#: ../src/core/prefs.c:1095
+#: ../src/core/prefs.c:1087
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
 msgstr "بۇزۇلغان پروگراممىلارنى تۈزىتىش-ياخشىلاش ئىناۋەتسىز قىلىنغان. بەزى پروگراممىلار نورمال ئىشلىمەسلىكى مۇمكىن.\n"

-#: ../src/core/prefs.c:1170
+#: ../src/core/prefs.c:1162
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr "GSettings ئاچقۇچى %s نىڭ تەركىبىدىكى فونت چۈشەندۈرۈشى «%s»نى تەھلىل قىلغىنى بولمىدى\n"

-#: ../src/core/prefs.c:1236
+#: ../src/core/prefs.c:1228
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
 "modifier\n"
 msgstr "سەپلىمە سانداندىن تېپىلغان «%s» چاشقىنەك توپچىسىنىڭ سۈپەتلىگۈچىسى ئۈچۈن ئىناۋەتسىز\n"

-#: ../src/core/prefs.c:1788
+#: ../src/core/prefs.c:1780
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
 "\"%s\"\n"
 msgstr "سەپلىمە ساندىنىدىن تېپىلغان «%s»، «%s» كۇنۇپكا باغلانمىسىنىڭ ئىناۋەتلىك قىممىتى ئەمەس\n"

-#: ../src/core/prefs.c:1887
+#: ../src/core/prefs.c:1879
 #, c-format
 msgid "Workspace %d"
 msgstr "خىزمەت بوشلۇقى %d"

-#: ../src/core/screen.c:691
+#: ../src/core/screen.c:673
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "كۆرسەتكۈچ ‹%2$s› دىكى ئېكران %1$d ئىناۋەتسىز\n"

-#: ../src/core/screen.c:707
+#: ../src/core/screen.c:689
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
 "replace option to replace the current window manager.\n"
 msgstr "كۆرسەتكۈچ «%2$s» دىكى ئېكران %1$d نىڭ كۆزنەك باشقۇرغۇسى بار؛ ھازىرقى كۆزنەك باشقۇرغۇنى ئالماشتۇرۇش ئۈچۈن --replace تاللانمىسىنى ئىشلىتىپ كۆرۈپ بېقىڭ.\n"

-#: ../src/core/screen.c:734
+#: ../src/core/screen.c:716
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "كۆرسەتكۈچ «%2$s» نىڭدىكى ئېكران %1$d دا كۆزنەك باشقۇرغۇنىڭ تاللانمىسىنى ئالغىلى بولمىدى\n"

-#: ../src/core/screen.c:812
+#: ../src/core/screen.c:794
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "«%2$s» دىكى %1$d ئېكراندا بىر كۆزنەك باشقۇرغۇ  بار\n"

-#: ../src/core/screen.c:998
+#: ../src/core/screen.c:979
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "«%2$s» دىكى %1$d  ئېكراننى بوشاتقىلى بولمىدى\n"
@@ -441,49 +435,49 @@ msgid ""
 "be restarted manually next time you log in."
 msgstr "بۇ كۆزنەكلەردە «ھازىرقى تەڭشەكنى ساقلاش» ئىقتىدارىنى ئىشلەتكىلى بولمايدۇ. كېيىن كىرگەندە يەنە قوزغىتىڭ."

-#: ../src/core/util.c:84
+#: ../src/core/util.c:80
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "سازلاش خاتىرىسىنى ئېچىش مەغلۇپ بولدى:%s\n"

-#: ../src/core/util.c:94
+#: ../src/core/util.c:90
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "خاتىرە ھۆججىتى %s غا  fdopen()  مەشغۇلاتى قىلغىلى بولمىدى:%s\n"

-#: ../src/core/util.c:100
+#: ../src/core/util.c:96
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "ئاچقان خاتىرە ھۆججەت %s\n"

-#: ../src/core/util.c:119 ../src/tools/mutter-message.c:149
+#: ../src/core/util.c:115 ../src/tools/mutter-message.c:149
 #, c-format
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter تەرجىمە-تەھرىرلىگەندە تەپسىلات قوللاش ھالىتى قوشۇلمىغان\n"

-#: ../src/core/util.c:264
+#: ../src/core/util.c:259
 msgid "Window manager: "
 msgstr "كۆزنەك باشقۇرغۇ: "

-#: ../src/core/util.c:412
+#: ../src/core/util.c:407
 msgid "Bug in window manager: "
 msgstr "كۆزنەك باشقۇرغۇدىكى كەمتۈك: "

-#: ../src/core/util.c:443
+#: ../src/core/util.c:438
 msgid "Window manager warning: "
 msgstr "كۆزنەك باشقۇرغۇ ئاگاھلاندۇرۇشى: "

-#: ../src/core/util.c:471
+#: ../src/core/util.c:466
 msgid "Window manager error: "
 msgstr "كۆزنەك باشقۇرغۇ خاتالىقى: "

 #. first time through
-#: ../src/core/window.c:7596
+#: ../src/core/window.c:7503
 #, 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 "كۆزنەك %s  بەلگىلىمە ICCCM دا بەلگىلەنگەن WM_CLIENT_LEADER كۆزنەكنى ئەمەس SM_CLIENT_ID نى ئۆزى بەلگىلىۋېلىپتۇ.\n"
+msgstr "كۆزنەك %s  بەلگىلىمە ICCCM دا بەلگىلەنگەن WM_CLIENT_LEADER كۆزنەكنى ئەمەس SM_CLIENT_ID نى ئۆزى بەلگىلىۋېپتۇ.\n"

 #. We ignore mwm_has_resize_func because WM_NORMAL_HINTS is the
 #. * authoritative source for that info. Some apps such as mplayer or
@@ -492,29 +486,29 @@ msgstr "كۆزنەك %s  بەلگىلىمە ICCCM دا بەلگىلەنگەن WM
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:8320
+#: ../src/core/window.c:8227
 #, 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 "كۆزنەك %s نىڭدا MWM بەلگىلەنگەن بولۇپ، بۇ كۆزنەك چوڭلۇقىنى ئۆزگەرتكىلى بولمايدۇ دېگەن مەنىدە. بىراق ئەڭ كىچىك چوڭلۇقى%d x %d، ۋە ئەڭ كىچىك چوڭلۇقى %d x %d قىلىپ بەلگىلىنىپتۇ. بۇنىڭ ھېچقانداق ئەھمىيىتى يوق.\n"

-#: ../src/core/window-props.c:318
+#: ../src/core/window-props.c:304
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "پروگرامما بىر ساختا _NET_WM_PID نى بەلگىلىدى%lu\n"

-#: ../src/core/window-props.c:434
+#: ../src/core/window-props.c:423
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (ھازىر %s نىڭ ئۈستىدە)"

-#: ../src/core/window-props.c:1517
+#: ../src/core/window-props.c:1506
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "%2$s  گە بەلگىلەنگەن ئۈنۈمسىز WM_TRANSIENT_FOR كۆزنەك 0x%1$lx بولىدۇ.\n"

-#: ../src/core/window-props.c:1528
+#: ../src/core/window-props.c:1517
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "%2$s نىڭ WM_TRANSIENT_FOR كۆزنەك0x%1$lx دەۋرىيلىك قۇرۇشى مۇمكىن.\n"
@@ -856,261 +850,261 @@ msgstr "Mod5"
 msgid "%d x %d"
 msgstr "%d x %d"

-#: ../src/ui/theme.c:236
+#: ../src/ui/theme.c:235
 msgid "top"
 msgstr "چوققا"

-#: ../src/ui/theme.c:238
+#: ../src/ui/theme.c:237
 msgid "bottom"
 msgstr "ئاستى"

-#: ../src/ui/theme.c:240
+#: ../src/ui/theme.c:239
 msgid "left"
 msgstr "سول"

-#: ../src/ui/theme.c:242
+#: ../src/ui/theme.c:241
 msgid "right"
 msgstr "ئوڭ"

-#: ../src/ui/theme.c:270
+#: ../src/ui/theme.c:269
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "كاندۇكنىڭ گېئومېتىرىيىلىك شەكلى «%s» ئۆلچەمنى ئىپادىلىمەيدۇ"

-#: ../src/ui/theme.c:289
+#: ../src/ui/theme.c:288
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "كاندۇكنىڭ گېئومېتىرىيىلىك شەكلى گىرۋەك «%2$s» نىڭ ئۆلچىمى «%1$s» ئىپادىلىمەيدۇ"

-#: ../src/ui/theme.c:326
+#: ../src/ui/theme.c:325
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "توپچىنىڭ ئېگىزلىك ۋە كەڭلىك نىسبىتى %g مۇۋاپىق ئەمەس"

-#: ../src/ui/theme.c:338
+#: ../src/ui/theme.c:337
 #, c-format
 msgid "Frame geometry does not specify size of buttons"
 msgstr "كاندۇكنىڭ گېئومېتىرىيىلىك شەكلى توپچىلارنىڭ چوڭلۇقىنى ئىپادىلىمەيدۇ"

-#: ../src/ui/theme.c:1051
+#: ../src/ui/theme.c:1050
 #, c-format
 msgid "Gradients should have at least two colors"
 msgstr "تەدرىجىي ئۆزگىرىشتە ئاز دېگەندە ئىككى خىل رەڭ بولۇش كېرەك"

-#: ../src/ui/theme.c:1203
+#: ../src/ui/theme.c:1202
 #, c-format
 msgid ""
 "GTK custom color specification must have color name and fallback in "
 "parentheses, e.g. gtk:custom(foo,bar); could not parse \"%s\""
 msgstr "GTK رەڭ ئۆلچىمىدە ھالەتتىن كېيىن چوقۇم رەڭ ئاتى ۋە زاپاس بولۇشى لازىم، مەسىلەن، gtk:custom(foo,bar) ھالەت؛ «%s» نى تەھلىل قىلالمايدۇ"

-#: ../src/ui/theme.c:1219
+#: ../src/ui/theme.c:1218
 #, c-format
 msgid ""
 "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-"
 "_ are valid"
 msgstr "gtk:custom نىڭ color_name پارامېتىرىدىكى ئىناۋەتسىز ھەرپ '%c'، پەقەت A-Za-z0-9-_  نىلا ئىشلەتكىلى بولىدۇ"

-#: ../src/ui/theme.c:1233
+#: ../src/ui/theme.c:1232
 #, c-format
 msgid ""
 "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
 "fit the format"
 msgstr "Gtk:custom نىڭ پىچىمى \"gtk:custom(color_name,fallback)\" بولۇپ، «%s» پىچىمغا توغرا كەلمەيدۇ"

-#: ../src/ui/theme.c:1278
+#: ../src/ui/theme.c:1277
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
 "where NORMAL is the state; could not parse \"%s\""
 msgstr "GTK رەڭ بەلگىلىمىسىنىڭ ھالىتى چوقۇم gtk:fg[NORMAL] نىڭدەك تىرناق ئىچىگە ئېلىنىشى كېرەك؛ «%s» نى تەھلىل قىلغىلى بولمىدى."

-#: ../src/ui/theme.c:1292
+#: ../src/ui/theme.c:1291
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
 "fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
 msgstr "GTK رەڭ بەلگىلىمىسىنىڭ ھالىتىنىڭ ئارقىسىغا سول تىرناق يېزىلىشى كېرەك.  مەسىلەن gtk:fg[NORMAL] نىڭدەك بۇ يەردىكى «NORMAL» ھالەتنى بىلدۈرىدۇ؛ «%s» نى تەھلىل قىلغىلى بولمىدى."

-#: ../src/ui/theme.c:1303
+#: ../src/ui/theme.c:1302
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "رەڭ بەلگىلىمىسىدىكى «%s» ھالەتنى چۈشەنگىلى بولمىدى"

-#: ../src/ui/theme.c:1316
+#: ../src/ui/theme.c:1315
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "رەڭ بەلگىلىمىسىدىكى «%s» رەڭ بۆلىكىنى چۈشەنگىلى بولمىدى"

-#: ../src/ui/theme.c:1345
+#: ../src/ui/theme.c:1344
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
 "format"
 msgstr "بىرىكمە رەڭنىڭ فورماتى \"blend/bg_color/fg_color/alpha\"،  «%s» بۇ پىچىمغا ماس كەلمىدى"

-#: ../src/ui/theme.c:1356
+#: ../src/ui/theme.c:1355
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "بىرىكمە رەڭدىكى ئالفا قىممىتى «%s» نى تەھلىل قىلغىلى بولمىدى"

-#: ../src/ui/theme.c:1366
+#: ../src/ui/theme.c:1365
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "بىرىكمە رەڭنىڭ ئالفا قىممىتى «%s» نىڭ دائىرىسى  0.0 ~1.0 ئىچىدە ئەمەس"

-#: ../src/ui/theme.c:1413
+#: ../src/ui/theme.c:1412
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
 msgstr "سايە پىچىمى «shade/base_color/factor»، «%s» بۇ پىچىمغا ماسلاشمىدى"

-#: ../src/ui/theme.c:1424
+#: ../src/ui/theme.c:1423
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "سايە رەڭگىدىكى سايە فاكتور «%s» نى تەھلىل قىلغىلى بولمىدى"

-#: ../src/ui/theme.c:1434
+#: ../src/ui/theme.c:1433
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "سايە رەڭگىدىكى سايە فاكتورى «%s» مەنپىي سان"

-#: ../src/ui/theme.c:1463
+#: ../src/ui/theme.c:1462
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "رەڭ «%s» نى ئانالىز قىلغىلى بولمىدى"

-#: ../src/ui/theme.c:1780
+#: ../src/ui/theme.c:1779
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "كوئوردېنات ئىپادىسىنىڭ تەركىبىدە رۇخسەت قىلىنمىغان ھەرپ '‹%s› بار"

-#: ../src/ui/theme.c:1807
+#: ../src/ui/theme.c:1806
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr "كوئوردېنات ئىپادىسىنىڭ تەركىبىدە تەھلىل قىلغىلى بولمايدىغان كەسىر سان ‹%s› بار"

-#: ../src/ui/theme.c:1821
+#: ../src/ui/theme.c:1820
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "كوئوردېنات ئىپادىسىنىڭ تەركىبىدە تەھلىل قىلغىلى بولمايدىغان پۈتۈن سان ‹%s› بار"

-#: ../src/ui/theme.c:1942
+#: ../src/ui/theme.c:1941
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
 "\"%s\""
 msgstr "كوئوردېنات ئىپادىسىنىڭ بېشىدا نامەلۇم ئەمەل بار: «%s»"

-#: ../src/ui/theme.c:1999
+#: ../src/ui/theme.c:1998
 #, c-format
 msgid "Coordinate expression was empty or not understood"
 msgstr "كوئوردېنات ئىپادىسى قۇرۇق ياكى چۈشىنىكسىز"

-#: ../src/ui/theme.c:2112 ../src/ui/theme.c:2122 ../src/ui/theme.c:2156
+#: ../src/ui/theme.c:2111 ../src/ui/theme.c:2121 ../src/ui/theme.c:2155
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr "كوئوردېنات ئىپادىسى 0 نى بۆلگۈچى قىلغان"

-#: ../src/ui/theme.c:2164
+#: ../src/ui/theme.c:2163
 #, c-format
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr "كوئوردېنات ئىپادىسى كەسىر سانغا mod ئەمىلىنى ئىشلەتمەكچى"

-#: ../src/ui/theme.c:2220
+#: ../src/ui/theme.c:2219
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "كوئوردېنات ئىپادىسىنىڭ تەركىبىدە سان كېلىدىغان يەردە ئەمەل «%s» بار ئىكەن"

-#: ../src/ui/theme.c:2229
+#: ../src/ui/theme.c:2228
 #, c-format
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "كوئوردېنات ئىپادىسىنىڭ تەركىبىدە ئەمەل كېلىدىغان يەردە سان بار ئىكەن"

-#: ../src/ui/theme.c:2237
+#: ../src/ui/theme.c:2236
 #, c-format
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "كوئوردېنات ئىپادىسى سان بىلەن ئاياغلاشماي ئەمەل بىلەن ئاياغلاشقان"

-#: ../src/ui/theme.c:2247
+#: ../src/ui/theme.c:2246
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
 "operand in between"
 msgstr "كوئوردېنات ئىپادىسىنىڭ تەركىبىدە ئەمەل «%2$c» نىڭ ئارقىسىدىن ئەمەل «%1$c» كېلىپتۇ، ئارىلىقتا سان يوق ئىكەن"

-#: ../src/ui/theme.c:2398 ../src/ui/theme.c:2443
+#: ../src/ui/theme.c:2397 ../src/ui/theme.c:2442
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "كوئوردېنات ئىپادىسىنىڭ تەركىبىدە نامەلۇم ئۆزگەرگۈچى ياكى تۇراقلىق سان «%s» بار ئىكەن"

-#: ../src/ui/theme.c:2497
+#: ../src/ui/theme.c:2496
 #, c-format
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "كوئوردېنات ئىپادىسىنى تەھلىل قىلىۋاتقاندا يىغلەك تېشىپ كەتتى."

-#: ../src/ui/theme.c:2526
+#: ../src/ui/theme.c:2525
 #, c-format
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "كوئوردېنات ئىپادىسىنىڭ تەركىبىدىكى يېپىلغان تىرناققا ماس كېلىدىغان ئېچىلغان تىرناق يوق"

-#: ../src/ui/theme.c:2590
+#: ../src/ui/theme.c:2589
 #, c-format
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "كوئوردېنات ئىپادىسىنىڭ تەركىبىدىكى ئېچىلغان تىرناققا ماس كېلىدىغان يېپىلغان تىرناق يوق"

-#: ../src/ui/theme.c:2601
+#: ../src/ui/theme.c:2600
 #, c-format
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "كوئوردېنات ئىپادىسىنىڭ تەركىبىدە ئەمەل(قوشۇش، ئېلىش...) ياكى سان يوق"

-#: ../src/ui/theme.c:2814 ../src/ui/theme.c:2834 ../src/ui/theme.c:2854
+#: ../src/ui/theme.c:2813 ../src/ui/theme.c:2833 ../src/ui/theme.c:2853
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "ئۆرنەك تەركىبىدە خاتالىق چىقىرىدىغان ئىپادە بار: %s\n"

-#: ../src/ui/theme.c:4500
+#: ../src/ui/theme.c:4499
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
 "specified for this frame style"
 msgstr "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/>بۇ كۆزنەكنىڭ ئۇسلۇبى ئۈچۈن بەلگىلىنىشى زۆرۈر"

-#: ../src/ui/theme.c:5011 ../src/ui/theme.c:5036
+#: ../src/ui/theme.c:5010 ../src/ui/theme.c:5035
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr "<frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/> يوق"

-#: ../src/ui/theme.c:5084
+#: ../src/ui/theme.c:5083
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "ئۆرنەك «%s»  نى ئوقۇش مەغلۇپ بولدى: %s\n"

-#: ../src/ui/theme.c:5220 ../src/ui/theme.c:5227 ../src/ui/theme.c:5234
-#: ../src/ui/theme.c:5241 ../src/ui/theme.c:5248
+#: ../src/ui/theme.c:5219 ../src/ui/theme.c:5226 ../src/ui/theme.c:5233
+#: ../src/ui/theme.c:5240 ../src/ui/theme.c:5247
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "ئۆرنەك «%2$s» نىڭ <%1$s> ئى بەلگىلەنمىگەن"

-#: ../src/ui/theme.c:5256
+#: ../src/ui/theme.c:5255
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
 "type=\"%s\" style_set=\"whatever\"/> element"
 msgstr "ئۆرنەك «%2$s» نىڭ ئىچىدىكى كۆزنەك تىپى <%1$s> نىڭ كاندۇك ئۇسلۇبى بەلگىلەنمىگەن. بىر <window type=\"%3$s\" style_set=\"whatever\"/> ئېلېمېنتى قوشۇڭ"

-#: ../src/ui/theme.c:5663 ../src/ui/theme.c:5725 ../src/ui/theme.c:5788
+#: ../src/ui/theme.c:5662 ../src/ui/theme.c:5724 ../src/ui/theme.c:5787
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr "ئىشلەتكۈچى بەلگىلىگەن تۇراقلىق مىقدار چوقۇم چوڭ ھەرپ بىلەن باشلانسۇن؛ «%s» بولمايدۇ"

-#: ../src/ui/theme.c:5671 ../src/ui/theme.c:5733 ../src/ui/theme.c:5796
+#: ../src/ui/theme.c:5670 ../src/ui/theme.c:5732 ../src/ui/theme.c:5795
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "تۇراقلىق سان «%s» غا ئېنىقلىما بېرىلگەن"
@@ -1470,7 +1464,7 @@ msgstr "ئېلېمېنت <%s> نىڭ ئىچىدە تېكىست بولسا بول
 msgid "<%s> specified twice for this theme"
 msgstr "بۇ ئۆرنەك ئۈچۈن <%s> ئىككى قېتىم بەلگىلەنگەن"

-#: ../src/ui/theme-parser.c:4336
+#: ../src/ui/theme-parser.c:4334
 #, c-format
 msgid "Failed to find a valid file for theme %s\n"
 msgstr "ئۆرنەك %s  ئۈچۈن ئىناۋەتلىك ھۆججەتنى تېپىش مەغلۇپ بولدى\n"
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -514,20 +514,20 @@ meta_check_end_modal (MetaScreen *screen)
    {
      meta_end_modal_for_plugin (screen,
                                   compositor->modal_plugin,
-
-                                 CurrentTime);
+                                   CurrentTime);
    }
 }

-static void
-after_stage_paint (ClutterStage *stage,
-                   gpointer      data)
+static gboolean
+after_stage_paint (gpointer data)
 {
  MetaCompScreen *info = (MetaCompScreen*) data;
  GList *l;

  for (l = info->windows; l; l = l->next)
    meta_window_actor_post_paint (l->data);
+
+  return TRUE;
 }

 static void
@@ -608,10 +608,9 @@ meta_compositor_manage_screen (MetaCompositor *compositor,

  info->stage = clutter_stage_new ();

-  clutter_stage_set_paint_callback (CLUTTER_STAGE (info->stage),
-                                    after_stage_paint,
-                                    info,
-                                    NULL);
+  clutter_threads_add_repaint_func_full (CLUTTER_REPAINT_FLAGS_POST_PAINT,
+                                         after_stage_paint,
+                                         info, NULL);

  clutter_stage_set_sync_delay (CLUTTER_STAGE (info->stage), META_SYNC_DELAY);

@@ -639,9 +638,6 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
    XISetMask (mask.mask, XI_FocusIn);
    XISetMask (mask.mask, XI_FocusOut);
    XISetMask (mask.mask, XI_Motion);
-    XIClearMask (mask.mask, XI_TouchBegin);
-    XIClearMask (mask.mask, XI_TouchEnd);
-    XIClearMask (mask.mask, XI_TouchUpdate);
    XISelectEvents (xdisplay, xwin, &mask, 1);

    event_mask = ExposureMask | PropertyChangeMask | StructureNotifyMask;
@@ -1570,10 +1566,8 @@ void
 meta_enable_unredirect_for_screen (MetaScreen *screen)
 {
  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
-  if (info != NULL && info->disable_unredirect_count == 0)
-    g_warning ("Called enable_unredirect_for_screen while unredirection is enabled.");
-  if (info != NULL && info->disable_unredirect_count > 0)
-   info->disable_unredirect_count = info->disable_unredirect_count - 1;
+  if (info != NULL)
+   info->disable_unredirect_count = MAX(0, info->disable_unredirect_count - 1);
 }

 #define FLASH_TIME_MS 50
--- a/src/compositor/meta-background.c
+++ b/src/compositor/meta-background.c
@@ -472,17 +472,6 @@ meta_background_dispose (GObject *object)
  G_OBJECT_CLASS (meta_background_parent_class)->dispose (object);
 }

-static void
-meta_background_finalize (GObject *object)
-{
-  MetaBackground        *self = META_BACKGROUND (object);
-  MetaBackgroundPrivate *priv = self->priv;
-
-  g_free (priv->filename);
-
-  G_OBJECT_CLASS (meta_background_parent_class)->finalize (object);
-}
-
 static void
 ensure_pipeline (MetaBackground *self)
 {
@@ -654,7 +643,6 @@ meta_background_class_init (MetaBackgroundClass *klass)
  g_type_class_add_private (klass, sizeof (MetaBackgroundPrivate));

  object_class->dispose = meta_background_dispose;
-  object_class->finalize = meta_background_finalize;
  object_class->set_property = meta_background_set_property;
  object_class->get_property = meta_background_get_property;

@@ -891,7 +879,7 @@ meta_background_load_gradient (MetaBackground             *self,
  pixels[7] = second_color->alpha;

  texture = cogl_texture_new_from_data (width, height,
-                                        COGL_TEXTURE_NONE,
+                                        COGL_TEXTURE_NO_SLICING,
                                        COGL_PIXEL_FORMAT_RGBA_8888,
                                        COGL_PIXEL_FORMAT_ANY,
                                        4,
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -1645,7 +1645,7 @@ meta_window_actor_get_obscured_region (MetaWindowActor *self)
 {
  MetaWindowActorPrivate *priv = self->priv;

-  if (priv->back_pixmap && priv->opacity == 0xff && !priv->window->shaded)
+  if (priv->back_pixmap && priv->opacity == 0xff)
    return priv->opaque_region;
  else
    return NULL;
@@ -2214,10 +2214,7 @@ check_needs_reshape (MetaWindowActor *self)
  client_area.x = borders.total.left;
  client_area.y = borders.total.top;
  client_area.width = priv->window->rect.width;
-  if (priv->window->shaded)
-    client_area.height = 0;
-  else
-    client_area.height = priv->window->rect.height;
+  client_area.height = priv->window->rect.height;

  meta_shaped_texture_set_mask_texture (META_SHAPED_TEXTURE (priv->actor), NULL);
  g_clear_pointer (&priv->shape_region, cairo_region_destroy);
--- a/src/core/barrier.c
+++ b/src/core/barrier.c
@@ -59,8 +59,6 @@ struct _MetaBarrierPrivate
  PointerBarrier xbarrier;
 };

-static void meta_barrier_event_unref (MetaBarrierEvent *event);
-
 static void
 meta_barrier_get_property (GObject    *object,
                           guint       prop_id,
@@ -361,8 +359,6 @@ meta_barrier_fire_event (MetaBarrier    *barrier,
    default:
      g_assert_not_reached ();
    }
-
-  meta_barrier_event_unref (event);
 }

 gboolean
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -239,8 +239,6 @@ struct _MetaDisplay
  unsigned int meta_mask;
  MetaKeyCombo overlay_key_combo;
  gboolean overlay_key_only_pressed;
-  MetaKeyCombo *iso_next_group_combos;
-  int n_iso_next_group_combos;
  
  /* Monitor cache */
  unsigned int monitor_cache_invalidated : 1;
@@ -460,7 +458,7 @@ void meta_display_overlay_key_activate (MetaDisplay *display);
 void meta_display_accelerator_activate (MetaDisplay *display,
                                        guint        action,
                                        guint        deviceid);
-gboolean meta_display_modifiers_accelerator_activate (MetaDisplay *display);
+void meta_display_modifiers_accelerator_activate (MetaDisplay *display);

 /* In above-tab-keycode.c */
 guint meta_display_get_above_tab_keycode (MetaDisplay *display);
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -256,24 +256,13 @@ meta_display_class_init (MetaDisplayClass *klass)
                  NULL, NULL, NULL,
                  G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);

-  /**
-   * MetaDisplay::modifiers-accelerator-activated:
-   * @display: the #MetaDisplay instance
-   *
-   * The ::modifiers-accelerator-activated signal will be emitted when
-   * a special modifiers-only keybinding is activated.
-   *
-   * Returns: %TRUE means that the keyboard device should remain
-   *    frozen and %FALSE for the default behavior of unfreezing the
-   *    keyboard.
-   */
  display_signals[MODIFIERS_ACCELERATOR_ACTIVATED] =
    g_signal_new ("modifiers-accelerator-activated",
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  g_signal_accumulator_first_wins, NULL, NULL,
-                  G_TYPE_BOOLEAN, 0);
+                  NULL, NULL, NULL,
+                  G_TYPE_NONE, 0);

  display_signals[WINDOW_CREATED] =
    g_signal_new ("window-created",
@@ -3557,12 +3546,6 @@ meta_spew_event (MetaDisplay *display,
  if (event->type == (display->damage_event_base + XDamageNotify))
    return;

-  if (event->type == (display->xsync_event_base + XSyncAlarmNotify))
-    return;
-
-  if (event->type == PropertyNotify && event->xproperty.atom == display->atom__NET_WM_USER_TIME)
-    return;
-
  input_event = get_input_event (display, event);

  if (input_event)
@@ -5707,14 +5690,10 @@ meta_display_accelerator_activate (MetaDisplay *display,
                 0, action, deviceid);
 }

-gboolean
+void
 meta_display_modifiers_accelerator_activate (MetaDisplay *display)
 {
-  gboolean freeze;
-
-  g_signal_emit (display, display_signals[MODIFIERS_ACCELERATOR_ACTIVATED], 0, &freeze);
-
-  return freeze;
+  g_signal_emit (display, display_signals[MODIFIERS_ACCELERATOR_ACTIVATED], 0);
 }

 void
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -154,6 +154,10 @@ static void ungrab_key_bindings         (MetaDisplay *display);
 static GHashTable *key_handlers;
 static GHashTable *external_grabs;

+static char         *iso_next_group_option;
+static MetaKeyCombo *iso_next_group_combos;
+static int           n_iso_next_group_combos;
+
 #define HANDLER(name) g_hash_table_lookup (key_handlers, (name))

 static void
@@ -302,8 +306,6 @@ reload_modmap (MetaDisplay *display)
              display->meta_mask);
 }

-/* Original code from gdk_x11_keymap_get_entries_for_keyval() in
- * gdkkeys-x11.c */
 static int
 get_keycodes_for_keysym (MetaDisplay  *display,
                         int           keysym,
@@ -341,17 +343,15 @@ get_keycodes_for_keysym (MetaDisplay  *display,
 static void
 reload_iso_next_group_combos (MetaDisplay *display)
 {
-  const char *iso_next_group_option;
  MetaKeyCombo *combos;
  int *keycodes;
  int n_keycodes;
  int n_combos;
  int i;

-  g_clear_pointer (&display->iso_next_group_combos, g_free);
-  display->n_iso_next_group_combos = 0;
+  g_clear_pointer (&iso_next_group_combos, g_free);
+  n_iso_next_group_combos = 0;

-  iso_next_group_option = meta_prefs_get_iso_next_group_option ();
  if (iso_next_group_option == NULL)
    return;

@@ -464,8 +464,8 @@ reload_iso_next_group_combos (MetaDisplay *display)

  g_free (keycodes);

-  display->n_iso_next_group_combos = n_combos;
-  display->iso_next_group_combos = combos;
+  n_iso_next_group_combos = n_combos;
+  iso_next_group_combos = combos;
 }

 static guint
@@ -697,6 +697,9 @@ rebuild_special_bindings (MetaDisplay *display)

  meta_prefs_get_overlay_binding (&combo);
  display->overlay_key_combo = combo;
+
+  g_free (iso_next_group_option);
+  iso_next_group_option = meta_prefs_get_iso_next_group_option ();
 }

 static void
@@ -1194,17 +1197,17 @@ meta_screen_change_keygrabs (MetaScreen *screen,
                         display->overlay_key_combo.keycode,
                         display->overlay_key_combo.modifiers);

-  if (display->iso_next_group_combos)
+  if (iso_next_group_combos)
    {
      int i = 0;
-      while (i < display->n_iso_next_group_combos)
+      while (i < n_iso_next_group_combos)
        {
-          if (display->iso_next_group_combos[i].keycode != 0)
+          if (iso_next_group_combos[i].keycode != 0)
            {
              meta_change_keygrab (display, screen->xroot, grab,
-                                   display->iso_next_group_combos[i].keysym,
-                                   display->iso_next_group_combos[i].keycode,
-                                   display->iso_next_group_combos[i].modifiers);
+                                   iso_next_group_combos[i].keysym,
+                                   iso_next_group_combos[i].keycode,
+                                   iso_next_group_combos[i].modifiers);
            }
          ++i;
        }
@@ -1465,22 +1468,13 @@ grab_keyboard (MetaDisplay *display,
   */
  meta_error_trap_push_with_return (display);

-  /* Strictly, we only need to set grab_mode on the keyboard device
-   * while the pointer should always be XIGrabModeAsync. Unfortunately
-   * there is a bug in the X server, only fixed (link below) in 1.15,
-   * which swaps these arguments for keyboard devices. As such, we set
-   * both the device and the paired device mode which works around
-   * that bug and also works on fixed X servers.
-   *
-   * http://cgit.freedesktop.org/xorg/xserver/commit/?id=9003399708936481083424b4ff8f18a16b88b7b3
-   */
  grab_status = XIGrabDevice (display->xdisplay,
                              META_VIRTUAL_CORE_KEYBOARD_ID,
                              xwindow,
                              timestamp,
                              None,
                              grab_mode, grab_mode,
-                              False, /* owner_events */
+                              True, /* owner_events */
                              &mask);

  if (grab_status != Success)
@@ -1614,9 +1608,9 @@ meta_window_ungrab_all_keys (MetaWindow *window, guint32 timestamp)
 }

 void
-meta_display_freeze_keyboard (MetaDisplay *display, Window window, guint32 timestamp)
+meta_display_grab_keyboard (MetaDisplay *display, guint32 timestamp)
 {
-  grab_keyboard (display, window, timestamp, XIGrabModeSync);
+  grab_keyboard (display, DefaultRootWindow (display->xdisplay), timestamp, XIGrabModeSync);
 }

 void
@@ -1625,17 +1619,29 @@ meta_display_ungrab_keyboard (MetaDisplay *display, guint32 timestamp)
  ungrab_keyboard (display, timestamp);
 }

+void
+meta_display_freeze_keyboard (MetaDisplay *display, guint32 timestamp)
+{
+  meta_error_trap_push (display);
+
+  meta_topic (META_DEBUG_KEYBINDINGS,
+              "Freezing keyboard with timestamp %u\n",
+              timestamp);
+  XIAllowEvents (display->xdisplay, META_VIRTUAL_CORE_KEYBOARD_ID,
+                 XISyncDevice, timestamp);
+  meta_error_trap_pop (display);
+}
+
 void
 meta_display_unfreeze_keyboard (MetaDisplay *display, guint32 timestamp)
 {
  meta_error_trap_push (display);
+
+  meta_topic (META_DEBUG_KEYBINDINGS,
+              "Unfreezing keyboard with timestamp %u\n",
+              timestamp);
  XIAllowEvents (display->xdisplay, META_VIRTUAL_CORE_KEYBOARD_ID,
                 XIAsyncDevice, timestamp);
-  /* We shouldn't need to unfreeze the pointer device here, however we
-   * have to, due to the workaround we do in grab_keyboard().
-   */
-  XIAllowEvents (display->xdisplay, META_VIRTUAL_CORE_POINTER_ID,
-                 XIAsyncDevice, timestamp);
  meta_error_trap_pop (display);
 }

@@ -2001,22 +2007,19 @@ process_iso_next_group (MetaDisplay *display,
  activate = FALSE;
  mods = (event->mods.effective & 0xff & ~(display->ignored_modifier_mask));

-  for (i = 0; i < display->n_iso_next_group_combos; ++i)
+  for (i = 0; i < n_iso_next_group_combos; ++i)
    {
-      if (event->detail == (int)display->iso_next_group_combos[i].keycode &&
-          mods == display->iso_next_group_combos[i].modifiers)
+      if (event->detail == (int)iso_next_group_combos[i].keycode &&
+          mods == iso_next_group_combos[i].modifiers)
        {
-          /* If the signal handler returns TRUE the keyboard will
-             remain frozen. It's the signal handler's responsibility
-             to unfreeze it. */
-          if (!meta_display_modifiers_accelerator_activate (display))
-            XIAllowEvents (display->xdisplay, event->deviceid,
-                           XIAsyncDevice, event->time);
          activate = TRUE;
          break;
        }
    }

+  if (activate)
+      meta_display_modifiers_accelerator_activate (display);
+
  return activate;
 }

--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -125,6 +125,7 @@ static gboolean update_binding         (MetaKeyPref *binding,
                                        gchar      **strokes);
 static gboolean update_key_binding     (const char  *key,
                                        gchar      **strokes);
+static gboolean update_workspace_names (void);

 static void settings_changed (GSettings      *settings,
                              gchar          *key,
@@ -147,6 +148,7 @@ static gboolean iso_next_group_handler (GVariant*, gpointer*, gpointer);
 static void     do_override               (char *key, char *schema);

 static void     init_bindings             (void);
+static void     init_workspace_names      (void);


 typedef struct
@@ -200,13 +202,6 @@ typedef struct
  gchar **target;
 } MetaStringPreference;

-typedef struct
-{
-  MetaBasePreference base;
-  GSettingsGetMapping handler;
-  gchar ***target;
-} MetaStringArrayPreference;
-
 typedef struct
 {
  MetaBasePreference base;
@@ -442,21 +437,8 @@ static MetaStringPreference preferences_string[] =
      overlay_key_handler,
      NULL,
    },
-    { { NULL, 0, 0 }, NULL },
-  };
-
-static MetaStringArrayPreference preferences_string_array[] =
-  {
    {
-      { KEY_WORKSPACE_NAMES,
-        SCHEMA_GENERAL,
-        META_PREF_KEYBINDINGS,
-      },
-      NULL,
-      &workspace_names,
-    },
-    {
-      { KEY_XKB_OPTIONS,
+      { "xkb-options",
        SCHEMA_INPUT_SOURCES,
        META_PREF_KEYBINDINGS,
      },
@@ -585,42 +567,6 @@ handle_preference_init_string (void)
    }
 }

-static void
-handle_preference_init_string_array (void)
-{
-  MetaStringArrayPreference *cursor = preferences_string_array;
-
-  while (cursor->base.key != NULL)
-    {
-      char **value;
-
-      /* Complex keys have a mapping function to check validity */
-      if (cursor->handler)
-        {
-          if (cursor->target)
-            meta_bug ("%s has both a target and a handler\n", cursor->base.key);
-
-          g_settings_get_mapped (SETTINGS (cursor->base.schema),
-                                 cursor->base.key, cursor->handler, NULL);
-        }
-      else
-        {
-          if (!cursor->target)
-            meta_bug ("%s must have handler or target\n", cursor->base.key);
-
-          if (*(cursor->target))
-            g_strfreev (*(cursor->target));
-
-          value = g_settings_get_strv (SETTINGS (cursor->base.schema),
-                                       cursor->base.key);
-
-          *(cursor->target) = value;
-        }
-
-      ++cursor;
-    }
-}
-
 static void
 handle_preference_init_int (void)
 {
@@ -739,56 +685,6 @@ handle_preference_update_string (GSettings *settings,
    queue_changed (cursor->base.pref);
 }

-static void
-handle_preference_update_string_array (GSettings *settings,
-                                       gchar *key)
-{
-  MetaStringArrayPreference *cursor = preferences_string_array;
-  gboolean inform_listeners = FALSE;
-
-  while (cursor->base.key != NULL && strcmp (key, cursor->base.key) != 0)
-    ++cursor;
-
-  if (cursor->base.key==NULL)
-    /* Didn't recognise that key. */
-    return;
-
-  /* Complex keys have a mapping function to check validity */
-  if (cursor->handler)
-    {
-      if (cursor->target)
-        meta_bug ("%s has both a target and a handler\n", cursor->base.key);
-
-      g_settings_get_mapped (SETTINGS (cursor->base.schema),
-                             cursor->base.key, cursor->handler, NULL);
-    }
-  else
-    {
-      char **values, **previous;
-      int n_values, n_previous, i;
-
-      if (!cursor->target)
-        meta_bug ("%s must have handler or target\n", cursor->base.key);
-
-      values = g_settings_get_strv (SETTINGS (cursor->base.schema),
-                                    cursor->base.key);
-      n_values = g_strv_length (values);
-      previous = *(cursor->target);
-      n_previous = previous ? g_strv_length (previous) : 0;
-
-      inform_listeners = n_previous != n_values;
-      for (i = 0; i < n_values && !inform_listeners; i++)
-        inform_listeners = g_strcmp0 (values[i], previous[i]) != 0;
-
-      if (*(cursor->target))
-        g_strfreev (*(cursor->target));
-      *(cursor->target) = values;
-    }
-
-  if (inform_listeners)
-    queue_changed (cursor->base.pref);
-}
-
 static void
 handle_preference_update_int (GSettings *settings,
                              gchar *key)
@@ -990,10 +886,10 @@ meta_prefs_init (void)
  handle_preference_init_enum ();
  handle_preference_init_bool ();
  handle_preference_init_string ();
-  handle_preference_init_string_array ();
  handle_preference_init_int ();

  init_bindings ();
+  init_workspace_names ();
 }

 static gboolean
@@ -1141,6 +1037,14 @@ settings_changed (GSettings *settings,
  MetaEnumPreference *cursor;
  gboolean found_enum;

+  /* String array, handled separately */
+  if (strcmp (key, KEY_WORKSPACE_NAMES) == 0)
+    {
+      if (update_workspace_names ())
+        queue_changed (META_PREF_WORKSPACE_NAMES);
+      return;
+    }
+
  value = g_settings_get_value (settings, key);
  type = g_variant_get_type (value);

@@ -1148,9 +1052,8 @@ settings_changed (GSettings *settings,
    handle_preference_update_bool (settings, key);
  else if (g_variant_type_equal (type, G_VARIANT_TYPE_INT32))
    handle_preference_update_int (settings, key);
-  else if (g_variant_type_equal (type, G_VARIANT_TYPE_STRING_ARRAY))
-    handle_preference_update_string_array (settings, key);
-  else if (g_variant_type_equal (type, G_VARIANT_TYPE_STRING))
+  else if (g_variant_type_equal (type, G_VARIANT_TYPE_STRING) ||
+           g_variant_type_equal (type, G_VARIANT_TYPE_STRING_ARRAY))
    {
      cursor = preferences_enum;
      found_enum = FALSE;
@@ -1669,14 +1572,24 @@ overlay_key_handler (GVariant *value,
  return TRUE;
 }

+static void
+set_iso_next_group_option (const char *option)
+{
+  if (g_strcmp0 (option, iso_next_group_option) == 0)
+    return;
+
+  g_free (iso_next_group_option);
+  iso_next_group_option = g_strdup (option);
+
+  queue_changed (META_PREF_KEYBINDINGS);
+}
+
 static gboolean
 iso_next_group_handler (GVariant *value,
                        gpointer *result,
                        gpointer  data)
 {
  const char **xkb_options, **p;
-  const char *option = NULL;
-  gboolean changed = FALSE;

  *result = NULL; /* ignored */
  xkb_options = g_variant_get_strv (value, NULL);
@@ -1684,18 +1597,13 @@ iso_next_group_handler (GVariant *value,
  for (p = xkb_options; p && *p; ++p)
    if (g_str_has_prefix (*p, "grp:"))
      {
-        option = (*p + 4);
+        set_iso_next_group_option (*p + 4);
        break;
      }

-  changed = (g_strcmp0 (option, iso_next_group_option) != 0);
-
-  if (changed)
-    {
-      g_free (iso_next_group_option);
-      iso_next_group_option = g_strdup (option);
-      queue_changed (META_PREF_KEYBINDINGS);
-    }
+  /* If we didn't find it, it still needs to be disabled. */
+  if (p && *p == NULL)
+    set_iso_next_group_option (NULL);

  g_free (xkb_options);

@@ -1856,13 +1764,12 @@ meta_prefs_set_num_workspaces (int n_workspaces)
 {
  MetaBasePreference *pref;

-  if (find_pref (preferences_int, sizeof(MetaIntPreference),
-                 KEY_NUM_WORKSPACES, &pref))
-    {
-      g_settings_set_int (SETTINGS (pref->schema),
-                          KEY_NUM_WORKSPACES,
-                          n_workspaces);
-    }
+  find_pref (preferences_int, sizeof(MetaIntPreference),
+             KEY_NUM_WORKSPACES, &pref);
+
+  g_settings_set_int (SETTINGS (pref->schema),
+                      KEY_NUM_WORKSPACES,
+                      n_workspaces);
 }

 static GHashTable *key_bindings;
@@ -1896,6 +1803,12 @@ init_bindings (void)
  g_hash_table_insert (key_bindings, g_strdup ("overlay-key"), pref);
 }

+static void
+init_workspace_names (void)
+{
+  update_workspace_names ();
+}
+
 static gboolean
 update_binding (MetaKeyPref *binding,
                gchar      **strokes)
@@ -2006,6 +1919,41 @@ update_key_binding (const char *key,
    return FALSE;
 }

+static gboolean
+update_workspace_names (void)
+{
+  int i;
+  char **names;
+  int n_workspace_names, n_names;
+  gboolean changed = FALSE;
+
+  names = g_settings_get_strv (SETTINGS (SCHEMA_GENERAL), KEY_WORKSPACE_NAMES);
+  n_names = g_strv_length (names);
+  n_workspace_names = workspace_names ? g_strv_length (workspace_names) : 0;
+
+  for (i = 0; i < n_names; i++)
+    if (n_workspace_names < i + 1 || !workspace_names[i] ||
+        g_strcmp0 (names[i], workspace_names[i]) != 0)
+      {
+        changed = TRUE;
+        break;
+      }
+
+  if (n_workspace_names != n_names)
+    changed = TRUE;
+
+  if (changed)
+    {
+      if (workspace_names)
+        g_strfreev (workspace_names);
+      workspace_names = names;
+    }
+  else
+    g_strfreev (names);
+
+  return changed;
+}
+
 const char*
 meta_prefs_get_workspace_name (int i)
 {
@@ -2205,10 +2153,10 @@ meta_prefs_get_overlay_binding (MetaKeyCombo *combo)
  *combo = overlay_key_combo;
 }

-const char *
+char *
 meta_prefs_get_iso_next_group_option (void)
 {
-  return iso_next_group_option;
+  return g_strdup (iso_next_group_option);
 }

 GDesktopTitlebarAction
@@ -2353,11 +2301,9 @@ meta_prefs_set_no_tab_popup (gboolean whether)
 {
  MetaBasePreference *pref;

-  if (find_pref (preferences_bool, sizeof(MetaBoolPreference),
-                 KEY_NO_TAB_POPUP, &pref))
-    {
-      g_settings_set_boolean (SETTINGS (pref->schema), KEY_NO_TAB_POPUP, whether);
-    }
+  find_pref (preferences_bool, sizeof(MetaBoolPreference),
+             KEY_NO_TAB_POPUP, &pref);
+  g_settings_set_boolean (SETTINGS (pref->schema), KEY_NO_TAB_POPUP, whether);
 }

 int
--- a/src/core/screen-private.h
+++ b/src/core/screen-private.h
@@ -187,9 +187,6 @@ MetaWindow*   meta_screen_get_mouse_window     (MetaScreen                 *scre
                                                MetaWindow                 *not_this_one);

 const MetaMonitorInfo* meta_screen_get_current_monitor_info   (MetaScreen    *screen);
-const MetaMonitorInfo* meta_screen_get_current_monitor_info_for_pos   (MetaScreen    *screen,
-                                                                       int x,
-                                                                       int y);
 const MetaMonitorInfo* meta_screen_get_monitor_for_rect   (MetaScreen    *screen,
                                                           MetaRectangle *rect);
 const MetaMonitorInfo* meta_screen_get_monitor_for_window (MetaScreen    *screen,
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -2216,65 +2216,6 @@ meta_screen_get_current_monitor_info (MetaScreen *screen)
    return &screen->monitor_infos[monitor_index];
 }

-const MetaMonitorInfo*
-meta_screen_get_current_monitor_info_for_pos (MetaScreen *screen,
-                                              int x,
-                                              int y)
-{
-    int monitor_index;
-    monitor_index = meta_screen_get_current_monitor_for_pos (screen, x, y);
-    return &screen->monitor_infos[monitor_index];
-}
-
-
-/**
- * meta_screen_get_current_monitor_for_pos:
- * @screen: a #MetaScreen
- * @x: The x coordinate
- * @y: The y coordinate
- *
- * Gets the index of the monitor that contains the passed coordinates.
- *
- * Return value: a monitor index
- */
-int
-meta_screen_get_current_monitor_for_pos (MetaScreen *screen,
-                                         int x,
-                                         int y)
-{
-  if (screen->n_monitor_infos == 1)
-    return 0;
-  else if (screen->display->monitor_cache_invalidated)
-    {
-      int i;
-      MetaRectangle pointer_position;
-      pointer_position.x = x;
-      pointer_position.y = y;
-      pointer_position.width = pointer_position.height = 1;
-
-      screen->display->monitor_cache_invalidated = FALSE;
-      screen->last_monitor_index = 0;
-
-      for (i = 0; i < screen->n_monitor_infos; i++)
-        {
-          if (meta_rectangle_contains_rect (&screen->monitor_infos[i].rect,
-                                            &pointer_position))
-            {
-              screen->last_monitor_index = i;
-              break;
-            }
-        }
-
-      meta_topic (META_DEBUG_XINERAMA,
-                  "Rechecked current monitor, now %d\n",
-                  screen->last_monitor_index);
-
-    }
-
-    return screen->last_monitor_index;
-}
-
-
 /**
 * meta_screen_get_current_monitor:
 * @screen: a #MetaScreen
@@ -2300,7 +2241,11 @@ meta_screen_get_current_monitor (MetaScreen *screen)
      XIButtonState buttons;
      XIModifierState mods;
      XIGroupState group;
+      int i;
+      MetaRectangle pointer_position;

+      screen->display->monitor_cache_invalidated = FALSE;
+      
      XIQueryPointer (screen->display->xdisplay,
                      META_VIRTUAL_CORE_POINTER_ID,
                      screen->xroot,
@@ -2315,7 +2260,24 @@ meta_screen_get_current_monitor (MetaScreen *screen)
                      &group);
      free (buttons.mask);

-      meta_screen_get_current_monitor_for_pos (screen, root_x_return, root_y_return);
+      pointer_position.x = root_x_return;
+      pointer_position.y = root_y_return;
+      pointer_position.width = pointer_position.height = 1;
+
+      screen->last_monitor_index = 0;
+      for (i = 0; i < screen->n_monitor_infos; i++)
+        {
+          if (meta_rectangle_contains_rect (&screen->monitor_infos[i].rect,
+                                            &pointer_position))
+            {
+              screen->last_monitor_index = i;
+              break;
+            }
+        }
+      
+      meta_topic (META_DEBUG_XINERAMA,
+                  "Rechecked current monitor, now %d\n",
+                  screen->last_monitor_index);
    }

  return screen->last_monitor_index;
@@ -3039,7 +3001,7 @@ meta_screen_resize (MetaScreen *screen,

  /* Fix up monitor for all windows on this screen */
  windows = meta_display_list_windows (screen->display,
-                                       META_LIST_INCLUDE_OVERRIDE_REDIRECT);
+                                       META_LIST_DEFAULT);
  for (tmp = windows; tmp != NULL; tmp = tmp->next)
    {
      MetaWindow *window = tmp->data;
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -145,8 +145,6 @@ static void meta_window_move_between_rects (MetaWindow          *window,
 static void unmaximize_window_before_freeing (MetaWindow        *window);
 static void unminimize_window_and_all_transient_parents (MetaWindow *window);

-static void meta_window_update_monitor (MetaWindow *window);
-
 /* Idle handlers for the three queues (run with meta_later_add()). The
 * "data" parameter in each case will be a GINT_TO_POINTER of the
 * index into the queue arrays to use.
@@ -255,8 +253,6 @@ meta_window_finalize (GObject *object)
  g_free (window->gtk_window_object_path);
  g_free (window->gtk_app_menu_object_path);
  g_free (window->gtk_menubar_object_path);
-
-  G_OBJECT_CLASS (meta_window_parent_class)->finalize (object);
 }

 static void
@@ -4790,12 +4786,6 @@ meta_window_update_for_monitors_changed (MetaWindow *window)
  if (window->type == META_WINDOW_DESKTOP)
    return;

-  if (window->override_redirect)
-    {
-      meta_window_update_monitor (window);
-      return;
-    }
-
  old = window->monitor;

  /* Start on primary */
@@ -6634,41 +6624,6 @@ meta_window_change_workspace_by_index (MetaWindow *window,
 #define _NET_WM_MOVERESIZE_MOVE_KEYBOARD    10
 #define _NET_WM_MOVERESIZE_CANCEL           11

-static int
-query_pressed_buttons (MetaWindow *window)
-{
-  double x, y, query_root_x, query_root_y;
-  Window root, child;
-  XIButtonState buttons;
-  XIModifierState mods;
-  XIGroupState group;
-  int button = 0;
-
-  meta_error_trap_push (window->display);
-  XIQueryPointer (window->display->xdisplay,
-                  META_VIRTUAL_CORE_POINTER_ID,
-                  window->xwindow,
-                  &root, &child,
-                  &query_root_x, &query_root_y,
-                  &x, &y,
-                  &buttons, &mods, &group);
-
-  if (meta_error_trap_pop_with_return (window->display) != Success)
-    goto out;
-
-  if (XIMaskIsSet (buttons.mask, Button1))
-    button |= 1 << 1;
-  if (XIMaskIsSet (buttons.mask, Button2))
-    button |= 1 << 2;
-  if (XIMaskIsSet (buttons.mask, Button3))
-    button |= 1 << 3;
-
-  free (buttons.mask);
-
- out:
-  return button;
-}
-
 gboolean
 meta_window_client_message (MetaWindow *window,
                            XEvent     *event)
@@ -7027,58 +6982,56 @@ meta_window_client_message (MetaWindow *window,
                (op != META_GRAB_OP_MOVING &&
                 op != META_GRAB_OP_KEYBOARD_MOVING))))
        {
-          int button_mask;
-
-          meta_topic (META_DEBUG_WINDOW_OPS,
-                      "Beginning move/resize with button = %d\n", button);
-          meta_display_begin_grab_op (window->display,
-                                      window->screen,
-                                      window,
-                                      op,
-                                      FALSE,
-                                      frame_action,
-                                      button, 0,
-                                      timestamp,
-                                      x_root,
-                                      y_root);
-
-          button_mask = query_pressed_buttons (window);
-
+          /*
+           * the button SHOULD already be included in the message
+           */
          if (button == 0)
            {
-              /*
-               * the button SHOULD already be included in the message
+              double x, y, query_root_x, query_root_y;
+              Window root, child;
+              XIButtonState buttons;
+              XIModifierState mods;
+              XIGroupState group;
+
+              /* The race conditions in this _NET_WM_MOVERESIZE thing
+               * are mind-boggling
               */
-              if ((button_mask & (1 << 1)) != 0)
+              meta_error_trap_push (window->display);
+              XIQueryPointer (window->display->xdisplay,
+                              META_VIRTUAL_CORE_POINTER_ID,
+                              window->xwindow,
+                              &root, &child,
+                              &query_root_x, &query_root_y,
+                              &x, &y,
+                              &buttons, &mods, &group);
+              meta_error_trap_pop (window->display);
+
+              if (XIMaskIsSet (buttons.mask, Button1))
                button = 1;
-              else if ((button_mask & (1 << 2)) != 0)
+              else if (XIMaskIsSet (buttons.mask, Button2))
                button = 2;
-              else if ((button_mask & (1 << 3)) != 0)
+              else if (XIMaskIsSet (buttons.mask, Button3))
                button = 3;
-
-              if (button != 0)
-                window->display->grab_button = button;
              else
-                meta_display_end_grab_op (window->display,
-                                          timestamp);
-            }
-          else
-            {
-              /* There is a potential race here. If the user presses and
-               * releases their mouse button very fast, it's possible for
-               * both the ButtonPress and ButtonRelease to be sent to the
-               * client before it can get a chance to send _NET_WM_MOVERESIZE
-               * to us. When that happens, we'll become stuck in a grab
-               * state, as we haven't received a ButtonRelease to cancel the
-               * grab.
-               *
-               * We can solve this by querying after we take the explicit
-               * pointer grab -- if the button isn't pressed, we cancel the
-               * drag immediately.
-               */
+                button = 0;

-              if ((button_mask & (1 << button)) == 0)
-                meta_display_end_grab_op (window->display, timestamp);
+              free (buttons.mask);
+            }
+
+          if (button != 0)
+            {
+              meta_topic (META_DEBUG_WINDOW_OPS,
+                          "Beginning move/resize with button = %d\n", button);
+              meta_display_begin_grab_op (window->display,
+                                          window->screen,
+                                          window,
+                                          op,
+                                          FALSE,
+                                          frame_action,
+                                          button, 0,
+                                          timestamp,
+                                          x_root,
+                                          y_root);
            }
        }

@@ -9054,7 +9007,7 @@ update_move (MetaWindow  *window,
       * refers to the monitor which contains the largest part of the window,
       * the latter to the one where the pointer is located.
       */
-      monitor = meta_screen_get_current_monitor_info_for_pos (window->screen, x, y);
+      monitor = meta_screen_get_current_monitor_info (window->screen);
      meta_window_get_work_area_for_monitor (window,
                                             monitor->number,
                                             &work_area);
--- a/src/meta/display.h
+++ b/src/meta/display.h
@@ -187,11 +187,12 @@ void meta_display_unmanage_screen (MetaDisplay *display,

 void meta_display_clear_mouse_mode (MetaDisplay *display);

-void meta_display_freeze_keyboard (MetaDisplay *display,
-                                   Window       window,
-                                   guint32      timestamp);
+void meta_display_grab_keyboard (MetaDisplay *display,
+                                 guint32      timestamp);
 void meta_display_ungrab_keyboard (MetaDisplay *display,
                                   guint32      timestamp);
+void meta_display_freeze_keyboard (MetaDisplay *display,
+                                   guint32      timestamp);
 void meta_display_unfreeze_keyboard (MetaDisplay *display,
                                     guint32      timestamp);
 #endif
--- a/src/meta/prefs.h
+++ b/src/meta/prefs.h
@@ -443,7 +443,7 @@ void meta_prefs_get_window_binding (const char          *name,
                                    MetaVirtualModifier *modifiers);

 void meta_prefs_get_overlay_binding (MetaKeyCombo *combo);
-const char *meta_prefs_get_iso_next_group_option (void);
+char *meta_prefs_get_iso_next_group_option (void);

 gboolean           meta_prefs_get_visual_bell      (void);
 gboolean           meta_prefs_bell_is_audible      (void);
--- a/src/meta/screen.h
+++ b/src/meta/screen.h
@@ -78,9 +78,6 @@ MetaWorkspace * meta_screen_get_active_workspace (MetaScreen *screen);
 int  meta_screen_get_n_monitors       (MetaScreen    *screen);
 int  meta_screen_get_primary_monitor  (MetaScreen    *screen);
 int  meta_screen_get_current_monitor  (MetaScreen    *screen);
-int  meta_screen_get_current_monitor_for_pos  (MetaScreen    *screen,
-                                               int x,
-                                               int y);
 void meta_screen_get_monitor_geometry (MetaScreen    *screen,
                                       int            monitor,
                                       MetaRectangle *geometry);
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -664,14 +664,20 @@ meta_frames_lookup_window (MetaFrames *frames,
  return frame;
 }

-static void
-meta_ui_frame_get_borders (MetaFrames *frames,
-                           MetaUIFrame *frame,
-                           MetaFrameBorders *borders)
+void
+meta_frames_get_borders (MetaFrames *frames,
+                         Window xwindow,
+                         MetaFrameBorders *borders)
 {
  MetaFrameFlags flags;
+  MetaUIFrame *frame;
  MetaFrameType type;
+  
+  frame = meta_frames_lookup_window (frames, xwindow);

+  if (frame == NULL)
+    meta_bug ("No such frame 0x%lx\n", xwindow);
+  
  meta_core_get (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), frame->xwindow,
                 META_CORE_GET_FRAME_FLAGS, &flags,
                 META_CORE_GET_FRAME_TYPE, &type,
@@ -694,30 +700,18 @@ meta_ui_frame_get_borders (MetaFrames *frames,
 }

 void
-meta_frames_get_borders (MetaFrames *frames,
-                         Window xwindow,
-                         MetaFrameBorders *borders)
+meta_frames_get_corner_radiuses (MetaFrames *frames,
+                                 Window      xwindow,
+                                 float      *top_left,
+                                 float      *top_right,
+                                 float      *bottom_left,
+                                 float      *bottom_right)
 {
  MetaUIFrame *frame;
+  MetaFrameGeometry fgeom;

  frame = meta_frames_lookup_window (frames, xwindow);

-  if (frame == NULL)
-    meta_bug ("No such frame 0x%lx\n", xwindow);
-
-  meta_ui_frame_get_borders (frames, frame, borders);
-}
-
-static void
-meta_ui_frame_get_corner_radiuses (MetaFrames  *frames,
-                                   MetaUIFrame *frame,
-                                   float       *top_left,
-                                   float       *top_right,
-                                   float       *bottom_left,
-                                   float       *bottom_right)
-{
-  MetaFrameGeometry fgeom;
-
  meta_frames_calc_geometry (frames, frame, &fgeom);

  /* For compatibility with the code in get_visible_rect(), there's
@@ -739,22 +733,6 @@ meta_ui_frame_get_corner_radiuses (MetaFrames  *frames,
    *bottom_right = fgeom.bottom_right_corner_rounded_radius + sqrt(fgeom.bottom_right_corner_rounded_radius);
 }

-void
-meta_frames_get_corner_radiuses (MetaFrames *frames,
-                                 Window      xwindow,
-                                 float      *top_left,
-                                 float      *top_right,
-                                 float      *bottom_left,
-                                 float      *bottom_right)
-{
-  MetaUIFrame *frame;
-
-  frame = meta_frames_lookup_window (frames, xwindow);
-
-  meta_ui_frame_get_corner_radiuses (frames, frame, top_left, top_right,
-                                     bottom_left, bottom_right);
-}
-
 void
 meta_frames_reset_bg (MetaFrames *frames,
                      Window  xwindow)
Author	SHA1	Message	Date
Rui Matos	2467439d94	keybindings: Fix ungrabbing of keys XUngrabKey() doesn't work for XI2 grabs and XI2 doesn't provide API with similar functionality. As such, we have to refactor the code a bit to be able to call XIUngrabKeycode() for each key binding, then reload keybindings and finally grab the new ones. https://bugzilla.gnome.org/show_bug.cgi?id=697003	2013-04-04 12:00:08 +02:00
Rui Matos	0e83b748d5	Grab and emit a signal when XK_ISO_Next_Group is pressed This will make it possible to implement input source switching in gnome-shell using the popular modifiers-only keybinding that's implemented on the X server through an XKB option. https://bugzilla.gnome.org/show_bug.cgi?id=697002	2013-04-04 12:00:07 +02:00
Rui Matos	bda4af5504	keybindings: Add API to freeze/unfreeze the keyboard We'll use this in gnome-shell to freeze the keyboard right before switching input source and unfreeze it after that's finished so that we don't lose any key events to the wrong input source. https://bugzilla.gnome.org/show_bug.cgi?id=697001	2013-04-01 14:21:03 +02:00
Rui Matos	f97d8dfb6c	prefs: Fix binding remaining grabbed after clearing all strokes If a binding is updated with a clear set of strokes (effectively disabling it) we aren't signaling that the binding changed and thus the previous strokes will continue to be grabbed. This fixes that and tries to do a better effort at checking if the binding changed or not. https://bugzilla.gnome.org/show_bug.cgi?id=697000	2013-04-01 14:21:03 +02:00