[cheese/three-point-oh] add some try-catchs on critical instructions



commit 09517f59804e36492bed98ce1a86ce7cdae3c577
Author: daniel g. siegel <dgsiegel gnome org>
Date:   Thu Jul 1 21:20:59 2010 +0200

    add some try-catchs on critical instructions

 src/cheese-effects-manager.vala |    6 +++---
 src/cheese-window.vala          |   33 ++++++++++++++++++++++++++-------
 2 files changed, 29 insertions(+), 10 deletions(-)
---
diff --git a/src/cheese-effects-manager.vala b/src/cheese-effects-manager.vala
index baac0aa..36fb190 100644
--- a/src/cheese-effects-manager.vala
+++ b/src/cheese-effects-manager.vala
@@ -7,8 +7,8 @@ internal class Cheese.EffectsManager : GLib.Object
 {
   public static Cheese.Effect ? parse_effect_file (string filename)
   {
-    KeyFile kf = new KeyFile ();
-    Effect eff = new Effect ();
+    KeyFile kf  = new KeyFile ();
+    Effect  eff = new Effect ();
 
     try
     {
@@ -38,7 +38,7 @@ internal class Cheese.EffectsManager : GLib.Object
     ArrayList<Effect> effects = new ArrayList<Effect>();
     if (FileUtils.test (directory, FileTest.EXISTS | FileTest.IS_DIR))
     {
-      Dir dir;
+      Dir    dir;
       string cur_file;
       try
       {
diff --git a/src/cheese-window.vala b/src/cheese-window.vala
index 2b25990..479b5b2 100644
--- a/src/cheese-window.vala
+++ b/src/cheese-window.vala
@@ -81,7 +81,12 @@ public class Cheese.MainWindow : Gtk.Window
   {
     Gdk.Screen screen;
     screen = this.get_screen ();
-    Gtk.show_uri (screen, "ghelp:cheese", Gtk.get_current_event_time ());
+    try {
+      Gtk.show_uri (screen, "ghelp:cheese", Gtk.get_current_event_time ());
+    } catch (Error err)
+    {
+      warning ("Error: %s\n", err.message);
+    }
   }
 
   [CCode (instance_pos = -1)]
@@ -488,12 +493,19 @@ public class Cheese.MainWindow : Gtk.Window
     fileutil        = new FileUtil ();
     flash           = new Flash (this);
     conf            = new GConf ();
-    gtk_builder.add_from_file (GLib.Path.build_filename (Config.PACKAGE_DATADIR, "cheese-actions.ui"));
-    gtk_builder.add_from_file (GLib.Path.build_filename (Config.PACKAGE_DATADIR, "cheese-about.ui"));
-    gtk_builder.add_from_file (GLib.Path.build_filename (Config.PACKAGE_DATADIR, "cheese-main-window.ui"));
-    gtk_builder.connect_signals (this);
 
-    clutter_builder.load_from_file (GLib.Path.build_filename (Config.PACKAGE_DATADIR, "cheese-viewport.json"));
+    try {
+      gtk_builder.add_from_file (GLib.Path.build_filename (Config.PACKAGE_DATADIR, "cheese-actions.ui"));
+      gtk_builder.add_from_file (GLib.Path.build_filename (Config.PACKAGE_DATADIR, "cheese-about.ui"));
+      gtk_builder.add_from_file (GLib.Path.build_filename (Config.PACKAGE_DATADIR, "cheese-main-window.ui"));
+      gtk_builder.connect_signals (this);
+
+      clutter_builder.load_from_file (GLib.Path.build_filename (Config.PACKAGE_DATADIR, "cheese-viewport.json"));
+    } catch (Error err)
+    {
+      warning ("Error: %s\n", err.message);
+      return;
+    }
 
     main_vbox                         = (Gtk.VBox)gtk_builder.get_object ("mainbox_normal");
     thumbnails                        = (Gtk.Widget)gtk_builder.get_object ("thumbnails");
@@ -551,7 +563,14 @@ public class Cheese.MainWindow : Gtk.Window
 
     viewport.show_all ();
 
-    camera.setup (conf.gconf_prop_camera);
+    try {
+      camera.setup (conf.gconf_prop_camera);
+    }
+    catch (Error err)
+    {
+      warning ("Error: %s\n", err.message);
+      return;
+    }
     camera.play ();
 
 



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