rpms/metacity/devel Add-nofocuswindows-preference-to-list-windows-that.patch, 1.1, 1.2 metacity.spec, 1.222, 1.223

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/metacity/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3734

Modified Files:
	Add-nofocuswindows-preference-to-list-windows-that.patch 
	metacity.spec 
Log Message:
* Tue Jul 20 2010 Dan Horák <dan[at]danny.cz> - 2.30.0-7
- updated the nofocuswindows_prefs patch for gcc 4.5


Add-nofocuswindows-preference-to-list-windows-that.patch:
 Makefile.am            |    2 
 core/prefs.c           |   43 +++
 core/window-matcher.c  |  582 +++++++++++++++++++++++++++++++++++++++++++++++++
 core/window-matcher.h  |   46 +++
 core/window.c          |    9 
 include/prefs.h        |    6 
 metacity.schemas.in.in |   28 ++
 7 files changed, 714 insertions(+), 2 deletions(-)

Index: Add-nofocuswindows-preference-to-list-windows-that.patch
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/Add-nofocuswindows-preference-to-list-windows-that.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Add-nofocuswindows-preference-to-list-windows-that.patch	10 Dec 2009 23:32:59 -0000	1.1
+++ Add-nofocuswindows-preference-to-list-windows-that.patch	20 Jul 2010 08:30:15 -0000	1.2
@@ -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);


Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -p -r1.222 -r1.223
--- metacity.spec	24 Jun 2010 01:47:56 -0000	1.222
+++ metacity.spec	20 Jul 2010 08:30:15 -0000	1.223
@@ -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 at redhat.com> - 2.30.0-6
 - Add patch to allow breaking out from maximization during mouse resize
   (gnome bz 622517)