diff options
author | Scott Fritzinger <scottf@unr.edu> | 2000-07-26 19:14:11 +0000 |
---|---|---|
committer | Scott Fritzinger <scottf@unr.edu> | 2000-07-26 19:14:11 +0000 |
commit | 39aa2b86b17674ec0d165f3ea58014b418c51096 (patch) | |
tree | 7b0aa6c465613640d3a58e77b701051892b22fe2 /camlibs/konica | |
parent | 8d2dd76daf479b9a08998c8eb573aff219495566 (diff) | |
download | libgphoto2-39aa2b86b17674ec0d165f3ea58014b418c51096.tar.gz |
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
Diffstat (limited to 'camlibs/konica')
-rw-r--r-- | camlibs/konica/konica.c | 3 | ||||
-rw-r--r-- | camlibs/konica/konica.h | 2 | ||||
-rw-r--r-- | camlibs/konica/library.c | 2 | ||||
-rw-r--r-- | camlibs/konica/lowlevel.c | 3 | ||||
-rw-r--r-- | camlibs/konica/lowlevel.h | 3 |
5 files changed, 5 insertions, 8 deletions
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); - |