gphoto4ruby 0.2.1 → 0.2.2

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.2.2
+
+* fixed bug where event "file added" was not changing file path
+
 == 0.2.1
 
 * fixed bug where several cameras could not be initialized

data/ext/gphoto2camera.c

@@ -197,8 +197,8 @@ VALUE camera_capture(int argc, VALUE *argv, VALUE self) {
         return Qnil;
     }
 
-    gp_result_check(gp_camera_capture(c->camera, GP_CAPTURE_IMAGE, &(c->path), c->context));
-    strcpy(c->virtFolder, c->path.folder);
+    gp_result_check(gp_camera_capture(c->camera, GP_CAPTURE_IMAGE, c->path, c->context));
+    strcpy(c->virtFolder, c->path->folder);
 //        printf("captured: %s/%s\n", c->path.folder, c->path.name);
     return self;
 }
@@ -245,8 +245,8 @@ VALUE camera_save(int argc, VALUE *argv, VALUE self) {
     Data_Get_Struct(self, GPhoto2Camera, c);
     
     strcpy(fName, "");
-    strcpy(cFileName, c->path.name);
-    strcpy(cFolderName, c->path.folder);
+    strcpy(cFileName, c->path->name);
+    strcpy(cFolderName, c->path->folder);
 
     gp_result_check(gp_filesystem_reset(c->camera->fs));
 
@@ -372,8 +372,8 @@ VALUE camera_delete(int argc, VALUE *argv, VALUE self) {
     
     Data_Get_Struct(self, GPhoto2Camera, c);
     
-    strcpy(cFileName, c->path.name);
-    strcpy(cFolderName, c->path.folder);
+    strcpy(cFileName, c->path->name);
+    strcpy(cFolderName, c->path->folder);
 
     switch(argc) {
         case 0:
@@ -922,8 +922,9 @@ VALUE camera_wait(int argc, VALUE *argv, VALUE self) {
     switch (ce->type) {
         case GP_EVENT_FILE_ADDED:
         case GP_EVENT_FOLDER_ADDED:
-            ce->path = (CameraFilePath*)evtData;
-            strcpy(c->virtFolder, ce->path->folder);
+            c->path = (CameraFilePath*)evtData;
+            ce->path = c->path;
+            strcpy(c->virtFolder, c->path->folder);
             gp_result_check(gp_camera_wait_for_event(c->camera, 100, &fakeType, &fakeData, c->context));
             break;
         default:

data/ext/gphoto2camera_utilities.h

@@ -34,7 +34,7 @@ typedef struct {
     CameraWidget *config;
     CameraWidget *childConfig;
     CameraList *list;
-    CameraFilePath path;
+    CameraFilePath *path;
     CameraFile *file;
     GPContext *context;
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gphoto4ruby
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - heq4 company
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-22 00:00:00 +04:00
+date: 2008-09-29 00:00:00 +04:00
 default_executable: 
 dependencies: []