gp_frontend_message -> gp_camera_message

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2442 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Lutz Mueller
2001-10-08 09:51:38 +00:00
parent c6cbeb2bbb
commit d9fbdff268
3 changed files with 9 additions and 8 deletions

View File

@@ -18,13 +18,13 @@ status_func (Camera *camera, const char *status, void *data)
printf ("Status: %s\n", status);
}
int gp_interface_message (Camera *camera, char *message) {
void
message_func (Camera *camera, const char *message, void *data)
{
if (glob_quiet)
return (GP_OK);
return;
printf("Message: %s\n", message);
return (GP_OK);
printf ("Message: %s\n", message);
}
int gp_interface_confirm (Camera *camera, char *message) {

View File

@@ -1,4 +1,5 @@
void status_func (Camera *camera, const char *status, void *data);
void progress_func (Camera *camera, float percentage, void *data);
int gp_interface_message (Camera *camera, char *message);
void message_func (Camera *camera, const char *message, void *data);
int gp_interface_confirm (Camera *camera, char *message);

View File

@@ -832,6 +832,7 @@ set_globals (void)
gp_camera_set_status_func (glob_camera, status_func, NULL);
gp_camera_set_progress_func (glob_camera, progress_func, NULL);
gp_camera_set_message_func (glob_camera, message_func, NULL);
cli_debug_print ("Initializing camera...");
CHECK_RESULT (gp_camera_init (glob_camera));
@@ -967,8 +968,7 @@ e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n");
exit(EXIT_FAILURE);
}
gp_frontend_register (NULL, NULL, gp_interface_message,
gp_interface_confirm, NULL);
gp_frontend_register (NULL, NULL, NULL, gp_interface_confirm, NULL);
if ((result = execute_options(argc, argv)) != GP_OK) {
printf ("gPhoto2 reported the error '%s'\n",
gp_camera_get_result_as_string (glob_camera, result));