Merge lp:~artem-anufrij/snap-elementary/Bugfix-1322963 into lp:snap-elementary

[Artem Anufrij]

[Cody Garver (codygarver)]

Can you not combine the null check code?: http://paste.debian.net/121890/

review: Needs Information

[lp:~artem-anufrij/snap-elementary/Bugfix-1322963]

260. By artem-anufrij on 2014-09-19

I combined The null check code.

[Artem Anufrij (artem-anufrij)]

Check my changes, please.

review: Needs Resubmitting

[Artem Anufrij (artem-anufrij)]

review: Approve

=== modified file 'src/SnapWindow.vala'
--- src/SnapWindow.vala	2014-05-27 11:23:34 +0000
+++ src/SnapWindow.vala	2014-09-19 17:51:03 +0000
@@ -31,6 +31,8 @@
         private Granite.Widgets.ModeButton mode_button;
         private Gtk.Button take_button;
         private Gtk.Statusbar statusbar;
+        private File photo_path;
+        private File video_path;
 
         public SnapWindow (Snap.SnapApp snap_app) {
 
@@ -44,8 +46,8 @@
             this.resizable = false;
 
             // Init thumbnail providers
-            var photo_path = File.new_for_path (Resources.get_media_dir (Widgets.Camera.ActionType.PHOTO));
-            var video_path = File.new_for_path (Resources.get_media_dir (Widgets.Camera.ActionType.VIDEO));
+            photo_path = File.new_for_path (Resources.get_media_dir (Widgets.Camera.ActionType.PHOTO));
+            video_path = File.new_for_path (Resources.get_media_dir (Widgets.Camera.ActionType.VIDEO));
             Resources.photo_thumb_provider = new Services.ThumbnailProvider (photo_path);
             Resources.video_thumb_provider = new Services.ThumbnailProvider (video_path);
 
@@ -68,6 +70,7 @@
             gallery_button_box.set_layout (Gtk.ButtonBoxStyle.START);
 
             var gallery_button = new Gtk.ToggleButton.with_label (_("Gallery"));
+            gallery_button.sensitive = gallery_files_exists();
             gallery_button.toggled.connect (() => {
                 if (this.stack.get_visible_child () == this.camera) {
                     this.show_gallery ();
@@ -133,7 +136,7 @@
             });
             this.camera.capture_stop.connect (() => {
                 // Enable extra buttons
-                gallery_button.sensitive = true;
+                gallery_button.sensitive = gallery_files_exists();
                 this.mode_button.sensitive = true;
                 this.set_take_button_icon (this.camera.get_action_type ());
             });
@@ -156,7 +159,7 @@
 
             this.add (this.stack);
             this.show_all ();
-
+            
         }
         
         protected override bool delete_event (Gdk.EventAny event) {
@@ -228,5 +231,25 @@
             this.unlock_camera_actions ();
             this.stack.set_visible_child (this.camera);
         }
+
+        private bool gallery_files_exists() {
+            FileInfo file_info;
+            
+            try {
+                FileEnumerator enumerator_photo = photo_path.enumerate_children (FileAttribute.STANDARD_NAME, 0);
+                FileEnumerator enumerator_video = video_path.enumerate_children (FileAttribute.STANDARD_NAME, 0);
+                
+                if ((file_info = enumerator_photo.next_file ()) != null ||
+                    (file_info = enumerator_video.next_file ()) != null) {
+                    debug ("gallery is not empty\n");
+                    return true;
+                }
+            } catch (Error perr) {
+                    warning ("Error: check_gallery_files photo failed: %s", perr.message);
+            }
+                        
+            debug ("gallery is empty\n");
+            return false;
+        }
     }
 }
 \ No newline at end of file