planner r921 - in trunk: . libplanner src

[mvdpot svn gnome org]

Author: mvdpot
Date: Sun Jul 20 11:08:33 2008
New Revision: 921
URL: http://svn.gnome.org/viewvc/planner?rev=921&view=rev

Log:
2008-07-20  Maurice van der Pot  <griffon26 kfk4ever com>

	* acinclude.m4: change --with-compile-warnings to --enable-compile-warnings
	* autogen.sh: fix error from sed when running autogen.sh
	* libplanner/mrp-sql.c: Fix missing semicolon in database support code,
	fixing bug #539993 (patch by Mirco MÃller <mirco mueller ubuntu com>).
	* src/planner-window.c: (window_restore_state): Use a reasonable default
	window size if no previous window size is known.


Modified:
   trunk/ChangeLog
   trunk/acinclude.m4
   trunk/autogen.sh
   trunk/libplanner/mrp-sql.c
   trunk/src/planner-window.c

Modified: trunk/acinclude.m4
==============================================================================
--- trunk/acinclude.m4	(original)
+++ trunk/acinclude.m4	Sun Jul 20 11:08:33 2008
@@ -7,7 +7,7 @@
 	default_compile_warnings="no"
     fi
 
-    AC_ARG_WITH(compile-warnings, [  --with-compile-warnings=[no/yes/error] Compiler warnings ], [enable_compile_warnings="$withval"], [enable_compile_warnings="$default_compile_warnings"])
+    AC_ARG_ENABLE(compile-warnings, [  --enable-compile-warnings=[no/yes/error] Compiler warnings ], [], [enable_compile_warnings="$default_compile_warnings"])
 
     warnCFLAGS=
     if test "x$GCC" != xyes; then

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Sun Jul 20 11:08:33 2008
@@ -35,7 +35,7 @@
 	DIE=1
 }
 
-(grep "^IT_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && {
+(grep "^IT_PROG_INTLTOOL" $srcdir/$CONFIGURE >/dev/null) && {
   ($INTLTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "You must have \`intltoolize' installed to compile $PROJECT."
@@ -53,7 +53,7 @@
     DIE=1
 }
 
-(grep "^AM_PROG_LIBTOOL" configure.in >/dev/null) && {
+(grep "^AM_PROG_LIBTOOL" $CONFIGURE >/dev/null) && {
   ($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "You must have libtool 1.5 installed to compile $PROJECT."
@@ -109,7 +109,7 @@
 *xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
 esac
 
-for coin in .
+for coin in $CONFIGURE
 do 
   dr=`dirname $coin`
   if test -f $dr/NO-AUTO-GEN; then
@@ -126,7 +126,7 @@
 	##  echo "**Warning**: No such directory \`$k'.  Ignored."
         fi
       done
-      if grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null; then
+      if grep "^AM_GLIB_GNU_GETTEXT" $CONFIGURE >/dev/null; then
 	#if grep "sed.*POTFILES" configure.in >/dev/null; then
 	#  : do nothing -- we still have an old unmodified configure.in
 	#else
@@ -138,11 +138,11 @@
 	  test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
         #fi
       fi
-      if grep "^IT_PROG_INTLTOOL" configure.in >/dev/null; then
+      if grep "^IT_PROG_INTLTOOL" $CONFIGURE >/dev/null; then
         echo "Running intltoolize..."
 	intltoolize --copy --force --automake
       fi
-      if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
+      if grep "^AM_PROG_LIBTOOL" $CONFIGURE >/dev/null; then
 	echo "Running $LIBTOOLIZE..."
 	$LIBTOOLIZE --force --copy
       fi
@@ -151,7 +151,7 @@
 
       echo "Running $ACLOCAL $aclocalinclude ..."
       $ACLOCAL $aclocalinclude
-      if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
+      if grep "^AM_CONFIG_HEADER" $CONFIGURE >/dev/null; then
 	echo "Running $AUTOHEADER..."
 	$AUTOHEADER
       fi

Modified: trunk/libplanner/mrp-sql.c
==============================================================================
--- trunk/libplanner/mrp-sql.c	(original)
+++ trunk/libplanner/mrp-sql.c	Sun Jul 20 11:08:33 2008
@@ -2406,7 +2406,7 @@
 
 #define WRITE_ERROR(e,c) \
 G_STMT_START \
-g_set_error(e,MRP_ERROR,MRP_ERROR_SAVE_WRITE_FAILED, sql_get_last_error (c)) \
+g_set_error(e,MRP_ERROR,MRP_ERROR_SAVE_WRITE_FAILED, sql_get_last_error (c)); \
 G_STMT_END
 
 

Modified: trunk/src/planner-window.c
==============================================================================
--- trunk/src/planner-window.c	(original)
+++ trunk/src/planner-window.c	Sun Jul 20 11:08:33 2008
@@ -213,6 +213,9 @@
 #define CONF_ACTIVE_VIEW           "/ui/active_view"
 #define CONF_LAST_DIR         "/general/last_dir"
 
+#define DEFAULT_WINDOW_WIDTH  800
+#define DEFAULT_WINDOW_HEIGHT 550
+
 #define VIEW_PATH "/menu/View/Views placeholder"
 #define VIEW_GROUP "view group"
 	
@@ -2162,10 +2165,16 @@
 		} else {
 			width = planner_conf_get_int (CONF_WINDOW_WIDTH,
 						      NULL);
-		
 			height = planner_conf_get_int (CONF_WINDOW_HEIGHT,
 						       NULL);
-		
+
+			if (width == 0) {
+				width = DEFAULT_WINDOW_WIDTH;
+			}
+			if (height == 0) {
+				height = DEFAULT_WINDOW_HEIGHT;
+			}
+
 			gtk_window_set_default_size (GTK_WINDOW (window), 
 						     width, height);