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

Conflicts:
	xscreensaver/hacks/screenhack.c

diff --git a/xscreensaver/hacks/screenhack.c b/xscreensaver/hacks/screenhack.c
index 8414e54..799bf84 100644 (file)
--- a/xscreensaver/hacks/screenhack.c
+++ b/xscreensaver/hacks/screenhack.c
@@ -673,7 +673,7 @@ run_screenhack_table (Display *dpy,
           (view == 4 && dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_PAUSE_LIVEBG_ON_VIEW4))){
            fprintf(stderr, "Pause scene visible %i\n", view); 
           pause = 1;
-          dbus_message_unref (msg);
+          dbus_message_unref (msg); 
           continue;
       }
       if ((view == 1 && dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_PLAY_LIVEBG_ON_VIEW1))||
@@ -682,12 +682,16 @@ run_screenhack_table (Display *dpy,
           (view == 4 && dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_PLAY_LIVEBG_ON_VIEW4))){
            fprintf(stderr, "Play scene visible %i\n", view); 
           pause = 0;
-          dbus_message_unref (msg);
+          dbus_message_unref (msg); 
           continue;
       }
+<<<<<<< HEAD
+      dbus_message_unref (msg); 
+=======
 */
       
       /*dbus_message_unref (msg);*/
+>>>>>>> 392e81dc1f7b4a895b1838457380c376a80f9186
     }
 
   ft->free_cb (dpy, window, closure);