- updated the nofocuswindows_prefs patch for gcc 4.5

This commit is contained in:
Dan Horák 2010-07-20 08:30:15 +00:00
parent ce5c7c0ab5
commit b2a865c3df
2 changed files with 9 additions and 6 deletions

View File

@ -436,7 +436,7 @@ index 0000000..e2fd293
+ }
+
+ token = g_scanner_get_next_token (scanner);
+ switch (token)
+ switch ((MatcherToken) token)
+ {
+ case MATCHER_TOKEN_AND:
+ case MATCHER_TOKEN_OR:
@ -448,7 +448,7 @@ index 0000000..e2fd293
+ if (!a)
+ return NULL;
+
+ if (token != MATCHER_TOKEN_NOT)
+ if ((MatcherToken) token != MATCHER_TOKEN_NOT)
+ {
+ b = meta_window_matcher_from_scanner (scanner, error);
+ if (!b)
@ -458,7 +458,7 @@ index 0000000..e2fd293
+ }
+ }
+
+ switch (token)
+ switch ((MatcherToken) token)
+ {
+ case MATCHER_TOKEN_AND:
+ matcher = meta_window_matcher_new_and (a, b);
@ -480,7 +480,7 @@ index 0000000..e2fd293
+ {
+ MatcherOperand operand;
+
+ switch (g_scanner_get_next_token (scanner))
+ switch ((MatcherToken) g_scanner_get_next_token (scanner))
+ {
+ case MATCHER_TOKEN_NAME:
+ operand = MATCHER_OPERAND_NAME;
@ -501,7 +501,7 @@ index 0000000..e2fd293
+
+ value = g_scanner_cur_value (scanner);
+
+ switch (token)
+ switch ((MatcherToken) token)
+ {
+ case MATCHER_TOKEN_EQ:
+ matcher = meta_window_matcher_new_eq (operand, value.v_string);

View File

@ -3,7 +3,7 @@
Summary: Unobtrusive window manager
Name: metacity
Version: 2.30.0
Release: 6%{?dist}
Release: 7%{?dist}
URL: http://download.gnome.org/sources/metacity/
Source0: http://download.gnome.org/sources/metacity/2.30/metacity-%{version}.tar.bz2
# http://bugzilla.gnome.org/show_bug.cgi?id=558723
@ -243,6 +243,9 @@ fi
%{_mandir}/man1/metacity-window-demo.1.gz
%changelog
* Tue Jul 20 2010 Dan Horák <dan[at]danny.cz> - 2.30.0-7
- updated the nofocuswindows_prefs patch for gcc 4.5
* Wed Jun 23 2010 Owen Taylor <otaylor@redhat.com> - 2.30.0-6
- Add patch to allow breaking out from maximization during mouse resize
(gnome bz 622517)