[gtk+/gtk-3-6] spinbutton: don't override initial text in non-numeric-only spin buttons

[Aleksander Morgado <aleksm src gnome org>]

commit 801dfd0689364e28b51a2003746ef4abd223bd9a
Author: Aleksander Morgado <aleksander lanedo com>
Date:   Wed Mar 6 19:16:25 2013 +0100

    spinbutton: don't override initial text in non-numeric-only spin buttons
    
    https://bugzilla.gnome.org/show_bug.cgi?id=695312

 gtk/gtkspinbutton.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index bc1e4a8..97b6527 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -1048,7 +1048,12 @@ gtk_spin_button_realize (GtkWidget *widget)
 
   return_val = FALSE;
   g_signal_emit (spin_button, spinbutton_signals[OUTPUT], 0, &return_val);
-  if (return_val == FALSE)
+
+  /* If output wasn't processed explicitly by the method connected to the
+   * 'output' signal; and if we don't have any explicit 'text' set initially,
+   * fallback to the default output. */
+  if (!return_val &&
+      (spin_button->numeric || gtk_entry_get_text (GTK_ENTRY (spin_button)) == NULL))
     gtk_spin_button_default_output (spin_button);
 
   gtk_widget_queue_resize (GTK_WIDGET (spin_button));