Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver

diff --git a/xscreensaver/debian/rules b/xscreensaver/debian/rules
index 918889e..04ab9ee 100755 (executable)
--- a/xscreensaver/debian/rules
+++ b/xscreensaver/debian/rules
@@ -99,6 +99,8 @@ binary-arch:  build
        #for i in $$( ls debian/tmp/usr/share/man/man6/ ); do mv debian/tmp/usr/share/man/man6/$$i debian/tmp/usr/share/man/man6/$$( echo $$i )x; done 
        for i in debian/tmp/usr/share/man/man6/*; do mv $${i} $${i}x; done
        mkdir -p debian/tmp/usr/share/livewp/external_themes 
+       mkdir -p $(CURDIR)/debian/tmp/usr/share/livewp/external_icons
+       cp $(CURDIR)/debian/*.png $(CURDIR)/debian/tmp/usr/share/livewp/external_icons/
        ls 
        
        for i in `cd debian/tmp/usr/share/xscreensaver/config ; find . -name "*.xml" -type f -print`; do echo $${i} ; cat debian/tmp/usr/share/xscreensaver/config/$${i} | grep "<screensaver"| \

diff --git a/xscreensaver/debian/xscreensaver.files b/xscreensaver/debian/xscreensaver.files
index b63cbc0..5e721a0 100644 (file)
--- a/xscreensaver/debian/xscreensaver.files
+++ b/xscreensaver/debian/xscreensaver.files
@@ -390,4 +390,6 @@ usr/share/livewp/external_themes/xrayswarm.xml
 usr/share/livewp/external_themes/xsnow.xml
 usr/share/livewp/external_themes/xspirograph.xml
 usr/share/livewp/external_themes/zoom.xml
+usr/share/livewp/external_icons/icon.png
+usr/share/livewp/external_icons/icond.png
 

diff --git a/xscreensaver/hacks/screenhack.c b/xscreensaver/hacks/screenhack.c
index ea2bce0..6069d9d 100644 (file)
--- a/xscreensaver/hacks/screenhack.c
+++ b/xscreensaver/hacks/screenhack.c
@@ -625,8 +625,8 @@ run_screenhack_table (Display *dpy,
       if (start_frame > 0) {
           start_frame--;
           continue;
-        }
-        dbus_connection_flush(conn);
+      }
+        
       if (pause == 0)
       /* non blocking read of the next available message */
        dbus_connection_read_write(conn, 0);
@@ -691,7 +691,7 @@ run_screenhack_table (Display *dpy,
           }
       }    
 #endif      
-      dbus_message_unref (msg);
+/*      dbus_message_unref (msg); */
     }
 
   ft->free_cb (dpy, window, closure);