File kipi-plugins-gphoto2.patch of Package kde3-kipi-plugins

Overview Repositories Revisions Requests Users Attributes Meta

File kipi-plugins-gphoto2.patch of Package kde3-kipi-plugins

diff -wruN kipi-plugins-0.1.6.orig/kipi-plugins/kameraklient/gpcamera.cpp kipi-plugins-0.1.6/kipi-plugins/kameraklient/gpcamera.cpp
--- kipi-plugins-0.1.6.orig/kipi-plugins/kameraklient/gpcamera.cpp	2008-10-11 16:46:33.000000000 +0400
+++ kipi-plugins-0.1.6/kipi-plugins/kameraklient/gpcamera.cpp	2013-02-06 15:15:57.842416046 +0400
@@ -436,7 +436,7 @@
         status = 0;
     }
     status = new GPStatus;
-    if (gp_camera_folder_put_file(d->camera, folder.latin1(), cfile, status->context) != GP_OK) {
+    if (gp_camera_folder_put_file(d->camera, folder.latin1(), QFile::encodeName(itemName), GP_FILE_TYPE_NORMAL, cfile, status->context) != GP_OK) {
         gp_file_unref(cfile);
         delete status;
         status = 0;
@@ -521,6 +521,7 @@
 void GPCamera::getSupportedPorts(QStringList& plist) {
     GPPortInfoList *list;
     GPPortInfo info;
+    char *xpath;
 
     plist.clear();
 
@@ -530,7 +531,8 @@
     int numPorts = gp_port_info_list_count( list );
     for (int i = 0; i < numPorts; i++) {
         gp_port_info_list_get_info( list, i, &info );
-        plist.append(info.path);
+        gp_port_info_get_name( info, &xpath );
+        plist.append( xpath );
     }
     gp_port_info_list_free( list );
 }
diff -wruN kipi-plugins-0.1.6.orig/kipi-plugins/kameraklient/gpiface.cpp kipi-plugins-0.1.6/kipi-plugins/kameraklient/gpiface.cpp
--- kipi-plugins-0.1.6.orig/kipi-plugins/kameraklient/gpiface.cpp	2008-10-11 16:46:33.000000000 +0400
+++ kipi-plugins-0.1.6/kipi-plugins/kameraklient/gpiface.cpp	2013-02-06 14:51:08.264520150 +0400
@@ -108,13 +108,15 @@
 void GPIface::getSupportedPorts(QStringList& plist) {
     GPPortInfoList *list;
     GPPortInfo info;
+    char *xpath;
     plist.clear();
     gp_port_info_list_new( &list );
     gp_port_info_list_load( list );
     int numPorts = gp_port_info_list_count( list );
     for (int i = 0; i < numPorts; i++) {
         gp_port_info_list_get_info( list, i, &info );
-        plist.append( info.path );
+        gp_port_info_get_name( info, &xpath );
+        plist.append( xpath );
     }
     gp_port_info_list_free( list );
 }

Places

File kipi-plugins-gphoto2.patch of Package kde3-kipi-plugins

Places