updated gtk-old interface to new object-oriented API

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@758 67ed7778-7388-44ab-90cf-0a291f65f57c

10 files changed, 17 insertions, 22 deletions

diff --git a/camlibs/barbie/barbie.c b/camlibs/barbie/barbie.c
index 59ab2fd80..36a7a71d9 100644
--- a/camlibs/barbie/barbie.c
+++ b/camlibs/barbie/barbie.c
@@ -249,7 +249,7 @@ printf("\tn1=%i n2=%i n3=%i n4=%i size=%i\n", n1, n2 ,n3, n4, *size);
 
 int camera_id (char *id) {
 
-	strcpy(id, "barbie-scottf");
+	strcpy(id, "barbie");
 
 	return (GP_OK);
 }
diff --git a/camlibs/canon/Makefile b/camlibs/canon/Makefile
index 304bfa3ae..ca001c2f0 100644
--- a/camlibs/canon/Makefile
+++ b/camlibs/canon/Makefile
@@ -16,7 +16,7 @@ SHELL = /bin/sh
 
 srcdir = .
 top_srcdir = ../..
-prefix = /opt/gphoto2
+prefix = /opt/gphoto2/
 exec_prefix = ${prefix}
 
 bindir = ${exec_prefix}/bin
@@ -78,20 +78,20 @@ NM = /usr/bin/nm -B
 OBJDUMP = @OBJDUMP@
 PACKAGE = gphoto2
 RANLIB = ranlib
-SUBDIRS_CAMLIBS =  barbie directory fujitsu konica panasonic digita canon
+SUBDIRS_CAMLIBS =  barbie canon directory fujitsu konica panasonic digita
 VERSION = 1.90
 
 camlibdir = $(prefix)/lib/gphoto2
 camlib_LTLIBRARIES = libgphoto2_canon.la
 
-CFLAGS = -g -O2 -I/usr/local/include/gpio -I/usr/local/include -I/usr/local/include `gtk-config --cflags` `gpio-config --cflags` -g -Wall
+CFLAGS = -g -O2 -I/usr/local/include/gpio -I/usr/local/include -I/usr/local/include `gpio-config --cflags` -g -Wall
 LDFLAGS =  -g `gpio-config --libs`
 INCLUDES = -I$(top_srcdir)/include
 
 libgphoto2_canon_la_SOURCES = canon.c canon.h psa50.c psa50.h serial.c serial.h 	crc.c crc.h util.c util.h
 
 
-libgphoto_canon_la_LDFLAGS = -version-info 0:0:0 `gpio-config --libs`
+libgphoto2_canon_la_LDFLAGS = -version-info 0:0:0
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
@@ -100,7 +100,6 @@ LTLIBRARIES =  $(camlib_LTLIBRARIES)
 
 DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I../..
 CPPFLAGS = 
-libgphoto2_canon_la_LDFLAGS = 
 libgphoto2_canon_la_LIBADD = 
 libgphoto2_canon_la_OBJECTS =  canon.lo psa50.lo serial.lo crc.lo \
 util.lo
@@ -233,7 +232,7 @@ distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
diff --git a/camlibs/canon/Makefile.am b/camlibs/canon/Makefile.am
index ac55fc338..1bf2d190d 100644
--- a/camlibs/canon/Makefile.am
+++ b/camlibs/canon/Makefile.am
@@ -1,11 +1,11 @@
 camlibdir = $(prefix)/lib/gphoto2
 camlib_LTLIBRARIES = libgphoto2_canon.la
 
-CFLAGS = @CFLAGS@ `gtk-config --cflags` `gpio-config --cflags` -g -Wall
+CFLAGS = @CFLAGS@ `gpio-config --cflags` -g -Wall
 LDFLAGS = @LDFLAGS@ -g `gpio-config --libs`
 INCLUDES = -I$(top_srcdir)/include
 
 libgphoto2_canon_la_SOURCES = canon.c canon.h psa50.c psa50.h serial.c serial.h \
 	crc.c crc.h util.c util.h
 
-libgphoto2_canon_la_LDFLAGS = -version-info 0:0:0 `gpio-config --libs`
+libgphoto2_canon_la_LDFLAGS = -version-info 0:0:0
diff --git a/camlibs/canon/Makefile.in b/camlibs/canon/Makefile.in
index 4a452e4cb..ce4d29585 100644
--- a/camlibs/canon/Makefile.in
+++ b/camlibs/canon/Makefile.in
@@ -84,14 +84,14 @@ VERSION = @VERSION@
 camlibdir = $(prefix)/lib/gphoto2
 camlib_LTLIBRARIES = libgphoto2_canon.la
 
