Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/digikam

digikam/configure.in.in

@@ -129,6 +129,8 @@ AC_SUBST(LCMS_LIBS)
 AC_PATH_PROG(GPHOTO_CONFIG,gphoto2-config)
 AC_PATH_PROG(GPHOTO_PORT_CONFIG,gphoto2-port-config)
 if test -n "${GPHOTO_CONFIG}"; then
+  GPHOTO_VERSION="`$GPHOTO_CONFIG --version`"
+  case "${GPHOTO_VERSION}" in "libgphoto2 2.5"*) CXXFLAGS="$CXXFLAGS -DHAVE_GPHOTO25";; esac
   GPHOTO_CFLAGS="`$GPHOTO_CONFIG --cflags`"
   AC_SUBST(GPHOTO_CFLAGS)
   LIB_GPHOTO="`$GPHOTO_CONFIG --libs` `$GPHOTO_PORT_CONFIG --libs`"

digikam/utilities/cameragui/gpcamera.cpp

@@ -845,10 +845,19 @@ bool GPCamera::uploadItem(const TQString& folder, const TQString& itemName, cons
     
     m_status = new GPStatus;
 
+#ifdef HAVE_GPHOTO25
     errorCode = gp_camera_folder_put_file(d->camera,
                                           TQFile::encodeName(folder),
+                                          TQFile::encodeName(itemName),
+                                          GP_FILE_TYPE_NORMAL,
                                           cfile,
                                           m_status->context);
+#else
+    errorCode = gp_camera_folder_put_file(d->camera,
+                                          TQFile::encodeName(folder),
+                                          cfile,
+                                          m_status->context);
+#endif
     if (errorCode != GP_OK) 
     {
         DDebug() << "Failed to upload item to camera!" << endl;
@@ -1108,7 +1117,13 @@ void GPCamera::getSupportedPorts(TQStringList& plist)
         for (int i = 0 ; i < numPorts ; i++) 
         {
             gp_port_info_list_get_info( list, i, &info );
+#ifdef HAVE_GPHOTO25
+            char *xpath;
+            gp_port_info_get_name( info, &xpath );
+            plist.append( xpath );
+#else
             plist.append( info.path );
+#endif
         }
     }