diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/.cvsignore gphoto/.cvsignore
--- gphoto.orig/.cvsignore	Sun Aug 20 14:25:52 2000
+++ gphoto/.cvsignore	Sat Aug  5 11:49:46 2000
@@ -18,3 +18,4 @@
 install-sh
 missing
 mkinstalldirs
+ChangeLog
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/autogen.sh gphoto/autogen.sh
--- gphoto.orig/autogen.sh	Sun Aug 20 14:28:11 2000
+++ gphoto/autogen.sh	Sat Aug  5 11:49:46 2000
@@ -1,66 +1,17 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
-# This was lifted from the Gimp, and adapted slightly by
-# Raph Levien .
 
-DIE=0
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
 
-PROJECT=gphoto
+PKG_NAME="GPhoto"
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "You must have autoconf installed to compile $PROJECT."
-    echo "Download the appropriate package for your distribution,"
-    echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-    DIE=1
-}
-
-(libtool --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "You must have libtool installed to compile $PROJECT."
-    echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2.tar.gz"
-    echo "(or a newer version if it is available)"
-    DIE=1
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "You must have automake installed to compile $PROJECT."
-    echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
-    echo "(or a newer version if it is available)"
-    DIE=1
-}
-
-if test "$DIE" -eq 1; then
+(test -f $srcdir/configure.in \
+  && test -f $srcdir/HACKING \
+  && test -d $srcdir/photopc) || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level GPhoto directory"
     exit 1
-fi
-
-test -f PROGRAMMERS || {
-        echo "You must run this script in the top-level gphoto directory"
-        exit 1
 }
 
-if test -z "$*"; then
-    echo "I am going to run ./configure with no arguments - if you wish "
-    echo "to pass any to it, please specify them on the $0 command line."
-fi
-
-
-case $CC in
-*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
-esac
-
-for dir in .
-do 
-    echo processing $dir
-    (cd $dir; \
-    libtoolize --copy --force; \
-    aclocalinclude="$ACLOCAL_FLAGS"; \
-    aclocal $aclocalinclude; \
-    autoheader; automake --add-missing --gnu $am_opt; autoconf)
-done
-
-./configure "$@"
-
-echo 
-echo "Now type 'make' to compile $PROJECT."
+. $srcdir/macros/autogen.sh
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/canon/canon.c gphoto/canon/canon.c
--- gphoto.orig/canon/canon.c	Sun Aug 20 14:28:34 2000
+++ gphoto/canon/canon.c	Sat Aug  5 11:49:46 2000
@@ -532,7 +532,7 @@
   //    GtkWidget *window,*box,*scrolled_win,*tree,*clear,*done;
   GtkWidget *dialog, *hbox, *vbox, *label, *tree, *vseparator;
   GtkWidget *file_list, *button, *cbutton, *clear,*set_button;
-  GtkWidget *combo, *swoff, *sync, *linkCombo;
+  GtkWidget *combo, *swoff, *sync;
   GtkWidget *owner_entry, *ga;
   GList *list;
 
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/canon/psa50.c gphoto/canon/psa50.c
--- gphoto.orig/canon/psa50.c	Sun Aug 20 14:28:39 2000
+++ gphoto/canon/psa50.c	Sat Aug  5 11:49:46 2000
@@ -544,7 +544,6 @@
   int msgsize;
   char packet[0x3000];
   static char buffer[0x3000];
-  int i;
   int lonlen;
 
     memset(packet,0x00,0x3000);  /* zero block */
@@ -1303,7 +1302,6 @@
     unsigned char msg[0x3000];
     unsigned char *msgg;
     char newstr[100];
-    unsigned char *namn;
     unsigned int total = 0,expect = 0,size;
     int name_len,len,maxfilesize;
     
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/canon/serial.c gphoto/canon/serial.c
--- gphoto.orig/canon/serial.c	Sun Aug 20 14:28:40 2000
+++ gphoto/canon/serial.c	Sat Aug  5 11:49:46 2000
@@ -19,6 +19,7 @@
 #include <sys/time.h>
 #include <errno.h>
 #include <sys/ioctl.h>
