darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

save the changed flag for non matching configentries

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10954 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2008-02-19 19:52:09 +00:00
parent 60d12cfa00
commit b793662ddf
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
camlibs/ptp2/ChangeLog
View File

@@ -1,3 +1,8 @@
2008-02-19 Marcus Meissner <marcus@jet.franken.de>
* config.c: Do not clear the "changed" flag when its not the
widget we want.
2008-02-07 Marcus Meissner <marcus@jet.franken.de>
* library.c: Added Canon IXUS 860 IS as reported.

5
camlibs/ptp2/config.c
View File

@@ -2816,8 +2816,12 @@ camera_set_config (Camera *camera, CameraWidget *window, GPContext *context)
if (!gp_widget_changed (widget))
continue;
/* restore the "changed flag" */
gp_widget_set_changed (widget, TRUE);
gp_log (GP_LOG_DEBUG, "camera_set_config", "Found and setting Property %04x (%s)", cursub->propid, cursub->label);
if (have_prop(camera,cursub->vendorid,cursub->propid)) {
gp_widget_changed (widget); /* clear flag */
if (cursub->propid) {
PTPDevicePropDesc dpd;
@@ -2835,6 +2839,7 @@ camera_set_config (Camera *camera, CameraWidget *window, GPContext *context)
if (have_eos_prop(camera,cursub->vendorid,cursub->propid)) {
PTPDevicePropDesc dpd;
gp_widget_changed (widget); /* clear flag */
gp_log (GP_LOG_DEBUG, "camera_set_config", "Found and setting EOS Property %04x (%s)", cursub->propid, cursub->label);
memset(&dpd,0,sizeof(dpd));
ptp_canon_eos_getdevicepropdesc (&camera->pl->params,cursub->propid, &dpd);