Permalink
Browse files

Merge branch 'master' of ssh://git.gnome.org/git/metacity

  • Loading branch information...
2 parents 5828c6a + e752269 commit 97d54ca0c26f210f1a5fc4abfd19e3f4ab1b48da @tthurman committed Jun 17, 2011
Showing with 13,511 additions and 12,266 deletions.
  1. +72 −0 NEWS
  2. +8 −26 configure.in
  3. +528 −521 po/as.po
  4. +290 −295 po/bg.po
  5. +247 −179 po/ca.po
  6. +373 −302 po/ca@valencia.po
  7. +473 −388 po/cs.po
  8. +348 −277 po/da.po
  9. +312 −218 po/el.po
  10. +314 −246 po/en_GB.po
  11. +372 −312 po/eo.po
  12. +268 −239 po/eu.po
  13. +353 −280 po/fi.po
  14. +236 −252 po/hu.po
  15. +880 −520 po/id.po
  16. +397 −325 po/ja.po
  17. +311 −228 po/lt.po
  18. +65 −103 po/lv.po
  19. +66 −66 po/nb.po
  20. +348 −407 po/nl.po
  21. +518 −549 po/or.po
  22. +233 −137 po/pa.po
  23. +242 −237 po/pl.po
  24. +313 −244 po/pt.po
  25. +305 −234 po/pt_BR.po
  26. +349 −255 po/ro.po
  27. +539 −888 po/ru.po
  28. +655 −599 po/sr.po
  29. +653 −597 po/sr@latin.po
  30. +356 −285 po/ta.po
  31. +333 −265 po/ug.po
  32. +211 −229 po/uk.po
  33. +2,493 −2,535 po/vi.po
  34. +2 −0 src/core/above-tab-keycode.c
  35. +1 −1 src/core/display.c
  36. +9 −1 src/core/keybindings.c
  37. +2 −1 src/core/keybindings.h
  38. +1 −1 src/core/main.c
  39. +2 −2 src/include/all-keybindings.h
  40. +33 −22 src/ui/theme-parser.c