+#include <string.h>
 
 #include "util.h"
 #include "psa50.h"
@@ -247,13 +236,13 @@
 
     if (sleep>0) {
       for(i=0;i<len;i++) {
-    	gpio_write(iodev,buf,1);
+    	gpio_write(iodev,(char *)buf,1);
 	buf++;
 	usleep(sleep);
       }
     }
     else {
-      gpio_write(iodev,buf,len);
+      gpio_write(iodev,(char *)buf,len);
     }
     
     return 0;
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/casio/command.c gphoto/casio/command.c
--- gphoto.orig/casio/command.c	Sun Aug 20 14:28:46 2000
+++ gphoto/casio/command.c	Sat Aug  5 11:49:46 2000
@@ -1,6 +1,7 @@
 #include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/casio/ppm.c gphoto/casio/ppm.c
--- gphoto.orig/casio/ppm.c	Sun Aug 20 14:28:50 2000
+++ gphoto/casio/ppm.c	Sat Aug  5 11:49:46 2000
@@ -1,6 +1,7 @@
 #include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>
 
 #include "../src/gphoto.h"
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/configure.in gphoto/configure.in
--- gphoto.orig/configure.in	Sun Aug 20 14:28:12 2000
+++ gphoto/configure.in	Sat Aug  5 11:49:46 2000
@@ -1,10 +1,16 @@
 dnl Process this file with autoconf to produce a configure script.
+
 AC_INIT(src/gallery.c)
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(gphoto, 0.5.1)
 AM_MAINTAINER_MODE
 
+dnl Pick up the Gnome macros.
+AM_ACLOCAL_INCLUDE(macros)
+
 dnl Checks for programs.
+GNOME_INIT
+AC_ISC_POSIX
 AC_PROG_CC
 AC_PROG_CPP
 AM_PROG_LIBTOOL
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/digita/commands.c gphoto/digita/commands.c
--- gphoto.orig/digita/commands.c	Thu Jun  8 14:25:41 2000
+++ gphoto/digita/commands.c	Sat Aug  5 11:49:46 2000
@@ -11,6 +11,7 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <termios.h>
+#include <string.h>
 
 #include "digita.h"
 
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/digita/digita.c gphoto/digita/digita.c
--- gphoto.orig/digita/digita.c	Thu Jun  8 14:25:41 2000
+++ gphoto/digita/digita.c	Sat Aug  5 11:49:46 2000
@@ -9,6 +9,7 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <termios.h>
+#include <string.h>
 
 #include "digita.h"
 
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/digita/serial.c gphoto/digita/serial.c
--- gphoto.orig/digita/serial.c	Thu Jun  8 14:25:41 2000
+++ gphoto/digita/serial.c	Sat Aug  5 11:49:46 2000
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
+#include <string.h>
 #include <termios.h>
 
 #include "digita.h"
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/jd11/decomp.c gphoto/jd11/decomp.c
--- gphoto.orig/jd11/decomp.c	Mon Jun  5 09:00:37 2000
+++ gphoto/jd11/decomp.c	Sat Aug  5 11:49:46 2000
@@ -2,6 +2,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <string.h>
 
 #include "decomp.h"
 
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/jd11/jd11.c gphoto/jd11/jd11.c
--- gphoto.orig/jd11/jd11.c	Mon Jun  5 09:00:37 2000
+++ gphoto/jd11/jd11.c	Sat Aug  5 11:49:46 2000
@@ -4,6 +4,7 @@
 #include <stdlib.h>
 #include <termios.h>
 #include <unistd.h>
