diff options
| author | Timothy Pearson <[email protected]> | 2013-01-29 23:35:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-29 23:35:32 -0600 |
| commit | efb9cf24757cc444480e2d7d30bd01293177d277 (patch) | |
| tree | 92fd02b819cf9c5f0c64a15aab1e434b234ba1a0 /kamera/kcontrol/kameradevice.cpp | |
| parent | 14ad34cde3cb2917e91092546631952d0258a222 (diff) | |
| parent | d4d1a5808bad1023c8291a52c2143b36f6b41d85 (diff) | |
| download | tdegraphics-efb9cf24757cc444480e2d7d30bd01293177d277.tar.gz tdegraphics-efb9cf24757cc444480e2d7d30bd01293177d277.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdegraphics
Diffstat (limited to 'kamera/kcontrol/kameradevice.cpp')
| -rw-r--r-- | kamera/kcontrol/kameradevice.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp index e6f26449..572e819a 100644 --- a/kamera/kcontrol/kameradevice.cpp +++ b/kamera/kcontrol/kameradevice.cpp @@ -37,6 +37,8 @@ #include <kmessagebox.h> #include <kdebug.h> +#include "config.h" + extern "C" { #include <gphoto2.h> } @@ -118,9 +120,9 @@ bool KCamera::initCamera() gp_port_info_list_new(&il); gp_port_info_list_load(il); gp_port_info_list_get_info(il, gp_port_info_list_lookup_path(il, m_path.local8Bit().data()), &info); - gp_port_info_list_free(il); gp_camera_set_abilities(m_camera, m_abilities); gp_camera_set_port_info(m_camera, info); + gp_port_info_list_free(il); // this might take some time (esp. for non-existant camera) - better be done asynchronously result = gp_camera_init(m_camera, glob_context); @@ -346,8 +348,15 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de } for (int i = 0; i < gphoto_ports; i++) { if (gp_port_info_list_get_info(list, i, &info) >= 0) { +#ifdef HAVE_GPHOTO2_5 + char *xpath; + gp_port_info_get_path (info, &xpath); + if (strncmp(xpath, "serial:", 7) == 0) + m_serialPortCombo->insertItem(TQString::fromLatin1(xpath).mid(7)); +#else if (strncmp(info.path, "serial:", 7) == 0) m_serialPortCombo->insertItem(TQString::fromLatin1(info.path).mid(7)); +#endif } } gp_port_info_list_free(list); |