← Back to branch summary

~ubuntu-branches/ubuntu/saucy/libgphoto2/saucy-proposed

« back to all changes in this revision

Viewing changes to camlibs/mustek/mdc800.c

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2013-07-31 07:00:09 UTC
  • mfrom: (1.4.4)
  • Revision ID: package-import@ubuntu.com-20130731070009-enrbvg3hry64cxl1
Tags: 2.5.2-0ubuntu1
* New upstream release.
* Drop 01-increase_max_entries.patch, 02-libusbx_no_debug.patch,
  03-libusbx-fixes.patch: fixed upstream.
* Add libxml2-dev build dependency for new optional features.
* ABI changes: libgphoto2-2 → libgphoto2-6,
  libgphoto2-port0 → libgphoto2-port10
* debian/libgphoto2-dev-doc.install: Adjust to changed HTML API doc folder
  name.
* debian/libgphoto2-port10.install: Adjust for changed libgphoto-port ABI.

Show diffs side-by-side

added added

removed removed

Lines of Context:
camlibs/mustek/mdc800.c
113
113
        if (result < 0)
114
114
                return result;
115
115
 
116
 
        gp_file_set_name(file,filename);
117
 
        gp_file_set_mime_type (file, "image/jpeg");
 
116
        gp_file_set_mime_type (file, GP_MIME_JPEG);
118
117
        gp_file_set_data_and_size(file, data, size);
119
118
        return (GP_OK);
120
119
}
121
120
 
122
121
static int
123
 
put_file_func (CameraFilesystem *fs, const char *folder, CameraFile *file,
124
 
               void *data, GPContext *context)
125
 
{
126
 
/* Camera *camera;*/
127
 
 
128
 
        /*
129
 
         * Upload the file to the camera. Use gp_file_get_data_and_size,
130
 
         * gp_file_get_name, etc.
131
 
         */
132
 
 
133
 
        return (GP_OK);
134
 
}
135
 
 
136
 
static int
137
122
delete_file_func (CameraFilesystem *fs, const char *folder,
138
123
                  const char *filename, void *data, GPContext *context)
139
124
{
279
264
        strcpy (about->text, _("Mustek MDC-800 gPhoto2 Library\n"
280
265
                               "Henning Zabel <henning@uni-paderborn.de>\n"
281
266
                               "Ported to gphoto2 by Marcus Meissner <marcus@jet.franken.de>\n"
282
 
                               "Supports Serial and USB Protocol."));
 
267
                               "Supports Serial and USB Protocols."));
283
268
        return (GP_OK);
284
269
}
285
270
 
323
308
        .file_list_func = file_list_func,
324
309
        .folder_list_func = folder_list_func,
325
310
        .get_file_func = get_file_func,
326
 
        .put_file_func = put_file_func,
327
311
        .get_info_func = get_info_func,
328
312
        .del_file_func = delete_file_func,
329
313
        .delete_all_func = delete_all_func