diff -Naur blessbroken/src/gui/plugins/BitwiseOperationsPlugin.cs bless-0.5.2/src/gui/plugins/BitwiseOperationsPlugin.cs --- blessbroken/src/gui/plugins/BitwiseOperationsPlugin.cs 2007-08-25 09:54:21.000000000 +0200 +++ bless-0.5.2/src/gui/plugins/BitwiseOperationsPlugin.cs 2008-07-08 01:33:38.352260344 +0200 @@ -102,7 +102,7 @@ uim.InsertActionGroup(group, 0); uim.AddUiFromString(uiXml); - performAction = (Action)uim.GetAction("/DefaultAreaPopup/ExtraAreaPopupItems/PerformBitwiseOperation"); + performAction = (Gtk.Action)uim.GetAction("/DefaultAreaPopup/ExtraAreaPopupItems/PerformBitwiseOperation"); uim.EnsureUpdate(); diff -Naur blessbroken/src/gui/plugins/EditOperationsPlugin.cs bless-0.5.2/src/gui/plugins/EditOperationsPlugin.cs --- blessbroken/src/gui/plugins/EditOperationsPlugin.cs 2007-08-25 09:54:21.000000000 +0200 +++ bless-0.5.2/src/gui/plugins/EditOperationsPlugin.cs 2008-07-08 01:35:00.027629029 +0200 @@ -151,12 +151,12 @@ void ConnectEditAccelerators(bool v) { if (editAccelCount == 0 && v == true) { - foreach(Action a in editActionGroup.ListActions()) + foreach(Gtk.Action a in editActionGroup.ListActions()) a.ConnectAccelerator(); editAccelCount = 1; } else if (editAccelCount == 1 && v == false) { - foreach(Action a in editActionGroup.ListActions()) + foreach(Gtk.Action a in editActionGroup.ListActions()) a.DisconnectAccelerator(); editAccelCount = 0; } @@ -207,15 +207,15 @@ uim.InsertActionGroup(miscActionGroup, 0); uim.AddUiFromString(uiXml); - UndoAction = (Action)uim.GetAction("/menubar/Edit/Undo"); - RedoAction = (Action)uim.GetAction("/menubar/Edit/Redo"); - CutAction = (Action)uim.GetAction("/menubar/Edit/Cut"); - CopyAction = (Action)uim.GetAction("/menubar/Edit/Copy"); - PasteAction = (Action)uim.GetAction("/menubar/Edit/Paste"); - DeleteAction = (Action)uim.GetAction("/menubar/Edit/Delete"); + UndoAction = (Gtk.Action)uim.GetAction("/menubar/Edit/Undo"); + RedoAction = (Gtk.Action)uim.GetAction("/menubar/Edit/Redo"); + CutAction = (Gtk.Action)uim.GetAction("/menubar/Edit/Cut"); + CopyAction = (Gtk.Action)uim.GetAction("/menubar/Edit/Copy"); + PasteAction = (Gtk.Action)uim.GetAction("/menubar/Edit/Paste"); + DeleteAction = (Gtk.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 -Naur blessbroken/src/gui/plugins/FileOperationsPlugin.cs bless-0.5.2/src/gui/plugins/FileOperationsPlugin.cs --- blessbroken/src/gui/plugins/FileOperationsPlugin.cs 2007-08-25 09:54:21.000000000 +0200 +++ bless-0.5.2/src/gui/plugins/FileOperationsPlugin.cs 2008-07-08 01:35:48.083280812 +0200 @@ -159,11 +159,11 @@ uim.InsertActionGroup(group, 0); uim.AddUiFromString(uiXml); - SaveAction = (Action)uim.GetAction("/menubar/File/Save"); - SaveAsAction = (Action)uim.GetAction("/menubar/File/SaveAs"); - CloseAction = (Action)uim.GetAction("/menubar/File/Close"); - QuitAction = (Action)uim.GetAction("/menubar/File/Quit"); - RevertAction = (Action)uim.GetAction("/menubar/File/Revert"); + SaveAction = (Gtk.Action)uim.GetAction("/menubar/File/Save"); + SaveAsAction = (Gtk.Action)uim.GetAction("/menubar/File/SaveAs"); + CloseAction = (Gtk.Action)uim.GetAction("/menubar/File/Close"); + QuitAction = (Gtk.Action)uim.GetAction("/menubar/File/Quit"); + RevertAction = (Gtk.Action)uim.GetAction("/menubar/File/Revert"); uim.EnsureUpdate(); diff -Naur blessbroken/src/gui/plugins/FindReplacePlugin.cs bless-0.5.2/src/gui/plugins/FindReplacePlugin.cs --- blessbroken/src/gui/plugins/FindReplacePlugin.cs 2007-08-25 09:54:21.000000000 +0200 +++ bless-0.5.2/src/gui/plugins/FindReplacePlugin.cs 2008-07-08 01:36:15.427064932 +0200 @@ -38,10 +38,10 @@ DataBook dataBook; FindReplaceWidget widget; - Action FindAction; - Action FindNextAction; - Action FindPreviousAction; - Action ReplaceAction; + Gtk.Action FindAction; + Gtk.Action FindNextAction; + Gtk.Action FindPreviousAction; + Gtk.Action ReplaceAction; IFinder finder; Window mainWindow; @@ -162,10 +162,10 @@ 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 -Naur blessbroken/src/gui/plugins/HistoryPlugin.cs bless-0.5.2/src/gui/plugins/HistoryPlugin.cs --- blessbroken/src/gui/plugins/HistoryPlugin.cs 2007-08-25 09:54:21.000000000 +0200 +++ bless-0.5.2/src/gui/plugins/HistoryPlugin.cs 2008-07-08 01:36:49.074794118 +0200 @@ -61,7 +61,7 @@ // clear previous list uiManager.RemoveUi(mergeId); uiManager.RemoveActionGroup(historyActionGroup); - foreach(Action action in historyActionGroup.ListActions()) { + foreach(Gtk.Action action in historyActionGroup.ListActions()) { historyActionGroup.Remove(action); }