ooo-build r14419 - in trunk: . patches/dev300

[michael svn gnome org]

Author: michael
Date: Tue Oct 28 16:10:24 2008
New Revision: 14419
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14419&view=rev

Log:
2008-10-28  Michael Meeks  <michael meeks novell com>

        * patches/dev300/warning-spin-button.diff,
        * patches/dev300/apply: calm warning with recent gtk+.



Added:
   trunk/patches/dev300/warning-spin-button.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Oct 28 16:10:24 2008
@@ -2795,6 +2795,9 @@
 # and in the Start Menu on Windows
 win32-tooltips.diff, tml
 
+# avoid annoying warning
+warning-spin-button.diff, i#95554, michael
+
 # stop font updatess crashing OO.o - to be merged up-stream
 # soon, hence < m28
 [ CairoFonts < dev300-m28 >= ooo300-m9 ]

Added: trunk/patches/dev300/warning-spin-button.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/warning-spin-button.diff	Tue Oct 28 16:10:24 2008
@@ -0,0 +1,16 @@
+Index: unx/gtk/gdi/salnativewidgets-gtk.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
+retrieving revision 1.47
+diff -u -p -r1.47 salnativewidgets-gtk.cxx
+--- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	16 Jun 2008 14:30:38 -0000	1.47
++++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	28 Oct 2008 16:05:04 -0000
+@@ -3635,7 +3640,7 @@ static void NWEnsureGTKSpinButton( int n
+ {
+ 	if ( !gWidgetData[nScreen].gSpinButtonWidget )
+ 	{
+-		GtkAdjustment *adj = GTK_ADJUSTMENT( gtk_adjustment_new(0, 0, 2, 1, 1, 1) );
++		GtkAdjustment *adj = GTK_ADJUSTMENT( gtk_adjustment_new(0, 0, 2, 1, 1, 0) );
+ 		gWidgetData[nScreen].gSpinButtonWidget = gtk_spin_button_new( adj, 1, 2 );
+ 
+ 		//Setting non-editable means it doesn't blink, so there's no timeouts