totem r5084 - in trunk: . data src

[hadess svn gnome org]

Author: hadess
Date: Fri Feb  8 01:32:30 2008
New Revision: 5084
URL: http://svn.gnome.org/viewvc/totem?rev=5084&view=rev

Log:
2008-02-08  Bastien Nocera  <hadess hadess net>

	* data/totem.ui:
	* src/totem.c: (totem_action_toggle_aspect_ratio):
	Fix to make totem_action_toggle_aspect_ratio() work again



Modified:
   trunk/ChangeLog
   trunk/data/totem.ui
   trunk/src/totem.c

Modified: trunk/data/totem.ui
==============================================================================
--- trunk/data/totem.ui	(original)
+++ trunk/data/totem.ui	Fri Feb  8 01:32:30 2008
@@ -311,9 +311,10 @@
          <child>
             <object class="GtkRadioAction" id="aspect-ratio-auto">
                <property name="label" translatable="yes">Auto</property>
-               <property name="tooltip" translatable="yes">Sets automatic aspect ratio</property>
-               <!-- BVW_RATIO_AUTO -->
-               <property name="value">0</property>
+	       <property name="tooltip" translatable="yes">Sets automatic aspect ratio</property>
+	       <!-- BVW_RATIO_AUTO -->
+	       <property name="value">0</property>
+	       <property name="current-value">0</property>
                <signal name="changed" handler="aspect_ratio_changed_callback"/>
             </object>
          </child>
@@ -321,7 +322,8 @@
             <object class="GtkRadioAction" id="aspect-ratio-square">
                <property name="label" translatable="yes">Square</property>
                <property name="tooltip" translatable="yes">Sets square aspect ratio</property>
-               <!-- BVW_RATIO_SQUARE -->
+	       <!-- BVW_RATIO_SQUARE -->
+	       <property name="group">aspect-ratio-auto</property>
                <property name="value">1</property>
             </object>
          </child>
@@ -329,7 +331,8 @@
             <object class="GtkRadioAction" id="aspect-ratio-fbt">
                <property name="label" translatable="yes">4:3 (TV)</property>
                <property name="tooltip" translatable="yes">Sets 4:3 (TV) aspect ratio</property>
-               <!-- BVW_RATIO_FOURBYTHREE -->
+	       <!-- BVW_RATIO_FOURBYTHREE -->
+	       <property name="group">aspect-ratio-auto</property>
                <property name="value">2</property>
             </object>
          </child>
@@ -337,7 +340,8 @@
             <object class="GtkRadioAction" id="aspect-ratio-anamorphic">
                <property name="label" translatable="yes">16:9 (Widescreen)</property>
                <property name="tooltip" translatable="yes">Sets 16:9 (widescreen) aspect ratio</property>
-               <!-- BVW_RATIO_ANAMORPHIC -->
+	       <!-- BVW_RATIO_ANAMORPHIC -->
+	       <property name="group">aspect-ratio-auto</property>
                <property name="value">3</property>
             </object>
          </child>
@@ -345,7 +349,8 @@
             <object class="GtkRadioAction" id="aspect-ratio-dvb">
                <property name="label" translatable="yes">2.11:1 (DVB)</property>
                <property name="tooltip" translatable="yes">Sets 2.11:1 (DVB) aspect ratio</property>
-               <!-- BVW_RATIO_DVB -->
+	       <!-- BVW_RATIO_DVB -->
+	       <property name="group">aspect-ratio-auto</property>
                <property name="value">4</property>
             </object>
          </child>

Modified: trunk/src/totem.c
==============================================================================
--- trunk/src/totem.c	(original)
+++ trunk/src/totem.c	Fri Feb  8 01:32:30 2008
@@ -1174,14 +1174,15 @@
 
 void
 totem_action_toggle_aspect_ratio (Totem *totem)
-{		
+{
+	GSList *list;
 	GtkAction *action;
 	int tmp;
 
 	tmp = totem_action_get_aspect_ratio (totem);
 	tmp++;
-	if (tmp > 4)
-		tmp = 0;
+	if (tmp > BVW_RATIO_DVB)
+		tmp = BVW_RATIO_AUTO;
 
 	action = gtk_action_group_get_action (totem->main_action_group, "aspect-ratio-auto");
 	gtk_radio_action_set_current_value (GTK_RADIO_ACTION (action), tmp);