rpms/bless/devel bless-0.5.2-mono-1.9-buildfix.patch,1.3,1.4

[Adel Gadllah (drago01)]

Author: drago01

Update of /cvs/pkgs/rpms/bless/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6785

Modified Files:
	bless-0.5.2-mono-1.9-buildfix.patch 
Log Message:
more mono 1.9 fixes

bless-0.5.2-mono-1.9-buildfix.patch:

Index: bless-0.5.2-mono-1.9-buildfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bless/devel/bless-0.5.2-mono-1.9-buildfix.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bless-0.5.2-mono-1.9-buildfix.patch	5 Apr 2008 09:55:03 -0000	1.3
+++ bless-0.5.2-mono-1.9-buildfix.patch	5 Apr 2008 10:06:17 -0000	1.4
@@ -12,7 +12,7 @@
  
 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 @@
  			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 @@
  
  	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("<menubar><menu action=\"File\"><placeholder name=\"HistoryItems\">");