tomboy r1875 - in trunk: . Tomboy Tomboy/Addins/GalagoPresence

[sharm svn gnome org]

Author: sharm
Date: Fri Feb 22 18:31:52 2008
New Revision: 1875
URL: http://svn.gnome.org/viewvc/tomboy?rev=1875&view=rev

Log:
* Tomboy/AddinManager.cs: Catch exceptions generated during
  OnDisabledAddin, and print message to log.
* Tomboy.mdp: Added GalagoPresence stuff to solution.
* Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs: Log an error
  when Galago intialization fails so that the exception doesn't
  disappear in the Mono.Addins black hole.

Modified:
   trunk/ChangeLog
   trunk/Tomboy.mdp
   trunk/Tomboy/AddinManager.cs
   trunk/Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs

Modified: trunk/Tomboy.mdp
==============================================================================
--- trunk/Tomboy.mdp	(original)
+++ trunk/Tomboy.mdp	Fri Feb 22 18:31:52 2008
@@ -228,6 +228,7 @@
     <File name="Tomboy/Addins/Sketching/SketchingNoteAddin.cs" subtype="Code" buildaction="Compile" />
     <File name="Tomboy/Addins/Sketching/SketchingTextTag.cs" subtype="Code" buildaction="Compile" />
     <File name="Tomboy/Addins/Sketching/Stroke.cs" subtype="Code" buildaction="Compile" />
+    <File name="Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />

Modified: trunk/Tomboy/AddinManager.cs
==============================================================================
--- trunk/Tomboy/AddinManager.cs	(original)
+++ trunk/Tomboy/AddinManager.cs	Fri Feb 22 18:31:52 2008
@@ -184,7 +184,11 @@
 			Mono.Addins.TypeExtensionNode type_node =
 			        args.ExtensionNode as Mono.Addins.TypeExtensionNode;
 
-			OnDisabledAddin (type_node.Id);
+			try {
+				OnDisabledAddin (type_node.Id);
+			} catch (Exception e) {
+				Logger.Debug ("Error unloading add-in: " + e.Message);
+			}
 		}
 
 		public void LoadAddinsForNote (Note note)

Modified: trunk/Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs
==============================================================================
--- trunk/Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs	(original)
+++ trunk/Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs	Fri Feb 22 18:31:52 2008
@@ -10,7 +10,6 @@
 
 using Tomboy;
 
-// TODO: Indent everything in this namespace in a seperate commit
 namespace Tomboy.GalagoPresence
 {
 
@@ -20,8 +19,12 @@
 
 		public GalagoManager ()
 		{
-			Galago.Global.Init ("tomboy", Galago.InitFlags.Client);
-
+			try {
+				Galago.Global.Init ("tomboy", Galago.InitFlags.Client);
+			} catch (Exception e) {
+				Logger.Error ("Error initializing Galago: " + e.ToString ());
+				throw e;
+			}
 			/////
 			///// Connecting these cause crashes with the current 0.3.2 bindings...
 			/////