tomboy r2298 - in trunk/Tomboy: . Notebooks

[sharm svn gnome org]

Author: sharm
Date: Sat Jan 31 09:31:33 2009
New Revision: 2298
URL: http://svn.gnome.org/viewvc/tomboy?rev=2298&view=rev

Log:
* tomboy/Tomboy/Tray.cs:
* tomboy/Tomboy/Note.cs:
* tomboy/Tomboy/Utils.cs:
* tomboy/Tomboy/NoteTag.cs:
* tomboy/Tomboy/NoteBuffer.cs:
* tomboy/Tomboy/TagManager.cs:
* tomboy/Tomboy/Preferences.cs:
* tomboy/Tomboy/Notebooks/NotebookNoteAddin.cs: Fix a bunch of
  compiler warnings. Part of bug #569890, courtesy of Benjamin
  Podszun.

* tomboy/Tomboy/WrapBox.cs:
* tomboy/Tomboy/TagEntry.cs:
* tomboy/Tomboy/Makefile.am: Remove unused files.

Removed:
   trunk/Tomboy/TagEntry.cs
   trunk/Tomboy/WrapBox.cs
Modified:
   trunk/Tomboy/Makefile.am
   trunk/Tomboy/Note.cs
   trunk/Tomboy/NoteBuffer.cs
   trunk/Tomboy/NoteTag.cs
   trunk/Tomboy/Notebooks/NotebookNoteAddin.cs
   trunk/Tomboy/Preferences.cs
   trunk/Tomboy/TagManager.cs
   trunk/Tomboy/Tray.cs
   trunk/Tomboy/Utils.cs

Modified: trunk/Tomboy/Makefile.am
==============================================================================
--- trunk/Tomboy/Makefile.am	(original)
+++ trunk/Tomboy/Makefile.am	Sat Jan 31 09:31:33 2009
@@ -101,13 +101,11 @@
 	$(srcdir)/Tag.cs			\
 	$(srcdir)/TagButton.cs			\
 	$(srcdir)/TagManager.cs			\
-	$(srcdir)/TagEntry.cs	\
 	$(srcdir)/Tray.cs 			\
 	$(srcdir)/Trie.cs			\
 	$(srcdir)/Undo.cs 			\
 	$(srcdir)/Utils.cs			\
 	$(srcdir)/Watchers.cs			\
-	$(srcdir)/WrapBox.cs			\
 	$(srcdir)/Notebooks/*.cs		\
 	$(srcdir)/Synchronization/*.cs		\
 	\

Modified: trunk/Tomboy/Note.cs
==============================================================================
--- trunk/Tomboy/Note.cs	(original)
+++ trunk/Tomboy/Note.cs	Sat Jan 31 09:31:33 2009
@@ -1407,7 +1407,6 @@
 						switch (xml.Name) {
 						case "title":
 							return xml.ReadString ();
-							break;
 						}
 						break;
 					}

Modified: trunk/Tomboy/NoteBuffer.cs
==============================================================================
--- trunk/Tomboy/NoteBuffer.cs	(original)
+++ trunk/Tomboy/NoteBuffer.cs	Sat Jan 31 09:31:33 2009
@@ -135,6 +135,8 @@
 		/// </summary>
 		public DynamicNoteTag GetDynamicTag (string tag_name, Gtk.TextIter iter)
 		{
+			// TODO: Is this variables used, or do we just need to
+			// access iter.Tags to work around a bug?
 			Gtk.TextTag [] tags = iter.Tags;
 			foreach (Gtk.TextTag tag in iter.Tags) {
 				DynamicNoteTag dynamic_tag = tag as DynamicNoteTag;

Modified: trunk/Tomboy/NoteTag.cs
==============================================================================
--- trunk/Tomboy/NoteTag.cs	(original)
+++ trunk/Tomboy/NoteTag.cs	Sat Jan 31 09:31:33 2009
@@ -423,7 +423,7 @@
 			}
 		}
 
-		public Pango.Direction Direction
+		public new Pango.Direction Direction
 		{
 			get{
 				return direction;

Modified: trunk/Tomboy/Notebooks/NotebookNoteAddin.cs
==============================================================================
--- trunk/Tomboy/Notebooks/NotebookNoteAddin.cs	(original)
+++ trunk/Tomboy/Notebooks/NotebookNoteAddin.cs	Sat Jan 31 09:31:33 2009
@@ -8,7 +8,6 @@
 	public class NotebookNoteAddin : NoteAddin
 	{
 		ToolMenuButton toolButton;
-		Gtk.ImageMenuItem menuItem;
 		Gtk.Menu menu;
 		static Gdk.Pixbuf notebookIcon;
 		static Gdk.Pixbuf newNotebookIcon;

Modified: trunk/Tomboy/Preferences.cs
==============================================================================
--- trunk/Tomboy/Preferences.cs	(original)
+++ trunk/Tomboy/Preferences.cs	Sat Jan 31 09:31:33 2009
@@ -122,7 +122,6 @@
 
 			case SYNC_CLIENT_ID:
 				return System.Guid.NewGuid ().ToString ();
-				break;
 
 			case SYNC_LOCAL_PATH:
 				return string.Empty;

Modified: trunk/Tomboy/TagManager.cs
==============================================================================
--- trunk/Tomboy/TagManager.cs	(original)
+++ trunk/Tomboy/TagManager.cs	Sat Jan 31 09:31:33 2009
@@ -110,7 +110,6 @@
 					internal_tags [ t.NormalizedName] = t;
 					return t;
 				}
-				return null;
 				}
 			}
 			Gtk.TreeIter iter = Gtk.TreeIter.Zero;

Modified: trunk/Tomboy/Tray.cs
==============================================================================
--- trunk/Tomboy/Tray.cs	(original)
+++ trunk/Tomboy/Tray.cs	Sat Jan 31 09:31:33 2009
@@ -195,13 +195,13 @@
 			
 			Gdk.Screen screen;
 			Gdk.Rectangle area;
-			Gtk.Orientation orientation;
 			try {
 #if WIN32 || MAC
 				menu.Screen.Display.GetPointer (out x, out y);
 				screen = menu.Screen;
 				area.Height = 0;
 #else
+				Gtk.Orientation orientation;
 				GetGeometry (out screen, out area, out orientation);
 				x = area.X;
 				y = area.Y;
@@ -277,14 +277,13 @@
 			bool open_upwards = false;
 			int val = 0;
 			Gdk.Screen screen = null;
-
-			Gdk.Rectangle area;
-			Gtk.Orientation orientation;
 #if WIN32 || MAC
 			int x;
 			tray.TomboyTrayMenu.Screen.Display.GetPointer (out x, out val);
 			screen = tray.TomboyTrayMenu.Screen;
 #else
+			Gdk.Rectangle area;
+			Gtk.Orientation orientation;
 			GetGeometry (out screen, out area, out orientation);
 			val = area.Y;
 #endif

Modified: trunk/Tomboy/Utils.cs
==============================================================================
--- trunk/Tomboy/Utils.cs	(original)
+++ trunk/Tomboy/Utils.cs	Sat Jan 31 09:31:33 2009
@@ -822,7 +822,6 @@
 	class ToolMenuButton : Gtk.ToggleToolButton
 	{
 		Gtk.Menu menu;
-		Gtk.Image image;
 
 		public ToolMenuButton (Gtk.Toolbar toolbar,
 		                       string stock_image,