cheese r522 - in trunk: . src

[dgsiegel svn gnome org]

Author: dgsiegel
Date: Tue Feb 19 16:44:29 2008
New Revision: 522
URL: http://svn.gnome.org/viewvc/cheese?rev=522&view=rev

Log:
make use of the gconf countdown setting and show or hide the countdown depending on that


Modified:
   trunk/ChangeLog
   trunk/src/cheese-window.c

Modified: trunk/src/cheese-window.c
==============================================================================
--- trunk/src/cheese-window.c	(original)
+++ trunk/src/cheese-window.c	Tue Feb 19 16:44:29 2008
@@ -827,8 +827,16 @@
 
   if (cheese_window->webcam_mode == WEBCAM_MODE_PHOTO)
   {
-    cheese_countdown_start((CheeseCountdown *) cheese_window->countdown, cheese_window_countdown_picture_cb, cheese_window_countdown_hide_cb, (gpointer) cheese_window);
-    gtk_notebook_set_current_page (GTK_NOTEBOOK(cheese_window->notebook_bar), 1);
+    gboolean countdown;
+    g_object_get (cheese_window->gconf, "gconf_prop_countdown", &countdown, NULL);
+    if (countdown) {
+      cheese_countdown_start((CheeseCountdown *) cheese_window->countdown, cheese_window_countdown_picture_cb, cheese_window_countdown_hide_cb, (gpointer) cheese_window);
+      gtk_notebook_set_current_page (GTK_NOTEBOOK(cheese_window->notebook_bar), 1);
+    }
+    else
+    {
+      cheese_window_countdown_picture_cb (cheese_window);
+    }
 
     gtk_widget_set_sensitive (cheese_window->take_picture, FALSE);
     // FIXME: set menu inactive