diff --git a/bless-0.5.2-mono-1.9-buildfix.patch b/bless-0.5.2-mono-1.9-buildfix.patch index 603c0ff..f4be9cc 100644 --- a/bless-0.5.2-mono-1.9-buildfix.patch +++ b/bless-0.5.2-mono-1.9-buildfix.patch @@ -12,7 +12,7 @@ diff -upNr bless-0.5.2.orign/src/gui/plugins/BitwiseOperationsPlugin.cs bless-0. diff -upNr bless-0.5.2.orign/src/gui/plugins/EditOperationsPlugin.cs bless-0.5.2/src/gui/plugins/EditOperationsPlugin.cs --- bless-0.5.2.orign/src/gui/plugins/EditOperationsPlugin.cs 2007-08-25 09:54:21.000000000 +0200 -+++ bless-0.5.2/src/gui/plugins/EditOperationsPlugin.cs 2008-04-05 11:51:52.000000000 +0200 ++++ bless-0.5.2/src/gui/plugins/EditOperationsPlugin.cs 2008-04-05 11:59:37.000000000 +0200 @@ -151,12 +151,12 @@ public class EditOperationsPlugin : GuiP void ConnectEditAccelerators(bool v) { @@ -28,9 +28,18 @@ diff -upNr bless-0.5.2.orign/src/gui/plugins/EditOperationsPlugin.cs bless-0.5.2 a.DisconnectAccelerator(); editAccelCount = 0; } +@@ -215,7 +215,7 @@ public class EditOperationsPlugin : GuiP + DeleteAction = (Action)uim.GetAction("/menubar/Edit/Delete"); + + +- foreach (Action a in editActionGroup.ListActions()) { ++ foreach (Gtk.Action a in editActionGroup.ListActions()) { + // for some reason the accelerators are connected twice + // ... so disconnect them twice + for (int i = 0; i < 2; i++) diff -upNr bless-0.5.2.orign/src/gui/plugins/FindReplacePlugin.cs bless-0.5.2/src/gui/plugins/FindReplacePlugin.cs --- bless-0.5.2.orign/src/gui/plugins/FindReplacePlugin.cs 2007-08-25 09:54:21.000000000 +0200 -+++ bless-0.5.2/src/gui/plugins/FindReplacePlugin.cs 2008-04-05 11:35:21.000000000 +0200 ++++ bless-0.5.2/src/gui/plugins/FindReplacePlugin.cs 2008-04-05 12:02:41.000000000 +0200 @@ -38,10 +38,10 @@ public class FindReplacePlugin : GuiPlug DataBook dataBook; FindReplaceWidget widget; @@ -46,3 +55,32 @@ diff -upNr bless-0.5.2.orign/src/gui/plugins/FindReplacePlugin.cs bless-0.5.2/sr IFinder finder; Window mainWindow; +@@ -162,10 +162,10 @@ public class FindReplacePlugin : GuiPlug + uim.InsertActionGroup(group, 0); + uim.AddUiFromString(uiXml); + +- FindAction = (Action)uim.GetAction("/menubar/Search/Find"); +- FindNextAction = (Action)uim.GetAction("/menubar/Search/FindNext"); +- FindPreviousAction = (Action)uim.GetAction("/menubar/Search/FindPrevious"); +- ReplaceAction = (Action)uim.GetAction("/menubar/Search/Replace"); ++ FindAction = (Gtk.Action)uim.GetAction("/menubar/Search/Find"); ++ FindNextAction = (Gtk.Action)uim.GetAction("/menubar/Search/FindNext"); ++ FindPreviousAction = (Gtk.Action)uim.GetAction("/menubar/Search/FindPrevious"); ++ ReplaceAction = (Gtk.Action)uim.GetAction("/menubar/Search/Replace"); + + uim.EnsureUpdate(); + +diff -upNr bless-0.5.2.orign/src/gui/plugins/HistoryPlugin.cs bless-0.5.2/src/gui/plugins/HistoryPlugin.cs +--- bless-0.5.2.orign/src/gui/plugins/HistoryPlugin.cs 2007-08-25 09:54:21.000000000 +0200 ++++ bless-0.5.2/src/gui/plugins/HistoryPlugin.cs 2008-04-05 12:03:07.000000000 +0200 +@@ -61,8 +61,8 @@ public class HistoryPlugin : GuiPlugin + // clear previous list + uiManager.RemoveUi(mergeId); + uiManager.RemoveActionGroup(historyActionGroup); +- foreach(Action action in historyActionGroup.ListActions()) { +- historyActionGroup.Remove(action); ++ foreach(Gtk.Action action in historyActionGroup.ListActions()) { ++ historyActionGroup.Remove(Gtk.Action); + } + + StringBuilder sb = new StringBuilder("");