View
72 NEWS
@@ -1,3 +1,75 @@
+==============
+Version 2.34.0
+==============
+
+ - Update keybindings when XKB keyboard layout changes (Derek Poon, Owen
+ Taylor)
+ - Unify keymap-reloading code branches (Owen Taylor, Thomas Thurman)
+ - Fix drawing of <arc> elements (Nickolas Lloyd)
+ - Add an "Above_Tab" pseudo-keysym (Owen Taylor)
+ - Fix default workspace names (Thomas Thurman)
+ - Log error if writing fail when handling SIGTERM (Christian Kirbach)
+ - Rework keybinding configuration files (William Jon McCann)
+ - Honour _NET_RESTACK_WINDOW and sibling-relative stacking (Christian Hammond)
+ - Allow applications to raise windows when raise_on_click is off (Owen Taylor)
+ - Allow explicit raises from same client, not just same app (Owen Taylor)
+ - Set RestartStyleHint to RestartIfRunning when replaced (Owen Taylor)
+ - Fix background functions for non-default layouts (Florian Müllner)
+ - Use GNOME 3 theme defaults (Matthias Clasen)
+ - Do not use an icon menu on the titlebar (William Jon McCann)
+ - Disable 'Show desktop' keybinding by default (Matthias Clasen)
+ - Make color constants work without warnings (Owen Taylor)
+ - Small bug fixes (Marcus Carlson, Sascha Silbe, Xu Li, Thomas Thurman, Colin
+ Walters)
+ - Make it possible to build without libcanberra (Michael Smith)
+ - Build fixes for Solaris (Brian Cameron)
+
+Translations:
+ Khaled Hosny (ar)
+ Nilamdyuti Goswami (as)
+ Alexander Shopov (bg)
+ David Planella (ca)
+ David Planella (ca@valencia)
+ Marek Černocký (cs)
+ Ask Hjorth Larsen (da)
+ Mario Blättermann (de)
+ Jennie Petoumenou (el)
+ Bruce Cowan (en_GB)
+ Jorge González (es)
+ Ivar Smolin (et)
+ Iñaki Larrañaga Murgoitio (eu)
+ Mahyar Moghimi (fa)
+ Alain Lojewski (fr)
+ Fran Diéguez (gl)
+ Sweta Kothari (gu)
+ Yaron Shahrabani (he)
+ Gabor Kelemen (hu)
+ Dirgita (id)
+ Luca Ferretti (it)
+ Changwoo Ryu (ko)
+ Gintautas Miliauskas (lt)
+ Rudolfs (lv)
+ Kjartan Maraas (nb)
+ Wouter Bolsterlee (nl)
+ Manoj Kumar Giri (or)
+ A S Alam (pa)
+ Piotr Drąg (pl)
+ Duarte Loreto (pt)
+ Krix Apolinário (pt_BR)
+ Lucian Adrian Grijincu (ro)
+ Yuri Myaseodov (ru)
+ Matej Urbančič (sl)
+ Мирослав Николић (sr)
+ Miroslav Nikolić (sr@latin)
+ Daniel Nylander (sv)
+ Dr.T.Vasudevan (ta)
+ Gheyret Kenji (ug)
+ Korostil Daniel (uk)
+ Clytie Siddall (vi)
+ Lele Long (zh_CN)
+ Chao-Hsiung Liao (zh_HK)
+ Chao-Hsiung Liao (zh_TW)
+
2.30.3
======
View
@@ -1,10 +1,10 @@
AC_PREREQ(2.50)
m4_define([metacity_major_version], [2])
-m4_define([metacity_minor_version], [32])
+m4_define([metacity_minor_version], [34])
# Fibonacci sequence for micro version numbering:
# 0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987
-m4_define([metacity_micro_version], [0])
+m4_define([metacity_micro_version], [1])
m4_define([metacity_version],
[metacity_major_version.metacity_minor_version.metacity_micro_version])
@@ -107,27 +107,12 @@ if test "x$GCC" = "xyes"; then
fi
changequote([,])dnl
-AC_MSG_CHECKING([which gtk+ version to compile against])
-AC_ARG_WITH([gtk],
- AC_HELP_STRING([--with-gtk=2.0|3.0],
- [which gtk+ version to compile against (default: 2.0)]),
- [case "$with_gtk" in
- 2.0|3.0) ;;
- *) AC_MSG_ERROR([invalid gtk+ version specified]);;
- esac],
- [with_gtk=2.0])
-AC_MSG_RESULT([$with_gtk])
-
-case "$with_gtk" in
- 2.0) GTK_API_VERSION=2.0
- GTK_MIN_VERSION=2.20.0
- CANBERRA_GTK=libcanberra-gtk
- ;;
- 3.0) GTK_API_VERSION=3.0
- GTK_MIN_VERSION=2.90.0
- CANBERRA_GTK=libcanberra-gtk3
- ;;
-esac
+dnl This used to purport to allow compilation against gtk3, but it doesn't actually
+dnl work; see https://bugzilla.gnome.org/show_bug.cgi?id=650513
+with_gtk=2.0
+GTK_API_VERSION=2.0
+GTK_MIN_VERSION=2.20.0
+CANBERRA_GTK=libcanberra-gtk
METACITY_PC_MODULES="gtk+-$GTK_API_VERSION >= $GTK_MIN_VERSION pango >= 1.2.0"
AC_SUBST(GTK_API_VERSION)
@@ -533,9 +518,6 @@ fi
# Warnings are there for a reason
if test "x$GCC" = "xyes"; then
CFLAGS="$CFLAGS -Wall -ansi"
- if test "x$enable_maintainer_mode" = "xyes"; then
- CFLAGS="$CFLAGS -Werror"
- fi
fi
# Use gnome-doc-utils:
Oops, something went wrong.

0 comments on commit 97d54ca

Please sign in to comment.