f-spot r3833 - in branches/FSPOT_0_4_2_STABLE: . src/Extensions

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Tue Apr 15 12:00:16 2008
New Revision: 3833
URL: http://svn.gnome.org/viewvc/f-spot?rev=3833&view=rev

Log:
2008-04-15  Stephane Delcroix  <sdelcroix novell com>

	backporting r3832 to the 042_STABLE branch


Modified:
   branches/FSPOT_0_4_2_STABLE/ChangeLog
   branches/FSPOT_0_4_2_STABLE/src/Extensions/CommandMenuItemNode.cs
   branches/FSPOT_0_4_2_STABLE/src/Extensions/ComplexMenuItemNode.cs
   branches/FSPOT_0_4_2_STABLE/src/Extensions/ExportMenuItemNode.cs
   branches/FSPOT_0_4_2_STABLE/src/Extensions/MenuNode.cs

Modified: branches/FSPOT_0_4_2_STABLE/src/Extensions/CommandMenuItemNode.cs
==============================================================================
--- branches/FSPOT_0_4_2_STABLE/src/Extensions/CommandMenuItemNode.cs	(original)
+++ branches/FSPOT_0_4_2_STABLE/src/Extensions/CommandMenuItemNode.cs	Tue Apr 15 12:00:16 2008
@@ -18,7 +18,7 @@
 	{
 
 		[NodeAttribute ("command_type", true)]
-		string command_type;
+		protected string command_type;
 
 		protected override void OnActivated (object o, EventArgs e)
 		{

Modified: branches/FSPOT_0_4_2_STABLE/src/Extensions/ComplexMenuItemNode.cs
==============================================================================
--- branches/FSPOT_0_4_2_STABLE/src/Extensions/ComplexMenuItemNode.cs	(original)
+++ branches/FSPOT_0_4_2_STABLE/src/Extensions/ComplexMenuItemNode.cs	Tue Apr 15 12:00:16 2008
@@ -18,10 +18,10 @@
 	public class ComplexMenuItemNode : MenuNode
 	{
 		[NodeAttribute]
-		string widget_type;
+		protected string widget_type;
 
 		[NodeAttribute]
-		string command_type;
+		protected string command_type;
 
 		public event EventHandler Changed;
 

Modified: branches/FSPOT_0_4_2_STABLE/src/Extensions/ExportMenuItemNode.cs
==============================================================================
--- branches/FSPOT_0_4_2_STABLE/src/Extensions/ExportMenuItemNode.cs	(original)
+++ branches/FSPOT_0_4_2_STABLE/src/Extensions/ExportMenuItemNode.cs	Tue Apr 15 12:00:16 2008
@@ -20,7 +20,7 @@
 	{
 
 		[NodeAttribute ("class", true)]
-		string class_name;
+		protected string class_name;
 
 		public static SelectedImages SelectedImages;
 

Modified: branches/FSPOT_0_4_2_STABLE/src/Extensions/MenuNode.cs
==============================================================================
--- branches/FSPOT_0_4_2_STABLE/src/Extensions/MenuNode.cs	(original)
+++ branches/FSPOT_0_4_2_STABLE/src/Extensions/MenuNode.cs	Tue Apr 15 12:00:16 2008
@@ -52,7 +52,7 @@
 	public class MenuGeneratorNode : MenuNode
 	{
 		[NodeAttribute ("generator_type", true)]
-		string command_type;
+		protected string command_type;
 
 		private IMenuGenerator menu_generator;
 
@@ -78,7 +78,6 @@
 
 		protected virtual void OnActivated (object o, EventArgs e)
 		{
-			Console.WriteLine ("Item {0} activated", Id);
 		}
 	}
 
@@ -94,10 +93,10 @@
 	public abstract class MenuNode : ExtensionNode
 	{
 		[NodeAttribute]
-		string _label;
+		protected string _label;
 
 		[NodeAttribute]
-		string icon;
+		protected string icon;
 
 		public virtual Gtk.MenuItem GetMenuItem ()
 		{