From: vlad Date: Wed, 11 Aug 2010 19:34:43 +0000 (+0300) Subject: reverted to signal without parameters X-Git-Url: http://vcs.maemo.org/git/?p=xscreensaver;a=commitdiff_plain;h=391816f8b6b0f5f372589947dcf58813a977ada1 reverted to signal without parameters --- diff --git a/xscreensaver/hacks/screenhack.c b/xscreensaver/hacks/screenhack.c index 21847e7..e6f0c41 100644 --- a/xscreensaver/hacks/screenhack.c +++ b/xscreensaver/hacks/screenhack.c @@ -633,7 +633,7 @@ run_screenhack_table (Display *dpy, dbus_connection_read_write(conn, 0); else /* blocking read of the next available message */ - dbus_connection_read_write(conn, -1); + dbus_connection_read_write(conn, 20000); /*fprintf(stderr, "111111\n");*/ /* msg = dbus_connection_borrow_message(conn); */ @@ -645,6 +645,27 @@ run_screenhack_table (Display *dpy, /*fprintf(stderr, "333333\n");*/ continue; } + fprintf(stderr, "signal on view %i\n", view); + /* check this is a method call for the right interface & method */ + if ((view == 1 && dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_PAUSE_LIVEBG_ON_VIEW1))|| + (view == 2 && dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_PAUSE_LIVEBG_ON_VIEW2))|| + (view == 3 && dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_PAUSE_LIVEBG_ON_VIEW3))|| + (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); + continue; + } + if ((view == 1 && dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_PLAY_LIVEBG_ON_VIEW1))|| + (view == 2 && dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_PLAY_LIVEBG_ON_VIEW2))|| + (view == 3 && dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_PLAY_LIVEBG_ON_VIEW3))|| + (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); + continue; + } +#if 0 /* dbus_connection_steal_borrowed_message(conn, msg); */ /* fprintf (stderr, "APPLICATION PATH11111111111111111111 %s %s %s\n", dbus_message_get_path(msg), dbus_message_get_interface (msg), dbus_message_get_member (msg));*/ /*dbus_connection_return_message(conn, msg);*/ @@ -675,7 +696,7 @@ run_screenhack_table (Display *dpy, /*dbus_connection_return_message(conn, msg);*/ } } - +#endif dbus_message_unref (msg); /* check this is a method call for the right interface & method */ /*