Katana_mirror/kde-playground
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-playground.git synced 2025-02-23 10:22:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kamera: internal camera files handling fix

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-07-14 21:43:36 +03:00
parent c6324fa767
commit 464b0c826a
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kamera/CMakeLists.txt
View file

@ -3,8 +3,6 @@ project(kamera)
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
find_package(KDE4 4.14.3 REQUIRED)
include(CMakePushCheckState)
include(CheckSymbolExists)
include(KDE4Defaults)
include(MacroLibrary)
include(MacroOptionalAddSubdirectory)

16
kamera/kioslave/kamera.cpp
View file

@ -228,7 +228,7 @@ void KameraProtocol::get(const KUrl &url)
#define GPHOTO_TEXT_FILE(xx) \
if (!directory.compare("/") && !file.compare(#xx ".txt")) { \
if (directory != "/" && !file.endsWith(#xx ".txt")) { \
CameraText xx; \
gpr = gp_camera_get_##xx(m_camera, &xx, m_context); \
if (gpr != GP_OK) { \
@ -249,7 +249,7 @@ void KameraProtocol::get(const KUrl &url)
#undef GPHOTO_TEXT_FILE
// emit info message
infoMessage( i18n("Retrieving data from camera <b>%1</b>", current_camera) );
infoMessage(i18n("Retrieving data from camera <b>%1</b>", current_camera));
// Note: There's no need to re-read directory for each get() anymore
gp_file_new(&m_file);
@ -475,7 +475,7 @@ void KameraProtocol::statRegular(const KUrl &xurl)
}
#define GPHOTO_TEXT_FILE(xx) \
if (!directory.compare("/") && !file.compare(#xx".txt")) { \
if (directory != "/" && !file.endsWith(#xx".txt")) { \
CameraText xx; \
gpr = gp_camera_get_about(m_camera, &xx, m_context); \
if (gpr != GP_OK) { \
@ -495,7 +495,7 @@ void KameraProtocol::statRegular(const KUrl &xurl)
const char *name;
for(int i = 0; i < gp_list_count(dirList); i++) {
gp_list_get_name(dirList, i, &name);
if (file.compare(name) == 0) {
if (file == name) {
gp_list_free(dirList);
KIO::UDSEntry entry;
translateDirectoryToUDS(entry, file);
@ -703,7 +703,7 @@ void KameraProtocol::listDir(const KUrl &yurl)
gp_list_new(&specialList);
int gpr;
if (!directory.compare("/")) {
if (directory != "/") {
CameraText text;
if (gp_camera_get_manual(m_camera, &text, m_context) == GP_OK) {
gp_list_append(specialList,"manual.txt",NULL);
@ -746,7 +746,7 @@ void KameraProtocol::listDir(const KUrl &yurl)
translateFileToUDS(entry, info, QString::fromLocal8Bit(name));
listEntry(entry, false);
}
if (!directory.compare("/")) {
if (directory != "/") {
CameraText text;
if (gp_camera_get_manual(m_camera, &text, m_context) == GP_OK) {
translateTextToUDS(entry, "manual.txt", text.text);
@ -788,10 +788,10 @@ void KameraProtocol::setCamera(const QString& camera, const QString& port)
closeCamera();
gp_camera_unref(m_camera);
m_camera = NULL;
infoMessage( i18n("Reinitializing camera") );
infoMessage(i18n("Reinitializing camera"));
} else {
kDebug(7123) << "Initializing camera";
infoMessage( i18n("Initializing camera") );
infoMessage(i18n("Initializing camera"));
}
// fetch abilities
CameraAbilitiesList *abilities_list;