f-spot r3611 - in trunk/src: . Cms Core UI.Dialog Utils

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Wed Jan 30 10:12:14 2008
New Revision: 3611
URL: http://svn.gnome.org/viewvc/f-spot?rev=3611&view=rev

Log:
fixing some gendarme warnings

Modified:
   trunk/src/Cms/Cms.cs
   trunk/src/Core/Defines.cs.in
   trunk/src/MainWindow.cs
   trunk/src/UI.Dialog/AboutDialog.cs
   trunk/src/Utils/GnomeUtil.cs
   trunk/src/main.cs

Modified: trunk/src/Cms/Cms.cs
==============================================================================
--- trunk/src/Cms/Cms.cs	(original)
+++ trunk/src/Cms/Cms.cs	Wed Jan 30 10:12:14 2008
@@ -324,10 +324,10 @@
 			}
 		}
 		
-		internal struct GammaTableStruct {
-			public int Count;
-			public ushort StartOfData;  // ushort array Count entries long
-		}
+//		internal struct GammaTableStruct {
+//			public int Count;
+//			public ushort StartOfData;  // ushort array Count entries long
+//		}
 
 		[DllImport("liblcms-1.0.0.dll")]
 		static extern IntPtr cmsBuildGamma (int entry_count, double gamma);
@@ -377,8 +377,8 @@
 		}
 		
 
-		[DllImport("liblcms-1.0.0.dll")]
-		static extern IntPtr cmsAllocGamma (int entry_count);
+//		[DllImport("liblcms-1.0.0.dll")]
+//		static extern IntPtr cmsAllocGamma (int entry_count);
 
 		[DllImport ("libfspot")]
 		static extern IntPtr f_cms_gamma_table_new (ushort [] values, int start, int length);
@@ -658,14 +658,14 @@
 		}
 
 
-		[DllImport("liblcms-1.0.0.dll")]
-		static extern IntPtr cmsCreateBCHSWabstractProfile(int nLUTPoints,
-								   double Bright, 
-								   double Contrast,
-								   double Hue,
-								   double Saturation,
-								   int TempSrc, 
-								   int TempDest);
+//		[DllImport("liblcms-1.0.0.dll")]
+//		static extern IntPtr cmsCreateBCHSWabstractProfile(int nLUTPoints,
+//								   double Bright, 
+//								   double Contrast,
+//								   double Hue,
+//								   double Saturation,
+//								   int TempSrc, 
+//								   int TempDest);
 
 		[DllImport("libfspot")]
 		static extern IntPtr f_cmsCreateBCHSWabstractProfile(int nLUTPoints,

Modified: trunk/src/Core/Defines.cs.in
==============================================================================
--- trunk/src/Core/Defines.cs.in	(original)
+++ trunk/src/Core/Defines.cs.in	Wed Jan 30 10:12:14 2008
@@ -13,7 +13,6 @@
 		public static string LOCALE_DIR = "@prefix@/share/locale";
 		public static string VERSION = "@VERSION@";
 		public static string PACKAGE = "@PACKAGE@";
-		public static string GNOME_ICON_THEME_PREFIX = "@GNOME_ICON_THEME_PREFIX@";
 		public static string PREFIX = "@prefix@";
 		public static string APP_DATA_DIR = "@prefix@/share/@PACKAGE@";
 		public static string BINDIR = PREFIX + "/bin";

Modified: trunk/src/MainWindow.cs
==============================================================================
--- trunk/src/MainWindow.cs	(original)
+++ trunk/src/MainWindow.cs	Wed Jan 30 10:12:14 2008
@@ -1612,7 +1612,7 @@
 
 	public static void HandleHelp (object sender, EventArgs args)
 	{
-		GnomeUtil.ShowHelp ("f-spot.xml", null, FSpot.Global.HelpDirectory, Toplevel.Window.Screen, null);
+		GnomeUtil.ShowHelp ("f-spot.xml", null, FSpot.Global.HelpDirectory, Toplevel.Window.Screen);
 	}
 
 	public static void HandleAbout (object sender, EventArgs args)

Modified: trunk/src/UI.Dialog/AboutDialog.cs
==============================================================================
--- trunk/src/UI.Dialog/AboutDialog.cs	(original)
+++ trunk/src/UI.Dialog/AboutDialog.cs	Wed Jan 30 10:12:14 2008
@@ -87,14 +87,17 @@
 			WrapLicense = true;
 		}
 
-		public static AboutDialog ShowUp ()
+		static AboutDialog ()
 		{
 			if (about == null)
 				about = new AboutDialog ();
 			about.Destroyed += delegate (object o, EventArgs e) {about = null;};
 			about.Response += delegate (object o, Gtk.ResponseArgs e) {if (about != null) about.Destroy ();};
+		}
+
+		public static void ShowUp ()
+		{
 			about.Show ();
-			return about;
 		}
 	}
 }

Modified: trunk/src/Utils/GnomeUtil.cs
==============================================================================
--- trunk/src/Utils/GnomeUtil.cs	(original)
+++ trunk/src/Utils/GnomeUtil.cs	Wed Jan 30 10:12:14 2008
@@ -36,7 +36,7 @@
 			Gtk.Application.Invoke (disp, null, delegate (object sender, EventArgs args) { ((GnomeUtil) disp).Show (); });
 		}
 	
-		public static void ShowHelp (string filename, string link_id, string help_directory, Gdk.Screen screen, Gtk.Window parent)
+		public static void ShowHelp (string filename, string link_id, string help_directory, Gdk.Screen screen)
 		{
 			try {
 				Gnome.Help.DisplayDesktopOnScreen (

Modified: trunk/src/main.cs
==============================================================================
--- trunk/src/main.cs	(original)
+++ trunk/src/main.cs	Wed Jan 30 10:12:14 2008
@@ -16,18 +16,18 @@
 public class Driver {
 	static void Help ()
 	{
-		Console.WriteLine ("F-Spot  {0} - (c)2003-2007, Novell Inc\n" +
-			"Personal photo management for the GNOME Desktop\n\n" +
-			"Usage: f-spot [options] \n" +
-			"Options:\n" +
-		  	"-b -basedir PARAM   path to the photo database folder\n" +
-		    	"-? -help -usage     Show this help list\n" +
-			"-i -import PARAM    import from the given uri\n" +
-			"-p -photodir PARAM  default import folder\n" +
-			"-shutdown           shutdown a running f-spot instance\n" +
-			"-slideshow          display a slideshow\n" +
-			"-V -version         Display version and licensing information\n" +
-			"-v -view            view file(s) or directory(ies)\n", FSpot.Defines.VERSION);
+		Console.WriteLine ("F-Spot  {0} - (c)2003-2008, Novell Inc" + Environment.NewLine +
+			"Personal photo management for the GNOME Desktop" + Environment.NewLine + Environment.NewLine +
+			"Usage: f-spot [options] " + Environment.NewLine +
+			"Options:" + Environment.NewLine +
+		  	"-b -basedir PARAM   path to the photo database folder" + Environment.NewLine +
+		    	"-? -help -usage     Show this help list" + Environment.NewLine +
+			"-i -import PARAM    import from the given uri" + Environment.NewLine +
+			"-p -photodir PARAM  default import folder" + Environment.NewLine +
+			"-shutdown           shutdown a running f-spot instance" + Environment.NewLine +
+			"-slideshow          display a slideshow" + Environment.NewLine +
+			"-V -version         Display version and licensing information" + Environment.NewLine +
+			"-v -view            view file(s) or directory(ies)" +Environment.NewLine, FSpot.Defines.VERSION);
 	}
 
 	static int Main (string [] args)