From b793662ddf88441a2e2812e2304ddd97ef2ed0b8 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 19 Feb 2008 19:52:09 +0000 Subject: [PATCH] save the changed flag for non matching configentries git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10954 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/ptp2/ChangeLog | 5 +++++ camlibs/ptp2/config.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/camlibs/ptp2/ChangeLog b/camlibs/ptp2/ChangeLog index f3cabc843..41fa721d0 100644 --- a/camlibs/ptp2/ChangeLog +++ b/camlibs/ptp2/ChangeLog @@ -1,3 +1,8 @@ +2008-02-19 Marcus Meissner + + * config.c: Do not clear the "changed" flag when its not the + widget we want. + 2008-02-07 Marcus Meissner * library.c: Added Canon IXUS 860 IS as reported. diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c index d3fbd2d93..e02098190 100644 --- a/camlibs/ptp2/config.c +++ b/camlibs/ptp2/config.c @@ -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);