From: John Darrington Date: Wed, 20 Feb 2008 04:43:37 +0000 (+0000) Subject: Fixed some problems reported by autoconf -Wall X-Git-Tag: v0.6.0~105 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db5b7f9dc9c86ae607f8bcbacaf49065b8cdcbae;p=pspp-builds.git Fixed some problems reported by autoconf -Wall Plugged some memory leaks. --- diff --git a/acinclude.m4 b/acinclude.m4 index 812f4d44..cbf927aa 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -103,7 +103,7 @@ AC_DEFUN([PSPP_READLINE], dnl Add $INCREADLINE to CPPFLAGS before performing the following checks, dnl because if the user has installed libreadline and not disabled its use - dnl via --without-libreadline-prefix, he wants to use it. The AC_TRY_LINK + dnl via --without-libreadline-prefix, he wants to use it. The AC_LINK_IFELSE dnl will then succeed. am_save_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCREADLINE $INCHISTORY]) @@ -121,11 +121,9 @@ AC_DEFUN([PSPP_READLINE], if test -n "$extra_lib"; then LIBS="$LIBS -l$extra_lib" fi - AC_TRY_LINK([#include + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include #include -#include ], - [readline((char*)0); add_history((char*)0);], - gl_cv_lib_readline=yes) +#include ]], [[readline((char*)0); add_history((char*)0);]])],[gl_cv_lib_readline=yes],[]) if test "$gl_cv_lib_readline" = yes; then if test -n "$extra_lib"; then LIBREADLINE="$LIBREADLINE $LIBHISTORY -l$extra_lib" diff --git a/configure.ac b/configure.ac index 9df062ae..844e8269 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. dnl Initialize. AX_PREREQ(2.60) -AC_INIT(pspp, 0.4.3,bug-gnu-pspp@gnu.org) +AC_INIT([pspp],[0.4.3],[bug-gnu-pspp@gnu.org]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE diff --git a/po/de.po b/po/de.po index 4720415d..30d88e06 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: PSPP 0.4.3\n" "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n" -"POT-Creation-Date: 2008-02-20 09:20+0900\n" +"POT-Creation-Date: 2008-02-20 13:21+0900\n" "PO-Revision-Date: 2006-07-28 19:32+0800\n" "Last-Translator: John Darrington \n" "Language-Team: German \n" @@ -5432,7 +5432,7 @@ msgstr "" msgid "Sorry. The help system hasn't yet been implemented." msgstr "Es gibt noch nicht kein Helpsysteme. Schade!" -#: src/ui/gui/helper.c:162 +#: src/ui/gui/helper.c:164 #, c-format msgid "Cannot open reference manual: %s" msgstr "" diff --git a/po/en_GB.po b/po/en_GB.po index 57fe19c2..3390dc64 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PSPP 0.4.3\n" "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n" -"POT-Creation-Date: 2008-02-20 09:20+0900\n" +"POT-Creation-Date: 2008-02-20 13:21+0900\n" "PO-Revision-Date: 2007-09-15 08:29+0800\n" "Last-Translator: John Darrington \n" "Language-Team: John Darrington \n" @@ -5377,7 +5377,7 @@ msgstr "" msgid "Sorry. The help system hasn't yet been implemented." msgstr "" -#: src/ui/gui/helper.c:162 +#: src/ui/gui/helper.c:164 #, c-format msgid "Cannot open reference manual: %s" msgstr "" diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c index c96fdded..8e616716 100644 --- a/src/ui/gui/helper.c +++ b/src/ui/gui/helper.c @@ -149,6 +149,8 @@ connect_help (GladeXML *xml) GList *i; for ( i = g_list_first (helps); i ; i = g_list_next (i)) g_signal_connect (GTK_WIDGET (i->data), "clicked", give_help, 0); + + g_list_free (helps); } diff --git a/src/ui/gui/main.c b/src/ui/gui/main.c index 44242823..a3d39461 100644 --- a/src/ui/gui/main.c +++ b/src/ui/gui/main.c @@ -58,7 +58,7 @@ static gboolean hide_splash_window (gpointer data) { GtkWidget *splash = data; - gtk_widget_hide (splash); + gtk_widget_destroy (splash); gtk_window_set_auto_startup_notification (TRUE); return FALSE; }