[Goodies-commits] r5772 - xfce4-power-manager/trunk/src

[Ali Abdallah]

Author: aliov
Date: 2008-10-23 10:24:48 +0000 (Thu, 23 Oct 2008)
New Revision: 5772

Modified:
   xfce4-power-manager/trunk/src/xfpm-dpms-spins.c
Log:
Allow 0 value for any DPMS option while the others are disabled

Modified: xfce4-power-manager/trunk/src/xfpm-dpms-spins.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-dpms-spins.c	2008-10-23 09:25:30 UTC (rev 5771)
+++ xfce4-power-manager/trunk/src/xfpm-dpms-spins.c	2008-10-23 10:24:48 UTC (rev 5772)
@@ -185,11 +185,9 @@
     {
         xfpm_spin_button_set_suffix(XFPM_SPIN_BUTTON(spin_1),_(" min"));
         priv->spin_value_1 = value1;
-        if ( priv->spin_value_2 == 0 )
-            gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->spin_2),value1+1);   
     }
-        
-    if ( value2 <= value1 )
+    
+    if ( value2 <= value1 && value2 != 0 )
     {
         value2 = value1 + 1;
         /* gtk_spin_button_set_value generate a value-change signal, to avoid receiving
@@ -199,13 +197,21 @@
         g_signal_handlers_unblock_by_func(priv->spin_2,xfpm_dpms_spins_get_spin2_value_cb,spins);
     }
     
-    if ( value3 <= value2 )
+    if ( value3 <= value2 && value3 != 0)
     {
         value3 = value2 + 1;
         g_signal_handlers_block_by_func(priv->spin_3,xfpm_dpms_spins_get_spin3_value_cb,spins);
         gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->spin_3),value3);
         g_signal_handlers_unblock_by_func(priv->spin_3,xfpm_dpms_spins_get_spin3_value_cb,spins);
     }
+	
+	if ( value3 <= value1 && value3 != 0)
+    {
+        value3 = value1 + 1;
+        g_signal_handlers_block_by_func(priv->spin_3,xfpm_dpms_spins_get_spin3_value_cb,spins);
+        gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->spin_3),value3);
+        g_signal_handlers_unblock_by_func(priv->spin_3,xfpm_dpms_spins_get_spin3_value_cb,spins);
+    }
     
     g_signal_emit(G_OBJECT(spins),signals[DPMS_VALUE_CHANGED],0,
                   value1,value2,value3);
@@ -238,11 +244,9 @@
     {
         xfpm_spin_button_set_suffix(XFPM_SPIN_BUTTON(spin_2),_(" min"));
         priv->spin_value_2 = value2;
-        if ( priv->spin_value_3 == 0 )
-            gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->spin_3),value2+1); 
     }
 
-    if ( value2 <= value1 )
+    if ( value2 <= value1 && value2 != 0)
     {
         value2 = value1 + 1;
         g_signal_handlers_block_by_func(priv->spin_2,xfpm_dpms_spins_get_spin2_value_cb,spins);
@@ -250,7 +254,7 @@
         g_signal_handlers_unblock_by_func(priv->spin_2,xfpm_dpms_spins_get_spin2_value_cb,spins);
     } 
         
-    if ( value3 <= value2 )
+    if ( value3 <= value2 && value3 != 0)
     {
         value3 = value2 + 1;
         g_signal_handlers_block_by_func(priv->spin_3,xfpm_dpms_spins_get_spin3_value_cb,spins);
@@ -290,13 +294,21 @@
         priv->spin_value_3 = value3;
     }
 
-    if ( value3 <= value2 )
+    if ( value3 <= value2 && value3 != 0 )
     {
         value3 = value2 + 1;
         g_signal_handlers_block_by_func(priv->spin_3,xfpm_dpms_spins_get_spin3_value_cb,spins);
         gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->spin_3),value3);
         g_signal_handlers_unblock_by_func(priv->spin_3,xfpm_dpms_spins_get_spin3_value_cb,spins);
     }
+	
+	if ( value3 <= value1 && value3 != 0 )
+    {
+        value3 = value1 + 1;
+        g_signal_handlers_block_by_func(priv->spin_3,xfpm_dpms_spins_get_spin3_value_cb,spins);
+        gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->spin_3),value3);
+        g_signal_handlers_unblock_by_func(priv->spin_3,xfpm_dpms_spins_get_spin3_value_cb,spins);
+    }
     
     g_signal_emit(G_OBJECT(spins),signals[DPMS_VALUE_CHANGED],0,value1,value2,value3);
 }