[cheese/three-point-oh] Fixed a bunch of warnings



commit 0108bba1ede24a1bd7064fb5b0a3a61ffecb345a
Author: Yuvaraj Pandian T <yuvipanda gmail com>
Date:   Sat Jul 10 15:24:55 2010 +0530

    Fixed a bunch of warnings

 data/cheese-viewport.json |    1 -
 src/cheese-window.vala    |    6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/data/cheese-viewport.json b/data/cheese-viewport.json
index 58c72cf..6eae284 100644
--- a/data/cheese-viewport.json
+++ b/data/cheese-viewport.json
@@ -28,7 +28,6 @@
     "type": "ClutterBox",
     "children":
     [
-	'background', 
 	'video_preview',
 	'countdown_layer'
     ] 
diff --git a/src/cheese-window.vala b/src/cheese-window.vala
index e8e21b3..885f46d 100644
--- a/src/cheese-window.vala
+++ b/src/cheese-window.vala
@@ -463,7 +463,10 @@ public class Cheese.MainWindow : Gtk.Window
   private void activate_effects_page (int number)
   {
     current_effects_page = number;
-    viewport_layout.remove ((Clutter.Actor)current_effects_grid);
+    if (viewport_layout.get_children ().index (current_effects_grid) != -1)
+    {
+      viewport_layout.remove ((Clutter.Actor)current_effects_grid);
+    }
     current_effects_grid = effects_grids[number];
     viewport_layout.add ((Clutter.Actor)current_effects_grid);
     for (int i = 0; i < effects_manager.effects.size; i++)
@@ -480,7 +483,6 @@ public class Cheese.MainWindow : Gtk.Window
     }
     this.current_effects_grid.set_size (viewport.width, viewport.height);
 
-
     effects_page_prev_action.sensitive = (current_effects_page != 0);
     effects_page_next_action.sensitive = (current_effects_page != effects_manager.effects.size / EFFECTS_PER_PAGE);
   }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]