rpms/libwnck/devel crash-on-shutdown.patch, NONE, 1.1 libwnck.spec, 1.76, 1.77

Matthias Clasen (mclasen) fedora-extras-commits at redhat.com
Tue Jul 24 18:04:18 UTC 2007


Author: mclasen

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

Modified Files:
	libwnck.spec 
Added Files:
	crash-on-shutdown.patch 
Log Message:
make the wnck-applet not crash on shutdown


crash-on-shutdown.patch:

--- NEW FILE crash-on-shutdown.patch ---
diff -up libwnck-2.19.5/libwnck/pager.c.crash-on-shutdown libwnck-2.19.5/libwnck/pager.c
--- libwnck-2.19.5/libwnck/pager.c.crash-on-shutdown	2007-07-24 13:52:43.000000000 -0400
+++ libwnck-2.19.5/libwnck/pager.c	2007-07-24 13:53:47.000000000 -0400
@@ -622,6 +622,16 @@ get_workspace_rect (WnckPager    *pager,
   
   n_spaces = wnck_screen_get_workspace_count (pager->priv->screen);
 
+  if (n_spaces == 0)
+    {
+      rect->x = 0;
+      rect->y = 0;
+      rect->width = 0;
+      rect->height = 0;
+
+      return;
+    }
+
   g_assert (pager->priv->n_rows > 0);
   spaces_per_row = (n_spaces + pager->priv->n_rows - 1) / pager->priv->n_rows;
   


Index: libwnck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- libwnck.spec	9 Jul 2007 03:59:24 -0000	1.76
+++ libwnck.spec	24 Jul 2007 18:03:43 -0000	1.77
@@ -6,7 +6,7 @@
 Summary: Window Navigator Construction Kit
 Name: libwnck
 Version: 2.19.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://download.gnome.org/sources/libwnck/
 Source0: http://download.gnome.org/sources/libwnck/2.19/%{name}-%{version}.tar.bz2
 License: LGPL
@@ -32,6 +32,8 @@
 Patch3: libwnck-2.19.4-appearance.patch
 Patch4: libwnck-2.19.5-viewport.patch
 Patch5: libwnck-2.18.0-above.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=459984
+Patch6: crash-on-shutdown.patch
 
 %description
 
@@ -65,6 +67,7 @@
 %patch3 -p1 -b .appearance
 %patch4 -p1 -b .viewport
 %patch5 -p1 -b .above
+%patch6 -p1 -b .crash-on-shutdown
 
 %build
 
@@ -104,6 +107,9 @@
 %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Tue Jul 24 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.5-2
+- Fix a crash on shutdown in the wnck-applet
+
 * Sun Jul  8 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.5-1
 - Update to 2.19.5
 




More information about the scm-commits mailing list