From 00dd076f5abc1c71a84bee4aa6af738bedfdf44f Mon Sep 17 00:00:00 2001 From: Lutz Mueller Date: Tue, 15 Jan 2002 21:48:26 +0000 Subject: [PATCH] =?UTF-8?q?2002-01-15=20=20Lutz=20M=EF=BF=BDller=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * dc1000.c: * dc1580.c: gp_camera_status -> gp_context_status. git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3896 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/panasonic/ChangeLog | 5 +++++ camlibs/panasonic/dc1000.c | 10 +++++----- camlibs/panasonic/dc1580.c | 10 +++++----- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/camlibs/panasonic/ChangeLog b/camlibs/panasonic/ChangeLog index 016b94e8e..961bc15b5 100644 --- a/camlibs/panasonic/ChangeLog +++ b/camlibs/panasonic/ChangeLog @@ -1,3 +1,8 @@ +2002-01-15 Lutz Müller + + * dc1000.c: + * dc1580.c: gp_camera_status -> gp_context_status. + 2002-01-15 Lutz Müller * dc1000.c diff --git a/camlibs/panasonic/dc1000.c b/camlibs/panasonic/dc1000.c index 30e43f82f..dc5103406 100644 --- a/camlibs/panasonic/dc1000.c +++ b/camlibs/panasonic/dc1000.c @@ -366,7 +366,7 @@ int camera_abilities (CameraAbilitiesList *list) { static int camera_exit (Camera *camera, GPContext *context) { - dsc_print_status(camera, _("Disconnecting camera.")); + gp_context_status(context, _("Disconnecting camera.")); dsc1_disconnect(camera); if (camera->pl) { @@ -406,7 +406,7 @@ static int get_file_func (CameraFilesystem *fs, const char *folder, if (type != GP_FILE_TYPE_NORMAL) return (GP_ERROR_NOT_SUPPORTED); - dsc_print_status(camera, _("Downloading image %s."), filename); + gp_context_status(context, _("Downloading image %s."), filename); /* index is the 0-based image number on the camera */ index = gp_filesystem_number (camera->fs, folder, filename, context); @@ -447,7 +447,7 @@ static int put_file_func (CameraFilesystem *fs, const char *folder, unsigned int id; gp_file_get_name (file, &name); - dsc_print_status(camera, _("Uploading image: %s."), name); + gp_context_status(context, _("Uploading image: %s."), name); /* We can not figure out file type, at least by now. @@ -458,7 +458,7 @@ static int put_file_func (CameraFilesystem *fs, const char *folder, */ gp_file_get_data_and_size (file, &data, &size); if (size > DSC_MAXIMAGESIZE) { - dsc_print_message (camera, _("File size is %i bytes. " + gp_context_message (context, _("File size is %i bytes. " "The size of the largest file possible to " "upload is: %i bytes."), size, DSC_MAXIMAGESIZE); @@ -498,7 +498,7 @@ static int delete_file_func (CameraFilesystem *fs, const char *folder, Camera *camera = data; int index, result; - dsc_print_status(camera, _("Deleting image %s."), filename); + gp_context_status(context, _("Deleting image %s."), filename); /* index is the 0-based image number on the camera */ CHECK (index = gp_filesystem_number (camera->fs, folder, filename, diff --git a/camlibs/panasonic/dc1580.c b/camlibs/panasonic/dc1580.c index 6e005c777..75576db4d 100644 --- a/camlibs/panasonic/dc1580.c +++ b/camlibs/panasonic/dc1580.c @@ -463,7 +463,7 @@ int camera_abilities (CameraAbilitiesList *list) { static int camera_exit (Camera *camera, GPContext *context) { - dsc_print_status(camera, _("Disconnecting camera.")); + gp_context_status(context, _("Disconnecting camera.")); dsc2_disconnect(camera); @@ -523,7 +523,7 @@ static int get_file_func (CameraFilesystem *fs, const char *folder, int index, i, size, blocks, result; unsigned int id; - dsc_print_status(camera, _("Downloading %s."), filename); + gp_context_status(context, _("Downloading %s."), filename); /* index is the 0-based image number on the camera */ CHECK (index = gp_filesystem_number(camera->fs, folder, filename, context)); @@ -572,7 +572,7 @@ static int put_file_func (CameraFilesystem *fs, const char *folder, unsigned int id; gp_file_get_name(file, &name); - dsc_print_status(camera, _("Uploading image: %s."), name); + gp_context_status(context, _("Uploading image: %s."), name); /* We can not figure out file type, at least by now. @@ -583,7 +583,7 @@ static int put_file_func (CameraFilesystem *fs, const char *folder, */ gp_file_get_data_and_size (file, &data, &size); if (size > DSC_MAXIMAGESIZE) { - dsc_print_message (camera, _("File size is %i bytes. " + gp_context_message (context, _("File size is %i bytes. " "The size of the largest file possible to " "upload is: %i bytes."), size, DSC_MAXIMAGESIZE); @@ -620,7 +620,7 @@ static int delete_file_func (CameraFilesystem *fs, const char *folder, Camera *camera = data; int index, result; - dsc_print_status(camera, _("Deleting image %s."), filename); + gp_context_status(context, _("Deleting image %s."), filename); /* index is the 0-based image number on the camera */ CHECK (index = gp_filesystem_number (camera->fs, folder, filename, context));