+#include <string.h>
 
 #include "../src/gphoto.h"
 
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/kodak/kodak_dc210.c gphoto/kodak/kodak_dc210.c
--- gphoto.orig/kodak/kodak_dc210.c	Sun Aug 20 14:30:13 2000
+++ gphoto/kodak/kodak_dc210.c	Sat Aug  5 11:49:46 2000
@@ -7,6 +7,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 /* glib is used for byte swapping and endian checking */
 #include <glib.h>
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/konica_qmxxx/main.c gphoto/konica_qmxxx/main.c
--- gphoto.orig/konica_qmxxx/main.c	Sun Nov 21 17:33:38 1999
+++ gphoto/konica_qmxxx/main.c	Sat Aug  5 11:49:46 2000
@@ -2,6 +2,7 @@
 #include "../src/gphoto.h"
 #undef DECLARE_GLOBAL_VARS_IN_GPHOTO_H
 
-void main(void)
+int main(void)
 {
+	return 0;
 }
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/konica_qmxxx/qm.c gphoto/konica_qmxxx/qm.c
--- gphoto.orig/konica_qmxxx/qm.c	Sun Oct  3 02:09:02 1999
+++ gphoto/konica_qmxxx/qm.c	Sat Aug  5 11:49:46 2000
@@ -25,6 +25,7 @@
 #include <sys/stat.h>
 #include <sys/uio.h>
 #include <unistd.h>
+#include <string.h>
 
 #include "../src/gphoto.h"
 #include "../src/util.h"
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/mustek/core.c gphoto/mustek/core.c
--- gphoto.orig/mustek/core.c	Thu Jan 13 23:52:38 2000
+++ gphoto/mustek/core.c	Sat Aug  5 11:49:46 2000
@@ -26,6 +26,7 @@
 #include <termios.h>
 #include <sys/time.h>
 #include <stdlib.h>
+#include <string.h>
 #include "print.h"
 
 //------------- Global System Data ----------------------------------------/
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/mustek/image.c gphoto/mustek/image.c
--- gphoto.orig/mustek/image.c	Thu Jan 13 23:52:38 2000
+++ gphoto/mustek/image.c	Sat Aug  5 11:49:46 2000
@@ -22,6 +22,7 @@
  * is used.
  */
 
+#include <string.h>
 #include "image.h"
 #include "print.h"
 
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/mustek/io.c gphoto/mustek/io.c
--- gphoto.orig/mustek/io.c	Thu Feb 24 20:50:23 2000
+++ gphoto/mustek/io.c	Sat Aug  5 11:49:46 2000
@@ -32,6 +32,7 @@
 #undef _IO_C
 #include "../src/gphoto.h"
 
+#include <string.h>
 #include <sys/time.h>
 #include "print.h"
 #include "rs232.h"
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/nikon/coolpix600.c gphoto/nikon/coolpix600.c
--- gphoto.orig/nikon/coolpix600.c	Sat Sep 11 11:51:29 1999
+++ gphoto/nikon/coolpix600.c	Sat Aug  5 11:49:46 2000
@@ -51,16 +51,17 @@
 *    - port to other *nixs. That shouldn't be too hard.
 */
 
-#include<stdio.h>
-#include<sys/types.h>
-#include<sys/stat.h>
-#include<fcntl.h>
-#include<unistd.h>
-#include<termios.h>
-#include<sys/ioctl.h>
-#include<setjmp.h>
-#include<sys/time.h>
-#include<signal.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <termios.h>
+#include <sys/ioctl.h>
+#include <setjmp.h>
+#include <sys/time.h>
+#include <signal.h>
+#include <string.h>
 #include "../src/gphoto.h"
 #include "../src/util.h"
 
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/philips/gphoto_philips.c gphoto/philips/gphoto_philips.c
--- gphoto.orig/philips/gphoto_philips.c	Sun Nov 21 17:33:39 1999
+++ gphoto/philips/gphoto_philips.c	Sat Aug  5 11:49:46 2000
@@ -25,6 +25,7 @@
 
 #include <stdio.h>
 #include <time.h>
