xforms.git - xforms

diff --git a/configure.ac b/configure.ac
index 20e84b7..7945af1 100644
--- a/configure.ac
+++ b/configure.ac

@@ -1,7 +1,10 @@

dnl Process with autoconf to generate configure script -*- sh -*-

AC_PREREQ(2.59)

-AC_INIT([xforms],[1.2.4],[xforms-development@nongnu.org])

+

+dnl !!! THIS NEEDS CHANCHING FOR EACH RELEASE !!!

+

+AC_INIT([xforms],[1.2.5pre1],[xforms-development@nongnu.org])

AC_CONFIG_AUX_DIR(config)

AC_CONFIG_SRCDIR(lib/forms.c)

XFORMS_CHECK_VERSION

@@ -16,7 +19,13 @@ AC_CONFIG_MACRO_DIR([config])

### This defines the version number of the installed .so files

### using libtool's versioning system.

-AC_SUBST(SO_VERSION, ["3:3:1"])

+dnl !!! THIS NEEDS CHANCHING FOR EACH RELEASE !!!

+dnl !!! the first number minus one becomes the major version number

+dnl !!! the second number becomes the sub-release number

+dnl !!! the third becomes the minor version number

+dnl !!! i.e '["3:5:1"]' results in libforms.so.2.1.5

+

+AC_SUBST(SO_VERSION, ["3:5:1"])

# Fix the value of the prefixes.

diff --git a/doc/xforms.texi b/doc/xforms.texi
index 354838f..04c06c5 100644
--- a/doc/xforms.texi
+++ b/doc/xforms.texi

@@ -2,7 +2,7 @@

@setfilename xforms.info

@settitle XForms (Forms Library) - Version 1.2 (Rev. 4)@*A Graphical User Interface Toolkit for X

-@set lastupdate June 6, 2014

+@set lastupdate January 20, 2016

@paragraphindent 0

@titlepage

@@ -12,9 +12,9 @@

@sp 1

@center @titlefont{A Graphical User Interface Toolkit for X}

@sp 8

-@center Library Version 1.2 (Rev. 4)

+@center Library Version 1.2 (Rev. 5)

@sp 2

-@center June 2014

+@center January 2016

@sp 8

@end titlepage

diff --git a/fdesign/fd_file_fun.c b/fdesign/fd_file_fun.c
index 16f8cb4..aa20cc3 100644
--- a/fdesign/fd_file_fun.c
+++ b/fdesign/fd_file_fun.c

@@ -914,7 +914,7 @@ ff_match_key( char ** p )

np = ep-- + 1;

- while ( ep > ff.pos && isspace( ( unsigned char ) *ep ) )

+ while ( ep > ff.pos && isspace( ( int ) *ep ) )

ep--;

if ( ep == ff.pos )

diff --git a/fdesign/fd_spec.c b/fdesign/fd_spec.c
index 0e77d42..ba848d9 100644
--- a/fdesign/fd_spec.c
+++ b/fdesign/fd_spec.c

@@ -1666,7 +1666,10 @@ skip_spec_info( char * key )

if ( ( r = ff_read( "%k", &key ) ) < 0 )

return ff_err( "Failed to read from file" );

- } while ( r != 0 && strcmp( key, "Name" ) && strcmp( key, "Name" ) && strcmp( key, "class" ) );

+

+ if ( ! key )

+ return ff_err( "Something's wrong with file" );

/* Check if we arrived at the start of a form or class */

diff --git a/fdesign/sp_spinner.c b/fdesign/sp_spinner.c
index 0e14ae6..edd373a 100644
--- a/fdesign/sp_spinner.c
+++ b/fdesign/sp_spinner.c

@@ -318,14 +318,14 @@ spn_minmax_change( FL_OBJECT * obj FL_UNUSED_ARG,

***************************************/

void

-spn_stepchange_cb( FL_OBJECT * obj,

+spn_stepchange_cb( FL_OBJECT * obj FL_UNUSED_ARG,

long data FL_UNUSED_ARG )

{

FLI_SPINNER_SPEC *sp = curobj->spec;

- set_finput_value( obj, get_finput_value( obj ),

+ set_finput_value( spn_attrib->step, get_finput_value( spn_attrib->step ),

curobj->type == FL_INT_SPINNER ? 0 : sp->prec );

- fl_set_spinner_step( curobj, get_finput_value( obj ) );

+ fl_set_spinner_step( curobj, get_finput_value( spn_attrib->step ) );

redraw_the_form( 0 );

}

@@ -334,14 +334,15 @@ spn_stepchange_cb( FL_OBJECT * obj,

***************************************/

void

-spn_initialvalue_change( FL_OBJECT * obj,

+spn_initialvalue_change( FL_OBJECT * obj FL_UNUSED_ARG,

long data FL_UNUSED_ARG )

{

FLI_SPINNER_SPEC *sp = curobj->spec;

- set_finput_value( obj, get_finput_value( obj ),

+ set_finput_value( spn_attrib->initialval,

+ get_finput_value( spn_attrib->initialval ),

curobj->type == FL_INT_SPINNER ? 0 : sp->prec );

- fl_set_spinner_value( curobj, get_finput_value( obj ) );

+ fl_set_spinner_value( curobj, get_finput_value( spn_attrib->initialval ) );

redraw_the_form( 0 );

}