diff options
| author | Dan Horák <sharkcz@fedoraproject.org> | 2010-07-20 08:30:15 +0000 |
|---|---|---|
| committer | Dan Horák <sharkcz@fedoraproject.org> | 2010-07-20 08:30:15 +0000 |
| commit | b2a865c3df9e34e9511c4507954c9147453e10dc (patch) | |
| tree | 790f57a4fe32174d87ba2aa91dd125ffbff5c9d0 | |
| parent | ce5c7c0ab587a36ec4c981e3e12b71a001699ee2 (diff) | |
| download | metacity-b2a865c3df9e34e9511c4507954c9147453e10dc.tar.gz metacity-b2a865c3df9e34e9511c4507954c9147453e10dc.tar.xz metacity-b2a865c3df9e34e9511c4507954c9147453e10dc.zip | |
- updated the nofocuswindows_prefs patch for gcc 4.5metacity-2_30_0-7_fc14
| -rw-r--r-- | Add-nofocuswindows-preference-to-list-windows-that.patch | 10 | ||||
| -rw-r--r-- | metacity.spec | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/Add-nofocuswindows-preference-to-list-windows-that.patch b/Add-nofocuswindows-preference-to-list-windows-that.patch index ddad5be..de0eed4 100644 --- a/Add-nofocuswindows-preference-to-list-windows-that.patch +++ b/Add-nofocuswindows-preference-to-list-windows-that.patch @@ -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); diff --git a/metacity.spec b/metacity.spec index 6e158ea..c625042 100644 --- a/metacity.spec +++ b/metacity.spec @@ -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) |