+#include <string.h>
 /* #include <jpeglib.h> */
 #include "../src/gphoto.h"
 #include "../src/util.h"
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/philips/gphoto_philips_callbacks.c gphoto/philips/gphoto_philips_callbacks.c
--- gphoto.orig/philips/gphoto_philips_callbacks.c	Fri Oct  8 02:49:24 1999
+++ gphoto/philips/gphoto_philips_callbacks.c	Sat Aug  5 11:49:46 2000
@@ -31,6 +31,7 @@
 
 
 #include <time.h>
+#include <string.h>
 #include <gtk/gtk.h>
 #include <gdk_imlib.h>
 
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/photopc/eph_cmd.c gphoto/photopc/eph_cmd.c
--- gphoto.orig/photopc/eph_cmd.c	Wed Jul  5 13:07:49 2000
+++ gphoto/photopc/eph_cmd.c	Mon Aug  7 17:34:16 2000
@@ -79,6 +79,7 @@
 #include "config.h"
 #endif
 #include <stdio.h>
+#include <string.h>
 #include "eph_io.h"
 #include "eph_priv.h"
 
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/photopc/olympus.c gphoto/photopc/olympus.c
--- gphoto.orig/photopc/olympus.c	Wed Jul  5 13:07:49 2000
+++ gphoto/photopc/olympus.c	Sat Aug  5 11:49:46 2000
@@ -32,7 +44,8 @@
  * for the context.  Cameras not supporting folders should not
  * reach this code, but should still work if they do. -mid 
  */
-static int xchdir(eph_iob *iob,char *where, int have_folders)
+static int 
+xchdir(eph_iob *iob,char *where, int have_folders)
 {
       char path[MAXPATH],*p;
 
@@ -57,7 +70,8 @@
       return 0;
 }
 
-static int descend(eph_iob *iob,int depth,char *root,int(*each)(eph_iob *iob,char *path), int have_folders)
+static int 
+descend(eph_iob *iob,int depth,char *root,int(*each)(eph_iob *iob,char *path), int have_folders)
 {
       long nfolders=0L,i;
       off_t f_size;
@@ -125,7 +139,8 @@
       } else return 0;
 }
 
-int oly_init2(eph_iob *iob)
+int 
+oly_init2(eph_iob *iob)
 {
 	long ret;
 	int rc;
@@ -142,7 +157,9 @@
       return 0;
 }
 
-int oly_open_camera () {
+int 
+oly_open_camera ()
+{
 
 	/* Open the camera for reading/writing */
 
@@ -154,19 +171,21 @@
 
 		gpdev = olympus_usb_open();
 		if (!gpdev)
-			return (0);
+			return 0;
 		info_size=16;
 		info=malloc(info_size);
 	} else {
 		if (eph_open(iob, serial_port, 115200, 0, 0) == -1)
-			return (0);
+			return 0;
 	}
 
 	oly_init2(iob);
-	return (1);
+	return 1;
 }
 
