From: Vlad <vlad@gas.by>
Date: Wed, 29 Sep 2010 05:07:43 +0000 (+0300)
Subject: added supported 9 views
X-Git-Url: http://vcs.maemo.org/git/?p=xscreensaver;a=commitdiff_plain;h=10ef75f52ca691453d08d10536a2027240e6f380

added supported 9 views
---

diff --git a/xscreensaver/debian/changelog b/xscreensaver/debian/changelog
index 8ef1a99..b4e28a5 100644
--- a/xscreensaver/debian/changelog
+++ b/xscreensaver/debian/changelog
@@ -1,3 +1,9 @@
+xscreensaver (5.11-1+maemor8) stable-proposed-updates; urgency=low
+
+  *  Increased number supported of view to 9
+
+ -- Vlad Vasiliev <vlad@gas.by>  Sat, 02 Oct 2010 08:43:57 +0200
+
 xscreensaver (5.11-1+maemo7) stable-proposed-updates; urgency=low
 
   *  Changed Description in package 
diff --git a/xscreensaver/hacks/screenhack.c b/xscreensaver/hacks/screenhack.c
index 6069d9d..35ab612 100644
--- a/xscreensaver/hacks/screenhack.c
+++ b/xscreensaver/hacks/screenhack.c
@@ -596,6 +596,26 @@ run_screenhack_table (Display *dpy,
   	dbus_bus_add_match (conn, "type='signal', interface='org.maemo.livewp', member='pause_livebg_on_view4'", NULL);
   	dbus_bus_add_match (conn, "type='signal', interface='org.maemo.livewp', member='play_livebg_on_view4'", NULL);
   }
+  if (view == 5){
+  	dbus_bus_add_match (conn, "type='signal', interface='org.maemo.livewp', member='pause_livebg_on_view5'", NULL);
+  	dbus_bus_add_match (conn, "type='signal', interface='org.maemo.livewp', member='play_livebg_on_view5'", NULL);
+  }
+  if (view == 6){
+  	dbus_bus_add_match (conn, "type='signal', interface='org.maemo.livewp', member='pause_livebg_on_view6'", NULL);
+  	dbus_bus_add_match (conn, "type='signal', interface='org.maemo.livewp', member='play_livebg_on_view6'", NULL);
+  }
+  if (view == 7){
+  	dbus_bus_add_match (conn, "type='signal', interface='org.maemo.livewp', member='pause_livebg_on_view7'", NULL);
+  	dbus_bus_add_match (conn, "type='signal', interface='org.maemo.livewp', member='play_livebg_on_view7'", NULL);
+  }
+  if (view == 8){
+  	dbus_bus_add_match (conn, "type='signal', interface='org.maemo.livewp', member='pause_livebg_on_view8'", NULL);
+  	dbus_bus_add_match (conn, "type='signal', interface='org.maemo.livewp', member='play_livebg_on_view8'", NULL);
+  }
+  if (view == 9){
+  	dbus_bus_add_match (conn, "type='signal', interface='org.maemo.livewp', member='pause_livebg_on_view9'", NULL);
+  	dbus_bus_add_match (conn, "type='signal', interface='org.maemo.livewp', member='play_livebg_on_view9'", NULL);
+  }
 
   dbus_connection_flush(conn);
 
@@ -639,12 +659,16 @@ run_screenhack_table (Display *dpy,
       if (NULL == msg){  
           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))){
+          (view == 4 && dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_PAUSE_LIVEBG_ON_VIEW4))||
+          (view == 5 && dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_PAUSE_LIVEBG_ON_VIEW5))||
+          (view == 6 && dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_PAUSE_LIVEBG_ON_VIEW6))||
+          (view == 7 && dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_PAUSE_LIVEBG_ON_VIEW7))||
+          (view == 8 && dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_PAUSE_LIVEBG_ON_VIEW8))||
+          (view == 9 && dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_PAUSE_LIVEBG_ON_VIEW9))){
           /* fprintf(stderr, "Pause scene visible %i\n", view); */ 
 	   pause = 1;
 	   dbus_message_unref (msg);
@@ -653,7 +677,12 @@ run_screenhack_table (Display *dpy,
       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))){
+          (view == 4 && dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_PLAY_LIVEBG_ON_VIEW4))||
+          (view == 5 && dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_PLAY_LIVEBG_ON_VIEW5))||
+          (view == 6 && dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_PLAY_LIVEBG_ON_VIEW6))||
+          (view == 7 && dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_PLAY_LIVEBG_ON_VIEW7))||
+          (view == 8 && dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_PLAY_LIVEBG_ON_VIEW8))||
+          (view == 9 && dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_PLAY_LIVEBG_ON_VIEW9))){
            /* fprintf(stderr, "Play scene visible %i\n", view); */
 	   pause = 0;
 	   dbus_message_unref (msg);