[tomboy] Revert "Fix bgo #681542 Tomboy.exe will not continue running"
- From: Jared L Jennings <jjennings src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tomboy] Revert "Fix bgo #681542 Tomboy.exe will not continue running"
- Date: Tue, 9 Oct 2012 16:38:09 +0000 (UTC)
commit 058df0ca11dc29d1c945b2cf4b0c26bd97c4fa82
Author: Jared Jennings <jaredljennings gmail com>
Date: Tue Oct 9 11:36:23 2012 -0500
Revert "Fix bgo #681542 Tomboy.exe will not continue running"
This reverts commit 87df3294211282b2866685a116f88be6e572873d.
As AndrÃs G. Aragoneses has pointed out. This issue
has been fixed in Mono Addins, where it should be.
Tomboy/AddinManager.cs | 12 +-----------
1 files changed, 1 insertions(+), 11 deletions(-)
---
diff --git a/Tomboy/AddinManager.cs b/Tomboy/AddinManager.cs
index bee1972..9576dd1 100644
--- a/Tomboy/AddinManager.cs
+++ b/Tomboy/AddinManager.cs
@@ -90,17 +90,7 @@ namespace Tomboy
Mono.Addins.AddinManager.AddinLoaded += OnAddinLoaded;
Mono.Addins.AddinManager.AddinUnloaded += OnAddinUnloaded;
-
- /* Hopefully adding the try / catch block will fix an exception when the Addin Manager cannot read the Addin description.
- * bgo #681542
- * jjenings Aug 22, 2012
- */
- try {
- Mono.Addins.AddinManager.Initialize (Tomboy.Uninstalled ? "." : tomboy_conf_dir);
- } catch (System.InvalidOperationException e) {
- Logger.Error ("Failed to load add-ins into AddinManager", e);
- }
-
+ Mono.Addins.AddinManager.Initialize (Tomboy.Uninstalled ? "." : tomboy_conf_dir);
UpgradeOldAddinConfig ();
if (Tomboy.Debugging) {
Mono.Addins.AddinManager.Registry.Rebuild (null);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]