-void oly_close_camera() {
+void 
+oly_close_camera() 
+{
 
 	/* Close the camera */
 
@@ -176,7 +195,9 @@
 		eph_close(iob, 0);
 }
 
-int oly_number_of_pictures () {
+int 
+oly_number_of_pictures () 
+{
 
 	long num_pictures_taken = 0;
 
@@ -190,7 +211,9 @@
 	return ((int)num_pictures_taken);
 }
 
-int oly_take_picture () {
+int 
+oly_take_picture () 
+{
 
 	char zero = 0;
 
@@ -203,7 +226,9 @@
 	return (oly_number_of_pictures());
 }
 
-struct Image *oly_get_picture (int picNum, int thumbnail) {
+struct Image *
+oly_get_picture (int picNum, int thumbnail) 
+{
 
 	/*
 	   Reads image #picNum the Olympus camera.
@@ -255,16 +280,23 @@
 	return (im);
 }
 
-struct Image *oly_get_preview () {
+struct Image *
+oly_get_preview () 
+{
 
-	char zero = '0';
+	char zero = 0;
 
-	oly_open_camera();
+	if (oly_open_camera() == 0) {
+		error_dialog("Could not open camera.");
+		return NULL;
+	}
 	eph_action(iob,5,&zero,1);
 	return (oly_get_picture(0, 0));
 }
 
-int oly_configure () {
+int 
+oly_configure () 
+{
 
 	/*
 	   Shows the Olympus config dialog
@@ -651,7 +692,9 @@
 	return 1;
 }
 
-int oly_delete_image (int picNum) {
+int 
+oly_delete_image (int picNum) 
+{
 
 	/*
 	   deletes image #picNum from the Olympus camera.
@@ -672,7 +715,9 @@
 char oly_summary_text[1024];
 
 
-char *oly_summary() {
+char *
+oly_summary() 
+{
 
 	unsigned long l;
 	char *s;
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/photopc/photopc-usb.c gphoto/photopc/photopc-usb.c
--- gphoto.orig/photopc/photopc-usb.c	Fri Jul 21 02:12:39 2000
+++ gphoto/photopc/photopc-usb.c	Thu Aug 10 16:50:34 2000
@@ -4,6 +4,8 @@
  *  USB Olympus support
  *
  * Copyright 2000, Fabrice Bellet <Fabrice.Bellet@creatis.insa-lyon.fr>
+ *
+ * This module is covered by the GPL.
  */
 
 #include <unistd.h>
@@ -17,19 +19,27 @@
 
 #include <gpio/gpio.h>
 
-int olympus_usb_read(struct olympus_device *dev, void *buffer, int len)
+int
+olympus_usb_read(struct olympus_device *dev, void *buffer, int len)
 {
 #ifdef GPIO_USB
-	return gpio_read(dev->gpdev, buffer, len);
+	if (dev)
+		return gpio_read(dev->gpdev, buffer, len);
+	else
+		return GPIO_ERROR;
 #else
 	return GPIO_ERROR;
 #endif
 }
 
-int olympus_usb_send(struct olympus_device *dev, void *buffer, int len)
+int
+olympus_usb_send(struct olympus_device *dev, void *buffer, int len)
 {
 #ifdef GPIO_USB
-	return gpio_write(dev->gpdev, buffer, len);
+	if (dev)
+		return gpio_write(dev->gpdev, buffer, len);
+	else
+		return GPIO_ERROR;
 #else
 	return GPIO_ERROR;
 #endif
@@ -53,7 +65,8 @@
 }
 #endif
 
-struct olympus_device *olympus_usb_open(void)
+struct olympus_device *
+olympus_usb_open(void)
 {
 #ifdef GPIO_USB
 	struct olympus_device *dev;
@@ -92,12 +104,15 @@
 #endif
 }
 
-void olympus_usb_close (struct olympus_device *dev)
+void 
+olympus_usb_close (struct olympus_device *dev)
 {
 #ifdef GPIO_USB
-	gpio_close (dev->gpdev);
-	gpio_free (dev->gpdev);
-	free (dev);
+	if (dev) {
+		gpio_close (dev->gpdev);
+		gpio_free (dev->gpdev);
+		free (dev);
+	}
 #endif
 }
 
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/ricoh/ricoh_300_io.c gphoto/ricoh/ricoh_300_io.c
--- gphoto.orig/ricoh/ricoh_300_io.c	Fri Jun 18 14:25:19 1999
+++ gphoto/ricoh/ricoh_300_io.c	Sat Aug  5 11:49:46 2000
@@ -23,6 +23,8 @@
 #include <errno.h>
 #include <signal.h>
 #include <time.h>
+#include <string.h>
+#include <stdlib.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/ricoh/ricoh_300z.c gphoto/ricoh/ricoh_300z.c
--- gphoto.orig/ricoh/ricoh_300z.c	Sun Oct  3 01:41:37 1999
+++ gphoto/ricoh/ricoh_300z.c	Sat Aug  5 11:49:46 2000
@@ -4,6 +4,7 @@
 #include <jpeglib.h>
 #include <setjmp.h>
 #include <time.h>
+#include <string.h>
 #include "../src/gphoto.h"
 #include "../src/util.h"
 
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/samsung/samsung.c gphoto/samsung/samsung.c
--- gphoto.orig/samsung/samsung.c	Thu Jan 13 20:31:48 2000
+++ gphoto/samsung/samsung.c	Sat Aug  5 11:49:46 2000
@@ -32,16 +32,17 @@
    **
  */
 
-#include<stdio.h>
-#include<sys/types.h>
-#include<sys/stat.h>
-#include<fcntl.h>
-#include<unistd.h>
-#include<termios.h>
-#include<sys/ioctl.h>
-#include<setjmp.h>
-#include<sys/time.h>
-#include<signal.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <termios.h>
+#include <sys/ioctl.h>
+#include <setjmp.h>
+#include <sys/time.h>
+#include <signal.h>
+#include <string.h>
 #include "../src/gphoto.h"
 #include "../src/util.h"
 
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/sony/command.c gphoto/sony/command.c
--- gphoto.orig/sony/command.c	Thu May 27 20:32:06 1999
+++ gphoto/sony/command.c	Sat Aug  5 11:49:46 2000
@@ -1,5 +1,6 @@
 #include "config.h"
 #include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include "common.h"
 #ifdef X68
@@ -288,11 +289,11 @@
       break;
     }
     sprintf(tmp_buf, "Total Pictures: %02d\n", pic_num);
-    strcat(status_buf, tmp_buf, sizeof(tmp_buf));
+    strcat(status_buf, tmp_buf);
     sprintf(tmp_buf, "Date: %02d/%02d/%02d\n", month, date, year);
-    strcat(status_buf, tmp_buf, sizeof(tmp_buf));
+    strcat(status_buf, tmp_buf);
     sprintf(tmp_buf, "Time: %02d:%02d\n",hour, minutes);
-    strcat(status_buf, tmp_buf, sizeof(tmp_buf));
+    strcat(status_buf, tmp_buf);
   }
   /* return (buf[2]);	ok*/
     strcpy(return_buf, status_buf);
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/sony/dscf55/Makefile.am gphoto/sony/dscf55/Makefile.am
--- gphoto.orig/sony/dscf55/Makefile.am	Thu Jun  8 14:25:43 2000
+++ gphoto/sony/dscf55/Makefile.am	Sat Aug  5 11:49:46 2000
@@ -7,8 +7,8 @@
 rsony_SOURCES = 
 rsony_LDADD = srsony.o config.o serio.o
 
-srsony.o : rsony.c serio.o config.o serio.h 
-	$(COMPILE) -DSTAND_ALONE -o srsony.o -c rsony.c
+srsony.o : ${srcdir}/rsony.c serio.o config.o serio.h 
+	$(COMPILE) -DSTAND_ALONE -o srsony.o -c ${srcdir}/rsony.c
 
 ## rsony_SOURCES = rmain.c rsony.c config.c serio.c serio.h
 
@@ -18,4 +18,4 @@
 
 libgphoto_sony_dscf55_la_LDFLAGS = -version-info 0:0:0
 
-EXTRA_DIST = serio.h rsony.c serio.c config.c config.h
\ No newline at end of file
+EXTRA_DIST = serio.h rsony.c serio.c config.c config.h
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/src/Makefile.am gphoto/src/Makefile.am
--- gphoto.orig/src/Makefile.am	Thu Jun  8 14:25:44 2000
+++ gphoto/src/Makefile.am	Fri Aug  4 11:24:51 2000
@@ -2,11 +2,42 @@
 
 SUBDIRS = icons
 
+INCLUDES = -I$(srcdir/icons) $(GNOME_INCLUDEDIR)
+
 bin_PROGRAMS = gphoto
 
-CFLAGS = @CFLAGS@ -I$(srcdir)/icons @GTK_CFLAGS@ @GDK_IMLIB_CFLAGS@
+gphoto_SOURCES = \
+	gphoto.h \
+	\
+	main.c \
+	commandline.c \
+	live.c \
+	gallery.c \
+	menu.c \
+	toolbar.c \
+	callbacks.c \
+	util.c \
+	developer_dialog.c \
+	img_edit.c \
+	gphoto.c \
+	main.h \
+	commandline.h \
+	live.h \
+	gallery.h \
+	menu.h \
+	toolbar.h \
+	callbacks.h \
+	util.h \
+	cameras.h \
+	developer.h \
+	developer_dialog.h \
+	exif.c \
+	exif.h
+
+gphoto_LDFLAGS = -export-dynamic
 
-gphoto_LDADD = ../konica/libgphoto_konica_qm100.la \
+gphoto_libs = \
+	../konica/libgphoto_konica_qm100.la \
 	../konica_qmxxx/libgphoto_konica_qmxxx.la \
 	../barbie/libgphoto_barbie.la \
 	../canon/libgphoto_canon.la \
@@ -27,11 +60,12 @@
 	../samsung/libgphoto_samsung.la \
 	../sony/libgphoto_sony_dscf1.la \
 	../sony/dscf55/libgphoto_sony_dscf55.la \
-	../directory/libgphoto_dir.la \
-	@GTK_LIBS@ @GDK_IMLIB_LIBS@ -ljpeg -lgpio
+	../directory/libgphoto_dir.la
 
-gphoto_SOURCES =  main.c commandline.c live.c gallery.c menu.c \
-	toolbar.c callbacks.c util.c developer_dialog.c img_edit.c gphoto.c \
-	main.h commandline.h live.h gallery.h menu.h toolbar.h callbacks.h \
-	util.h cameras.h gphoto.h developer.h developer_dialog.h \
-	exif.c exif.h
+gphoto_LDADD = \
+	$(gphoto_libs) \
+	$(GNOME_LIBDIR) \
+	-ljpeg -lgpio \
+	$(GDK_IMLIB_LIBS) \
+	$(GTK_LIBS) \
+	$(GNOMEUI_LIBS)
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/src/callbacks.c gphoto/src/callbacks.c
--- gphoto.orig/src/callbacks.c	Thu Jul  6 20:08:15 2000
+++ gphoto/src/callbacks.c	Fri Aug  4 12:36:49 2000
@@ -30,9 +30,10 @@
 #include <time.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <gnome.h>
 
-#include "post_processing_on.xpm"
-#include "post_processing_off.xpm"
+#include "icons/post_processing_on.xpm"
+#include "icons/post_processing_off.xpm"
 
 #define DEBUG(x) printf(x)
 
@@ -636,12 +712,6 @@
 			}
 		}
 	}
