Merge branch 'master' of /home/john/Development/pspp-bare

diff --git a/src/data/case.c b/src/data/case.c
index 8ae989002f016f2b6978ede795415715c1fe585a..4432579e5d2e1284102a9ab7854d79db3b10d197 100644 (file)
--- a/src/data/case.c
+++ b/src/data/case.c
@@ -123,7 +123,7 @@ case_copy (struct ccase *dst, size_t dst_idx,
 {
   assert (!case_is_shared (dst));
   assert (range_is_valid (dst, dst_idx, n_values));
-  assert (range_is_valid (src, dst_idx, n_values));
+  assert (range_is_valid (src, src_idx, n_values));
 
   if (dst != src || dst_idx != src_idx)
     memmove (dst->values + dst_idx, src->values + src_idx,

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 4e561ab0418bc258526c6138a29d2a0b4039c9a4..af880fc3052ec6f72d11472fbe26c0dfdf17652a 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -65,16 +65,16 @@ src_ui_gui_psppire_LDADD = \
 src_ui_gui_psppiredir = $(pkgdatadir)
 
 nodist_src_ui_gui_psppire_DATA = \
-       $(top_srcdir)/src/ui/gui/crosstabs.ui \
-       $(top_srcdir)/src/ui/gui/examine.ui \
-       $(top_srcdir)/src/ui/gui/frequencies.ui \
-       $(top_srcdir)/src/ui/gui/message-dialog.ui \
-       $(top_srcdir)/src/ui/gui/psppire.ui \
-       $(top_srcdir)/src/ui/gui/oneway.ui \
-       $(top_srcdir)/src/ui/gui/rank.ui \
-       $(top_srcdir)/src/ui/gui/recode.ui \
-       $(top_srcdir)/src/ui/gui/regression.ui \
-       $(top_srcdir)/src/ui/gui/t-test.ui
+       $(top_builddir)/src/ui/gui/crosstabs.ui \
+       $(top_builddir)/src/ui/gui/examine.ui \
+       $(top_builddir)/src/ui/gui/frequencies.ui \
+       $(top_builddir)/src/ui/gui/message-dialog.ui \
+       $(top_builddir)/src/ui/gui/psppire.ui \
+       $(top_builddir)/src/ui/gui/oneway.ui \
+       $(top_builddir)/src/ui/gui/rank.ui \
+       $(top_builddir)/src/ui/gui/recode.ui \
+       $(top_builddir)/src/ui/gui/regression.ui \
+       $(top_builddir)/src/ui/gui/t-test.ui
 
 EXTRA_DIST += \
        $(top_srcdir)/src/ui/gui/crosstabs.glade \
@@ -247,4 +247,5 @@ EXTRA_DIST += src/ui/gui/OChangeLog\
        src/ui/gui/marshaller-list
 
 BUILT_SOURCES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h
-CLEANFILES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h
+CLEANFILES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h \
+       $(nodist_src_ui_gui_psppire_DATA)
\ No newline at end of file

diff --git a/src/ui/gui/psppire-dialog.c b/src/ui/gui/psppire-dialog.c
index c0c2641f3222f3da4b130676d737b168a02e893e..84f9e5de489459a86c702c912a32d7c882a3fc17 100644 (file)
--- a/src/ui/gui/psppire-dialog.c
+++ b/src/ui/gui/psppire-dialog.c
@@ -23,6 +23,7 @@
 #include "psppire-dialog.h"
 #include "psppire-buttonbox.h"
 #include "psppire-selector.h"
+#include <string.h>
 
 static void psppire_dialog_class_init          (PsppireDialogClass *);
 static void psppire_dialog_init                (PsppireDialog      *);
@@ -501,7 +502,7 @@ get_internal_child    (GtkBuildable *buildable,
 {
   PsppireDialog *dialog = PSPPIRE_DIALOG (buildable);
 
-  if ( 0 == g_strcmp0 (childname, "hbox"))
+  if ( 0 == strcmp (childname, "hbox"))
     return G_OBJECT (dialog->box);
 
   return NULL;