# HG changeset patch
# User giacomo
# Date 1174241625 25200
# Node ID 623eca8326e561ec8a3c3ba0ad1f66a0a335ca1e
# Parent  5b29a6fe9295236a8974502da942ce62330a700b
[svn] - aosd: beta3, fixes for handling X display open/close

diff -r 5b29a6fe9295 -r 623eca8326e5 ChangeLog
--- a/ChangeLog	Sat Mar 17 00:58:49 2007 -0700
+++ b/ChangeLog	Sun Mar 18 11:13:45 2007 -0700
@@ -1,3 +1,11 @@
+2007-03-17 07:58:49 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [1848]
+  - clear up some configure bugs, pointed out by freebsd port patches
+  
+  trunk/configure.ac |   18 +++++++++---------
+  1 file changed, 9 insertions(+), 9 deletions(-)
+
+
 2007-03-17 07:30:46 +0000  Daniel Bradshaw <nazca@atheme.org>
   revision [1846]
   - These two lines probably shouldn't be in here as it is doubtful they do anything helpful
diff -r 5b29a6fe9295 -r 623eca8326e5 src/aosd/aosd_common.h
--- a/src/aosd/aosd_common.h	Sat Mar 17 00:58:49 2007 -0700
+++ b/src/aosd/aosd_common.h	Sun Mar 18 11:13:45 2007 -0700
@@ -30,6 +30,6 @@
 
 #include "../../config.h"
 
-#define AOSD_VERSION_PLUGIN "0.1beta2"
+#define AOSD_VERSION_PLUGIN "0.1beta3"
 
 #endif /* !_I_AOSD_COMMON_H */
diff -r 5b29a6fe9295 -r 623eca8326e5 src/aosd/aosd_osd.c
--- a/src/aosd/aosd_osd.c	Sat Mar 17 00:58:49 2007 -0700
+++ b/src/aosd/aosd_osd.c	Sun Mar 18 11:13:45 2007 -0700
@@ -99,7 +99,9 @@
 {
   if ( osd_data->fade_data.surface != NULL )
   {
-    cairo_surface_destroy( osd_data->fade_data.surface );
+    /* by using XCloseDisplay in ghosd_destroy, this free is not needed
+       anymore (doing it will result in double free and segfault)
+      cairo_surface_destroy( osd_data->fade_data.surface ); */
     osd_data->fade_data.surface = NULL;
   }
 
diff -r 5b29a6fe9295 -r 623eca8326e5 src/aosd/ghosd.c
--- a/src/aosd/ghosd.c	Sat Mar 17 00:58:49 2007 -0700
+++ b/src/aosd/ghosd.c	Sun Mar 18 11:13:45 2007 -0700
@@ -291,6 +291,7 @@
   if (ghosd->background)
     XFreePixmap(ghosd->dpy, ghosd->background);
   XDestroyWindow(ghosd->dpy, ghosd->win);
+  XCloseDisplay(ghosd->dpy);
 }
 
 int