-
-/*  	if (!count) { */
-/*  		gtk_widget_set_sensitive(detected, FALSE); */
-/*  		gtk_widget_set_sensitive(detectedlist, FALSE); */
-/*  		gtk_widget_set_sensitive(scrolled_window, FALSE); */
-/*  	} */
 #endif
 
 	/*
@@ -1142,7 +1224,7 @@
 		w = 80;
 	}
 	scaledImage = gdk_imlib_clone_scaled_image(node->imlibimage,w,h);
-	/* gdk_imlib_kill_image(node->imlibimage); */
+	gdk_imlib_kill_image(node->imlibimage);
 	node->imlibimage = scaledImage;
 	w = node->imlibimage->rgb_width;
 	h = node->imlibimage->rgb_height;
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/src/commandline.c gphoto/src/commandline.c
--- gphoto.orig/src/commandline.c	Thu Feb 24 20:50:24 2000
+++ gphoto/src/commandline.c	Sat Aug  5 11:49:46 2000
@@ -1,4 +1,5 @@
 
+#include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/src/main.c gphoto/src/main.c
--- gphoto.orig/src/main.c	Sun Jul  9 23:40:15 2000
+++ gphoto/src/main.c	Fri Aug  4 12:30:06 2000
@@ -11,6 +11,7 @@
 #ifdef linux
 #include <sched.h>
 #endif
