rpms/notification-daemon-engine-slider/devel crash.patch, NONE, 1.1 notification-daemon-engine-slider.spec, 1.3, 1.4

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/notification-daemon-engine-slider/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10938

Modified Files:
	notification-daemon-engine-slider.spec 
Added Files:
	crash.patch 
Log Message:
Fix a sporadic crash.


crash.patch:
 theme.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE crash.patch ---
diff -up notification-daemon-engine-slider-0.2.0/src/theme.c.crash notification-daemon-engine-slider-0.2.0/src/theme.c
--- notification-daemon-engine-slider-0.2.0/src/theme.c.crash	2009-12-17 13:44:21.348123579 -0500
+++ notification-daemon-engine-slider-0.2.0/src/theme.c	2009-12-17 13:48:52.487096848 -0500
@@ -186,6 +186,11 @@ update_shape (WindowData *windata)
         GdkBitmap *mask;
         cairo_t   *cr;
 
+        if (windata->width == 0 || windata->height == 0) {
+                windata->width = MAX (windata->win->allocation.width, 1);
+                windata->height = MAX (windata->win->allocation.height, 1);
+        }
+
         if (windata->composited) {
                 gtk_widget_shape_combine_mask (windata->win, NULL, 0, 0);
                 return;
@@ -228,9 +233,9 @@ paint_window (GtkWidget     *widget,
         cairo_surface_t *surface;
         cairo_t         *cr;
 
-        if (windata->width == 0) {
-                windata->width = windata->win->allocation.width;
-                windata->height = windata->win->allocation.height;
+        if (windata->width == 0 || windata->height == 0) {
+                windata->width = MAX (windata->win->allocation.width, 1);
+                windata->height = MAX (windata->win->allocation.height, 1);
         }
 
         context = gdk_cairo_create (widget->window);


Index: notification-daemon-engine-slider.spec
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon-engine-slider/devel/notification-daemon-engine-slider.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- notification-daemon-engine-slider.spec	28 Sep 2009 20:00:54 -0000	1.3
+++ notification-daemon-engine-slider.spec	17 Dec 2009 19:50:54 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           notification-daemon-engine-slider
 Version:        0.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Slider theme engine for the notification daemon
 
 Group:          System Environment/Libraries
@@ -12,12 +12,16 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  gtk2-devel >= 2.17.1
 Requires:       notification-daemon
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=548504
+Patch0:		crash.patch
+
 %description
 The Slider theme engine for the notification daemon.
 
 
 %prep
 %setup -q
+%patch0 -p1 -b .crash
 
 %build
 %configure
@@ -42,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/notification-daemon-1.0/engines/libslider.so
 
 %changelog
+* Thu Dec 17 2009 Matthias Clasen <mclasen at redhat.com> - 0.2.0-2
+- Fix a sporadic crash (#548504)
+
 * Mon Sep 28 2009 Jon McCann <jmccann at redhat.com> - 0.2.0-1
 - Update to 0.2.0