-CFLAGS = @CFLAGS@ `gtk-config --cflags` `gpio-config --cflags` -g -Wall
+CFLAGS = @CFLAGS@ `gpio-config --cflags` -g -Wall
 LDFLAGS = @LDFLAGS@ -g `gpio-config --libs`
 INCLUDES = -I$(top_srcdir)/include
 
 libgphoto2_canon_la_SOURCES = canon.c canon.h psa50.c psa50.h serial.c serial.h 	crc.c crc.h util.c util.h
 
 
-libgphoto_canon_la_LDFLAGS = -version-info 0:0:0 `gpio-config --libs`
+libgphoto2_canon_la_LDFLAGS = -version-info 0:0:0
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
@@ -100,7 +100,6 @@ LTLIBRARIES =  $(camlib_LTLIBRARIES)
 
 DEFS = @DEFS@ -I. -I$(srcdir) -I../..
 CPPFLAGS = @CPPFLAGS@
-libgphoto2_canon_la_LDFLAGS = 
 libgphoto2_canon_la_LIBADD = 
 libgphoto2_canon_la_OBJECTS =  canon.lo psa50.lo serial.lo crc.lo \
 util.lo
@@ -233,7 +232,7 @@ distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
diff --git a/camlibs/directory/directory.c b/camlibs/directory/directory.c
index ac5b66328..d43191820 100644
--- a/camlibs/directory/directory.c
+++ b/camlibs/directory/directory.c
@@ -17,7 +17,7 @@
 
 int camera_id (char *id) {
 
-        strcpy(id, "directory-scottf");
+        strcpy(id, "directory");
 
         return (GP_OK);
 }
diff --git a/camlibs/konica/konica.c b/camlibs/konica/konica.c
index 45d33e91f..573d93207 100644
--- a/camlibs/konica/konica.c
+++ b/camlibs/konica/konica.c
@@ -111,7 +111,7 @@ k_return_status_t return_status_translation (gchar byte1, gchar byte2)
 
 k_return_status_t k_init (
 	gboolean image_id_long, 
-	CameraPortSettings port_settings, 
+	CameraPortInfo port_settings, 
 	gboolean debug_flag) 
 {
 	image_id_int = !image_id_long;
@@ -1684,4 +1684,3 @@ k_return_status_t k_cancel (k_command_t *command)
 		return (k_return_status);
 	}
 }
-
diff --git a/camlibs/konica/konica.h b/camlibs/konica/konica.h
index 077a303ab..f13997a06 100644
--- a/camlibs/konica/konica.h
+++ b/camlibs/konica/konica.h
@@ -286,7 +286,7 @@ typedef enum {
 /****************************************************************/
 k_return_status_t k_init (
 	gboolean image_id_long, 
-	CameraPortSettings port_settings, 
+	CameraPortInfo port_settings, 
 	gboolean debug_flag);
 
 
diff --git a/camlibs/konica/library.c b/camlibs/konica/library.c
index 9f787eaba..6e1737fb3 100644
--- a/camlibs/konica/library.c
+++ b/camlibs/konica/library.c
@@ -182,7 +182,7 @@ int camera_abilities (CameraAbilities *abilities, int *count)
 int camera_init (Camera *camera, CameraInit *init)
 {
 	gint i, j;
-	CameraPortSettings port_settings;
+	CameraPortInfo port_settings;
 	gboolean image_id_long = FALSE;
 	guint test_bit_rate[10] = {
 		9600, 
diff --git a/camlibs/konica/lowlevel.c b/camlibs/konica/lowlevel.c
index 469c93d0a..190d57e6a 100644
--- a/camlibs/konica/lowlevel.c
+++ b/camlibs/konica/lowlevel.c
@@ -59,7 +59,7 @@ l_return_status_t l_receive (
 /******************************************************************************/
 /* Functions						                      */
 /******************************************************************************/
-l_return_status_t l_init (CameraPortSettings port_settings, gboolean debug_flag)
+l_return_status_t l_init (CameraPortInfo port_settings, gboolean debug_flag)
 {
 	guchar c;
 	gint i;
@@ -659,4 +659,3 @@ l_return_status_t l_send_receive_receive (
 	}
 	return (return_status);
 }
-
diff --git a/camlibs/konica/lowlevel.h b/camlibs/konica/lowlevel.h
index 8d4d2ff4a..579c99a3a 100644
--- a/camlibs/konica/lowlevel.h
+++ b/camlibs/konica/lowlevel.h
@@ -40,7 +40,7 @@ typedef enum {
 /* Prototypes							*/
 /****************************************************************/
 l_return_status_t l_init (
-	CameraPortSettings port_settings, 
+	CameraPortInfo port_settings, 
 	gboolean debug_flag);
 
 
@@ -81,4 +81,3 @@ l_return_status_t l_send_receive_receive (
         guchar **receive_buffer, 
         guint   *receive_buffer_size, 
 	guint    timeout);
-