+#include <gnome.h>
 
 #define DECLARE_GLOBAL_VARS_IN_GPHOTO_H
 #include "gphoto.h"
@@ -23,9 +24,9 @@
 #include "toolbar.h"
 #include "commandline.h"
 #include "developer_dialog.h"
 
-#include "splash.xpm"           /* Splash screen  */
-#include "post_processing_off.xpm"
+#include "icons/splash.xpm"           /* Splash screen  */
+#include "icons/post_processing_off.xpm"
 
 extern  struct Model cameras[];
 extern  GtkAccelGroup*  mainag;
@@ -197,7 +204,8 @@
 	gtk_widget_show(status_bar);
 	gtk_label_set_justify(GTK_LABEL(status_bar), GTK_JUSTIFY_LEFT);	
 	gtk_box_pack_start(GTK_BOX(sbox), status_bar, FALSE, FALSE, 0);
-	update_status("Select \"Camera->Download Index->Thumbnails\" to begin.");	progress = gtk_progress_bar_new();
+	update_status("Select \"Camera->Download Index->Thumbnails\" to begin.");	
+	progress = gtk_progress_bar_new();
 
 	gtk_widget_show(progress);
 	gtk_box_pack_end(GTK_BOX(sbox), progress, FALSE, FALSE, 0);
