[cheese] Start monitoring storage folders if they exist when cheese starts, and a fix for bug 637798 commit.
- From: Laura Lucas Alday <lauralucas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cheese] Start monitoring storage folders if they exist when cheese starts, and a fix for bug 637798 commit.
- Date: Thu, 23 Dec 2010 05:08:28 +0000 (UTC)
commit c73fab33969639fe264358f0b3f398da789449e6
Author: Laura Lucas Alday <lauralucasalday gmail com>
Date: Thu Dec 23 02:04:35 2010 -0300
Start monitoring storage folders if they exist when cheese starts, and a fix for bug 637798 commit.
src/cheese-window.vala | 8 ++++++--
src/thumbview/cheese-thumb-view.c | 2 ++
2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/src/cheese-window.vala b/src/cheese-window.vala
index c8778f9..0991c0f 100644
--- a/src/cheese-window.vala
+++ b/src/cheese-window.vala
@@ -628,9 +628,11 @@ public class Cheese.MainWindow : Gtk.Window
this.camera.take_photo (file_name);
}
- enable_mode_change ();
if (current_mode == MediaMode.PHOTO)
+ {
take_photo_action.sensitive = true;
+ enable_mode_change ();
+ }
}
Countdown current_countdown;
@@ -638,9 +640,11 @@ public class Cheese.MainWindow : Gtk.Window
{
if (settings.get_boolean ("countdown"))
{
- disable_mode_change ();
if (current_mode == MediaMode.PHOTO)
+ {
take_photo_action.sensitive = false;
+ disable_mode_change ();
+ }
current_countdown = new Countdown (this.countdown_layer);
current_countdown.start (finish_countdown_callback);
diff --git a/src/thumbview/cheese-thumb-view.c b/src/thumbview/cheese-thumb-view.c
index 34bd18a..3f2ba24 100644
--- a/src/thumbview/cheese-thumb-view.c
+++ b/src/thumbview/cheese-thumb-view.c
@@ -521,6 +521,7 @@ cheese_thumb_view_fill (CheeseThumbView *thumb_view)
g_object_unref (file);
}
g_dir_close (dir_videos);
+ cheese_thumb_view_start_monitoring_video_path (thumb_view, path_videos);
}
if (dir_photos)
@@ -538,6 +539,7 @@ cheese_thumb_view_fill (CheeseThumbView *thumb_view)
g_object_unref (file);
}
g_dir_close (dir_photos);
+ cheese_thumb_view_start_monitoring_photo_path (thumb_view, path_photos);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]