[totem] Bug 526264 – "even when audio-only is playing" confuses me

[Bastien Nocera <hadess src gnome org>]

commit f7fe26b1f24be136b5bd3c47a74a0883beb82654
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Jul 17 11:56:48 2009 +0100

    Bug 526264 â?? "even when audio-only is playing" confuses me
    
    2009-07-17  Bastien Nocera  <hadess hadess net>
    
    	* data/totem.schemas.in:
    	* data/totem.ui:
    	* src/plugins/screensaver/totem-screensaver.c
    	(totem_screensaver_update_from_state):
    	* src/totem-preferences.c (lock_screensaver_on_audio_changed_cb),
    	(totem_setup_preferences): Fix wording of the checkbox to
    	allow the screensaver to start when audio streams are playing
    	(Closes: #526264)

 ChangeLog                                   |   11 +++++++++++
 data/totem.schemas.in                       |    6 +++---
 data/totem.ui                               |    2 +-
 src/plugins/screensaver/totem-screensaver.c |    4 +++-
 src/totem-preferences.c                     |    6 +++---
 5 files changed, 21 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 87d0177..dd95e93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2009-07-17  Bastien Nocera  <hadess hadess net>
 
+	* data/totem.schemas.in:
+	* data/totem.ui:
+	* src/plugins/screensaver/totem-screensaver.c
+	(totem_screensaver_update_from_state):
+	* src/totem-preferences.c (lock_screensaver_on_audio_changed_cb),
+	(totem_setup_preferences): Fix wording of the checkbox to
+	allow the screensaver to start when audio streams are playing
+	(Closes: #526264)
+
+2009-07-17  Bastien Nocera  <hadess hadess net>
+
 	* src/totem-menu.c (totem_action_add_recent):
 	* src/totem-object.c (totem_action_set_mrl_with_warning),
 	(totem_action_open_files_list), (totem_action_remote):
diff --git a/data/totem.schemas.in b/data/totem.schemas.in
index fe4d8c4..207083e 100644
--- a/data/totem.schemas.in
+++ b/data/totem.schemas.in
@@ -8,10 +8,10 @@
 	<type>bool</type>
 	<default>true</default>
 	<locale name="C">
-	  <short>Allow the screensaver to activate even when audio-only is playing</short>
+	  <short>Allow the screensaver to activate when playing audio</short>
 	  <long>
-	    Allow the screensaver to activate even when audio-only is playing.
-	    This is useful for monitor-powered speakers.
+	    Allow the screensaver to activate when playing audio.
+	    Disable if you have monitor-powered speakers.
 	  </long>
 	</locale>
       </schema>
diff --git a/data/totem.ui b/data/totem.ui
index 5fc6a99..d79c8f4 100644
--- a/data/totem.ui
+++ b/data/totem.ui
@@ -1142,7 +1142,7 @@
                 <object class="GtkCheckButton" id="tpw_screensaver_checkbutton">
                   <property name="visible">True</property>
                   <property name="can_focus">True</property>
-                  <property name="label" translatable="yes">_Allow the screensaver to activate even when audio-only is playing</property>
+                  <property name="label" translatable="yes">Also disable the screensaver when playing _audio</property>
                   <property name="use_underline">True</property>
                   <property name="relief">GTK_RELIEF_NORMAL</property>
                   <property name="focus_on_click">True</property>
diff --git a/src/plugins/screensaver/totem-screensaver.c b/src/plugins/screensaver/totem-screensaver.c
index a35fe00..c1b8906 100644
--- a/src/plugins/screensaver/totem-screensaver.c
+++ b/src/plugins/screensaver/totem-screensaver.c
@@ -121,7 +121,9 @@ totem_screensaver_update_from_state (TotemObject *totem,
 							   NULL);
 	can_get_frames = bacon_video_widget_can_get_frames (bvw, NULL);
 
-	if (totem_is_playing (totem) != FALSE && (lock_screensaver_on_audio || can_get_frames))
+	if (totem_is_playing (totem) != FALSE && can_get_frames)
+		totem_scrsaver_disable (pi->scr);
+	else if (totem_is_playing (totem) != FALSE && !lock_screensaver_on_audio)
 		totem_scrsaver_disable (pi->scr);
 	else
 		totem_scrsaver_enable (pi->scr);
diff --git a/src/totem-preferences.c b/src/totem-preferences.c
index 15f370b..b803a77 100644
--- a/src/totem-preferences.c
+++ b/src/totem-preferences.c
@@ -265,8 +265,8 @@ lock_screensaver_on_audio_changed_cb (GConfClient *client, guint cnxn_id,
 					      checkbutton4_toggled_cb, totem);
 
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (item),
-				      gconf_client_get_bool (totem->gc,
-							     GCONF_PREFIX"/lock_screensaver_on_audio", NULL));
+				      !gconf_client_get_bool (totem->gc,
+							      GCONF_PREFIX"/lock_screensaver_on_audio", NULL));
 
 	g_signal_connect (item, "toggled",
 			  G_CALLBACK (checkbutton4_toggled_cb), totem);
@@ -540,7 +540,7 @@ totem_setup_preferences (Totem *totem)
 	lock_screensaver_on_audio = gconf_client_get_bool (totem->gc,
 							   GCONF_PREFIX"/lock_screensaver_on_audio", NULL);
 	item = gtk_builder_get_object (totem->xml, "tpw_screensaver_checkbutton");
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (item), lock_screensaver_on_audio);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (item), !lock_screensaver_on_audio);
 	gconf_client_notify_add (totem->gc, GCONF_PREFIX"/lock_screensaver_on_audio",
 				 (GConfClientNotifyFunc) lock_screensaver_on_audio_changed_cb,
 				 totem, NULL, NULL);