[gphoto-cvs] SF.net SVN: gphoto: [11198] branches/libgphoto2-2_4/libgphoto2/camlibs/ canon/library.c

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

Revision: 11198
          http://gphoto.svn.sourceforge.net/gphoto/?rev=11198&view=rev
Author:   marcusmeissner
Date:     2008-06-30 00:44:43 -0700 (Mon, 30 Jun 2008)

Log Message:
-----------
do not feed binary into a textfiedl

Modified Paths:
--------------
    branches/libgphoto2-2_4/libgphoto2/camlibs/canon/library.c

Modified: branches/libgphoto2-2_4/libgphoto2/camlibs/canon/library.c
===================================================================
--- branches/libgphoto2-2_4/libgphoto2/camlibs/canon/library.c	2008-06-30 07:41:50 UTC (rev 11197)
+++ branches/libgphoto2-2_4/libgphoto2/camlibs/canon/library.c	2008-06-30 07:44:43 UTC (rev 11198)
@@ -964,7 +964,7 @@
 	time_t camera_time, local_time, tmp_time;
 	struct tm *tm;
 	double time_diff;
-	char formatted_camera_time[20];
+	char formatted_camera_time[30];
 
 	GP_DEBUG ("camera_summary()");
 
@@ -1511,6 +1511,7 @@
 	int res_byte1, res_byte2, res_byte3;
 	int pwr_status, pwr_source, res, i, menuval;
 	time_t camtime;
+	char formatted_camera_time[20];
 
 	GP_DEBUG ("camera_get_config()");
 
@@ -1837,7 +1838,9 @@
 	if (camera->pl->cached_ready == 1) {
 		res = canon_int_get_time (camera, &camtime, context);
 		if (res == GP_OK) {
-			gp_widget_set_value (t, &camtime);
+			strftime (formatted_camera_time, sizeof (formatted_camera_time),
+                          "%Y-%m-%d %H:%M:%S", gmtime (&camtime));
+			gp_widget_set_value (t, formatted_camera_time);
 		} else {
 			gp_widget_set_value (t, _("Error"));
 		}


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