diff options
| author | Timothy Pearson <[email protected]> | 2013-01-29 23:34:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-29 23:34:02 -0600 |
| commit | d517428f01676d437037ff9e905f47a1335b574d (patch) | |
| tree | cfc4bebba62ea441f57f29b8787c5e6804adb308 | |
| parent | 8b932368eec0346eb344f87b7aae7b7b6cde3dfb (diff) | |
| parent | 00fa7147e473af09c44f7fbb2482349c4f23200c (diff) | |
| download | digikam-d517428f01676d437037ff9e905f47a1335b574d.tar.gz digikam-d517428f01676d437037ff9e905f47a1335b574d.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/digikam
| -rw-r--r-- | digikam/configure.in.in | 2 | ||||
| -rw-r--r-- | digikam/utilities/cameragui/gpcamera.cpp | 15 |
2 files changed, 17 insertions, 0 deletions
diff --git a/digikam/configure.in.in b/digikam/configure.in.in index c2c54ef5..0687f03a 100644 --- a/digikam/configure.in.in +++ b/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`" diff --git a/digikam/utilities/cameragui/gpcamera.cpp b/digikam/utilities/cameragui/gpcamera.cpp index 28b7f3e2..7139e985 100644 --- a/digikam/utilities/cameragui/gpcamera.cpp +++ b/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 } } |