gtk+ r20118 - in trunk: . gtk

[bjornl svn gnome org]

Author: bjornl
Date: Tue May 20 17:29:34 2008
New Revision: 20118
URL: http://svn.gnome.org/viewvc/gtk+?rev=20118&view=rev

Log:
2008-05-20  BjÃrn Lindqvist  <bjourne gmail com>

	* gtk/gtkspinbutton.c: (gtk_spin_button_snap,
	gtk_spin_button_update): Remove two chunks of duplicated
	code (#533733).


Modified:
   trunk/ChangeLog
   trunk/gtk/gtkspinbutton.c

Modified: trunk/gtk/gtkspinbutton.c
==============================================================================
--- trunk/gtk/gtkspinbutton.c	(original)
+++ trunk/gtk/gtkspinbutton.c	Tue May 20 17:29:34 2008
@@ -1398,15 +1398,7 @@
   else
     val = spin_button->adjustment->lower + ceil (tmp) * inc;
 
-  if (fabs (val - spin_button->adjustment->value) > EPSILON)
-    gtk_adjustment_set_value (spin_button->adjustment, val);
-  else
-    {
-      gint return_val = FALSE;
-      g_signal_emit (spin_button, spinbutton_signals[OUTPUT], 0, &return_val);
-      if (return_val == FALSE)
-	gtk_spin_button_default_output (spin_button);
-    }
+  gtk_spin_button_set_value (spin_button, val);
 }
 
 static void
@@ -2291,18 +2283,7 @@
   if (spin_button->snap_to_ticks)
     gtk_spin_button_snap (spin_button, val);
   else
-    {
-      if (fabs (val - spin_button->adjustment->value) > EPSILON)
-	gtk_adjustment_set_value (spin_button->adjustment, val);
-      else
-	{
-	  return_val = FALSE;
-	  g_signal_emit (spin_button, spinbutton_signals[OUTPUT], 0,
-			 &return_val);
-	  if (return_val == FALSE)
-	    gtk_spin_button_default_output (spin_button);
-	}
-    }
+    gtk_spin_button_set_value (spin_button, val);
 }
 
 static void