2001-10-08 Lutz M�ller <urc8@rz.uni-karlsruhe.de>

        * include/gphoto2-[camera,frontend].h
        * libgphoto2/[camera,frontend].c: gp_frontend_message ->
          gp_camera_message
        * camlibs: Reflect above


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

5 files changed, 15 insertions, 16 deletions

diff --git a/camlibs/canon/canon.c b/camlibs/canon/canon.c
index 19b642d08..aab939c54 100644
--- a/camlibs/canon/canon.c
+++ b/camlibs/canon/canon.c
@@ -1092,7 +1092,7 @@ int camera_folder_put_file (Camera *camera, const char *folder,
 	if (cs->speed>57600 && 
 		(strcmp(camera->model,"Canon PowerShot A50") == 0
 		 || strcmp(camera->model, "Canon PowerShot Pro70") == 0)) {
-		gp_frontend_message(camera,
+		gp_camera_message(camera,
   _("Speeds greater than 57600 are not supported for uploading to this camera"));
 		return GP_ERROR;
 	}
@@ -1137,7 +1137,7 @@ int camera_folder_put_file (Camera *camera, const char *folder,
 				sprintf(buf,"%c%c%c",dir[1],dir[2],dir[3]);
 				dirnum = atoi(buf);
 				if (dirnum == 999) {
-					gp_frontend_message(camera,_("Could not upload, no free folder name available!\n"
+					gp_camera_message(camera,_("Could not upload, no free folder name available!\n"
 										"999CANON folder name exists and has an AUT_9999.JPG picture in it."));
 					return GP_ERROR;
 				}
@@ -1158,12 +1158,12 @@ int camera_folder_put_file (Camera *camera, const char *folder,
 	}
 	
 	if(!psa50_directory_operations(camera, dcf_root_dir, DIR_CREATE)) {
-		gp_frontend_message(camera,"could not create \\DCIM directory");
+		gp_camera_message(camera,"could not create \\DCIM directory");
 		return GP_ERROR;
 	}
 	
 	if(!psa50_directory_operations(camera,destpath, DIR_CREATE)) {
-		gp_frontend_message(camera,"could not create destination directory");
+		gp_camera_message(camera,"could not create destination directory");
 		return GP_ERROR;
 	}
 	
diff --git a/camlibs/canon/psa50.c b/camlibs/canon/psa50.c
index 578425b1a..74cb73c98 100644
--- a/camlibs/canon/psa50.c
+++ b/camlibs/canon/psa50.c
@@ -2001,7 +2001,7 @@ int psa50_delete_file(Camera *camera, const char *name, const char *dir)
                 return -1;
     }
         if (msg[0] == 0x29) {
-                gp_frontend_message(camera,_("File protected"));
+                gp_camera_message(camera,_("File protected"));
                 return -1;
         }
 
@@ -2014,7 +2014,7 @@ int psa50_delete_file(Camera *camera, const char *name, const char *dir)
  */
 int psa50_put_file_usb(Camera *camera, CameraFile *file, char *destname, char *destpath)
 {
-    gp_frontend_message(camera,_("Not implemented!"));
+    gp_camera_message(camera,_("Not implemented!"));
     return GP_ERROR;
 }
 
diff --git a/camlibs/kodak/dc120/library.c b/camlibs/kodak/dc120/library.c
index fd3e5c672..b066becd5 100644
--- a/camlibs/kodak/dc120/library.c
+++ b/camlibs/kodak/dc120/library.c
@@ -455,11 +455,10 @@ int dc120_capture (DC120Data *dd, CameraFile *file) {
 	const char *name;
 
 	/* Take the picture to Flash memory */
-	gp_frontend_message (NULL, "Taking picture...");
 	if (dc120_packet_write(dd, cmd_packet, 8, 1) == GP_ERROR)
 		return (GP_ERROR);
 
-	gp_frontend_message (NULL, "Waiting for completion...");
+	gp_camera_status (dd->camera, "Waiting for completion...");
 	if (dc120_wait_for_completion(dd)==GP_ERROR)
 		return (GP_ERROR);
 
diff --git a/camlibs/konica/library.c b/camlibs/konica/library.c
index b7fb444e8..3dccb4701 100644
--- a/camlibs/konica/library.c
+++ b/camlibs/konica/library.c
@@ -447,7 +447,6 @@ static int
 camera_folder_delete_all (Camera* camera, const char* folder)
 {
         unsigned int not_erased = 0;
-        char tmp[1024];
 
         if (strcmp (folder, "/"))
                 return (GP_ERROR_DIRECTORY_NOT_FOUND);
@@ -456,9 +455,10 @@ camera_folder_delete_all (Camera* camera, const char* folder)
         CHECK (gp_filesystem_format (camera->fs));
 
         if (not_erased) {
-                sprintf (tmp, _("%i pictures could not be deleted because "
-                         "they are protected!"), not_erased);
-                gp_frontend_message (camera, tmp);
+		gp_camera_message (camera,
+				   _("%i pictures could not be deleted "
+				     "because they are protected!"),
+				   not_erased);
         }
 
         return (GP_OK);
@@ -1175,9 +1175,9 @@ localization_file_read (Camera *camera, const char *file_name,
                                 (*data)[*data_size] = d;
                                 (*data_size)++;
                                 if (*data_size == 65536) {
-                                        gp_frontend_message (
-                                                camera,
-                                                _("Localization file too long!"));
+                                        gp_camera_message (
+						camera,
+						_("Localization file too long!"));
                                         fclose (file);
                                         return (FALSE);
                                 }
diff --git a/camlibs/panasonic/dc.c b/camlibs/panasonic/dc.c
index 5082d4a88..d7a676152 100644
--- a/camlibs/panasonic/dc.c
+++ b/camlibs/panasonic/dc.c
@@ -258,7 +258,7 @@ void dsc_print_message(Camera *camera, char *format, ...) {
         va_end(pvar);
 
         gp_debug_printf(GP_DEBUG_MEDIUM, "panasonic", "%s\n", str);
-        gp_frontend_message(camera, str);
+        gp_camera_message(camera, str);
 }
 
 /* End of dc.c */