[Galago-commits] r2959 - in trunk/notification-daemon: . src/themes/standard

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2007-01-10 15:45:10 -0800 (Wed, 10 Jan 2007)
New Revision: 2959

Modified:
   trunk/notification-daemon/ChangeLog
   trunk/notification-daemon/src/themes/standard/theme.c
Log:
We were trying to compute a border in expose_event, which sometimes was called before configure_event. configure_event sets stuff that our border computerator needed, so it blew up or screwed up. We now wait for the configure_event before even trying it, and the configure_event handler now ensures that we get an expose_event.


Modified: trunk/notification-daemon/ChangeLog
===================================================================
--- trunk/notification-daemon/ChangeLog	2007-01-10 23:06:16 UTC (rev 2958)
+++ trunk/notification-daemon/ChangeLog	2007-01-10 23:45:10 UTC (rev 2959)
@@ -1,3 +1,12 @@
+Wed Jan 10 15:43:12 PST 2007  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/themes/standard/theme.c:
+	  - We were trying to compute a border in expose_event, which sometimes
+	    was called before configure_event. configure_event sets stuff that
+	    our border computerator needed, so it blew up or screwed up. We now
+	    wait for the configure_event before even trying it, and
+	    the configure_event handler now ensures that we get an expose_event.
+
 Wed Jan 10 15:05:28 PST 2007  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/themes/standard/theme.c:

Modified: trunk/notification-daemon/src/themes/standard/theme.c
===================================================================
--- trunk/notification-daemon/src/themes/standard/theme.c	2007-01-10 23:06:16 UTC (rev 2958)
+++ trunk/notification-daemon/src/themes/standard/theme.c	2007-01-10 23:45:10 UTC (rev 2959)
@@ -385,6 +385,11 @@
 			 GdkEventExpose *event,
 			 WindowData *windata)
 {
+	if (windata->width == 0) {
+		/* We haven't seen configure_event yet. Bail for now. */
+		return FALSE;
+	}
+
 	fill_background(widget, windata);
 	draw_border(widget, windata);
 	draw_stripe(widget, windata);
@@ -462,6 +467,7 @@
 	windata->height = event->height;
 
 	update_spacers(nw);
+	gtk_widget_queue_draw(nw);
 
 	return FALSE;
 }