rpms/libwnck/devel libwnck.spec, 1.86, 1.87 no-resource-extension.patch, 1.1, 1.2

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/libwnck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32368

Modified Files:
	libwnck.spec no-resource-extension.patch 
Log Message:
fix small issues in the previous fix



Index: libwnck.spec
===================================================================
RCS file: /cvs/extras/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- libwnck.spec	22 Oct 2007 16:57:12 -0000	1.86
+++ libwnck.spec	22 Oct 2007 17:28:54 -0000	1.87
@@ -6,7 +6,7 @@
 Summary: Window Navigator Construction Kit
 Name: libwnck
 Version: 2.20.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://download.gnome.org/sources/libwnck/
 Source0: http://download.gnome.org/sources/libwnck/2.20/%{name}-%{version}.tar.bz2
 License: LGPLv2+
@@ -103,6 +103,9 @@
 %doc %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Mon Oct 22 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.1-3
+- Fix a small oversight in the previous patch
+
 * Mon Oct 22 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.1-2
 - Don't crash if the X resource extension is missing (#343881)
 

no-resource-extension.patch:

Index: no-resource-extension.patch
===================================================================
RCS file: /cvs/extras/rpms/libwnck/devel/no-resource-extension.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- no-resource-extension.patch	22 Oct 2007 16:57:12 -0000	1.1
+++ no-resource-extension.patch	22 Oct 2007 17:28:54 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up libwnck-2.20.1/libwnck/util.c.no-resource-extension libwnck-2.20.1/libwnck/util.c
---- libwnck-2.20.1/libwnck/util.c.no-resource-extension	2007-10-22 12:36:51.000000000 -0400
-+++ libwnck-2.20.1/libwnck/util.c	2007-10-22 12:36:55.000000000 -0400
+--- libwnck-2.20.1/libwnck/util.c.no-resource-extension	2007-10-15 18:37:33.000000000 -0400
++++ libwnck-2.20.1/libwnck/util.c	2007-10-22 13:26:23.000000000 -0400
 @@ -114,32 +114,13 @@ _wnck_print_resource_usage (WnckResource
  }
  #endif
@@ -36,13 +36,10 @@
    xdisplay = GDK_DISPLAY_XDISPLAY (gdisplay);
  
    status = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (gdisplay),
-@@ -163,13 +144,37 @@ wnck_xid_read_resource_usage (GdkDisplay
+@@ -163,13 +144,39 @@ wnck_xid_read_resource_usage (GdkDisplay
  
    g_assert (status != WNCK_EXT_UNKNOWN);
  
--  memset (usage, '\0', sizeof (*usage));
--  
--  if (status == WNCK_EXT_MISSING)
 +  return status;
 +}
 +
@@ -68,6 +65,10 @@
 +{
 +  g_return_if_fail (usage != NULL);
 +
+   memset (usage, '\0', sizeof (*usage));
+-  
+-  if (status == WNCK_EXT_MISSING)
++
 +  if (wnck_init_resource_usage (gdisplay) == WNCK_EXT_MISSING)
      return;
  
@@ -77,7 +78,16 @@
     XResType *types;
     int n_types;
     unsigned long pixmap_bytes;
-@@ -608,12 +613,12 @@ wnck_pid_read_resource_usage (GdkDisplay
+@@ -190,6 +197,8 @@ wnck_xid_read_resource_usage (GdkDisplay
+    
+   _wnck_error_trap_push ();
+ 
++  xdisplay = GDK_DISPLAY_XDISPLAY (gdisplay);
++
+   XResQueryClientResources (xdisplay,
+                              xid, &n_types,
+                              &types);
+@@ -608,12 +617,12 @@ wnck_pid_read_resource_usage (GdkDisplay
  {
    g_return_if_fail (usage != NULL);