diff -u --new-file --recursive --exclude-from=/tmp/cvs.exclude.gphoto gphoto.orig/src/toolbar.c gphoto/src/toolbar.c
--- gphoto.orig/src/toolbar.c	Sun Nov 21 17:33:39 1999
+++ gphoto/src/toolbar.c	Sat Aug  5 11:49:46 2000
@@ -7,27 +7,27 @@
 /* The toolbar xpm icons */
 
 /*  #include "batch_save.xpm" */
-#include "close_image.xpm"
-#include "colors.xpm"
-#include "configure.xpm"
-#include "delete_images.xpm"
-#include "exit.xpm"
-#include "fliph.xpm"
-#include "flipv.xpm"
-#include "get_index.xpm"
-#include "get_index_empty.xpm"
-#include "get_selected_images.xpm"
-#include "help.xpm"
-#include "left_arrow.xpm"
-#include "mail_image.xpm"
-#include "open_image.xpm"
-#include "print_image.xpm"
-#include "resize.xpm"
-#include "right_arrow.xpm"
-#include "rotc.xpm"
-#include "rotcc.xpm"
-#include "save_current_image.xpm"
-#include "stop.xpm"
+#include "icons/close_image.xpm"
+#include "icons/colors.xpm"
+#include "icons/configure.xpm"
+#include "icons/delete_images.xpm"
+#include "icons/exit.xpm"
+#include "icons/fliph.xpm"
+#include "icons/flipv.xpm"
+#include "icons/get_index.xpm"
+#include "icons/get_index_empty.xpm"
+#include "icons/get_selected_images.xpm"
+#include "icons/help.xpm"
+#include "icons/left_arrow.xpm"
+#include "icons/mail_image.xpm"
+#include "icons/open_image.xpm"
+#include "icons/print_image.xpm"
+#include "icons/resize.xpm"
+#include "icons/right_arrow.xpm"
+#include "icons/rotc.xpm"
+#include "icons/rotcc.xpm"
+#include "icons/save_current_image.xpm"
+#include "icons/stop.xpm"
 
 /* #include "web_browse.xpm"   */
 /* #include "take_picture.xpm" */