[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdegraphics/kamera/kioslave
From:       Marcus Meissner <marcus () jet ! franken ! de>
Date:       2003-07-08 20:41:00
[Download RAW message or body]

CVS commit by mm: 

If the camera says it supports previews, but says "unsupported" on query,
download a normal image. kio_thumbnail will handle it just fine.


  M +8 -0      kamera.cpp   1.32


--- kdegraphics/kamera/kioslave/kamera.cpp  #1.31:1.32
@@ -228,4 +228,12 @@ void KameraProtocol::get(const KURL &url
         m_fileSize = 0;
         gpr = gp_camera_file_get(m_camera, \
tocstr(fix_foldername(url.directory(false))), tocstr(url.filename()), fileType, \
m_file, m_context); +        if (    (gpr == GP_ERROR_NOT_SUPPORTED) &&
+                (fileType == GP_FILE_TYPE_PREVIEW)
+        ) {
+                // If we get here, the file info command information 
+                // will either not be used, or still valid.
+                fileType = GP_FILE_TYPE_NORMAL;
+                gpr = gp_camera_file_get(m_camera, \
tocstr(fix_foldername(url.directory(false))), tocstr(url.filename()), fileType, \
m_file, m_context); +        }
         switch(gpr) {
                 case GP_OK:


[prev in list] [next in list] [prev in thread] [next in thread]