[gphoto-cvs] SF.net SVN: gphoto:[13451] trunk/libgphoto2/camlibs/ptp2/library.c

[<mar...@us...>]

Revision: 13451
          http://gphoto.svn.sourceforge.net/gphoto/?rev=13451&view=rev
Author:   marcusmeissner
Date:     2010-12-26 17:07:08 +0000 (Sun, 26 Dec 2010)

Log Message:
-----------
merge from trunk

Modified Paths:
--------------
    trunk/libgphoto2/camlibs/ptp2/library.c

Modified: trunk/libgphoto2/camlibs/ptp2/library.c
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/library.c	2010-12-26 17:06:41 UTC (rev 13450)
+++ trunk/libgphoto2/camlibs/ptp2/library.c	2010-12-26 17:07:08 UTC (rev 13451)
@@ -2563,11 +2563,11 @@
 
 		ret = ptp_canon_eos_capture (params, &result);
 		if (ret != PTP_RC_OK) {
-			gp_context_error (context, _("Canon EOS Trigger Capture failed: %x"), ret);
+			gp_context_error (context, _("Canon EOS Trigger Capture failed: 0x%x (result 0x%x)"), ret, result);
 			return translate_ptp_result (ret);
 		}
 		if ((result & 0x7000) == 0x2000) { /* also happened */
-			gp_context_error (context, _("Canon EOS Trigger Capture failed: %x"), result);
+			gp_context_error (context, _("Canon EOS Trigger Capture failed: 0x%x"), result);
 			return translate_ptp_result (result);
 		}
 		gp_log (GP_LOG_DEBUG, "ptp2/canon_eos_capture", "result is %d", result);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.