f-spot r3950 - in trunk/src: . Core Utils

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Tue May 20 11:55:32 2008
New Revision: 3950
URL: http://svn.gnome.org/viewvc/f-spot?rev=3950&view=rev

Log:
fixing some warnings

Modified:
   trunk/src/Core/Delay.cs
   trunk/src/InfoDisplay.cs
   trunk/src/Makefile.am
   trunk/src/SendEmail.cs
   trunk/src/Utils/GnomeUtil.cs

Modified: trunk/src/Core/Delay.cs
==============================================================================
--- trunk/src/Core/Delay.cs	(original)
+++ trunk/src/Core/Delay.cs	Tue May 20 11:55:32 2008
@@ -32,7 +32,6 @@
 		uint interval;
 
 		private event GLib.IdleHandler op;
-		private Gtk.Object obj;
 
 		private bool HandleOperation ()
 		{

Modified: trunk/src/InfoDisplay.cs
==============================================================================
--- trunk/src/InfoDisplay.cs	(original)
+++ trunk/src/InfoDisplay.cs	Tue May 20 11:55:32 2008
@@ -60,7 +60,7 @@
                                 url = "file://" + url;
                         }
                         
-                        GnomeUtil.UrlShow (null, url);
+                        GnomeUtil.UrlShow (url);
 		}
 		
 		protected override void OnStyleSet (Gtk.Style previous)

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Tue May 20 11:55:32 2008
@@ -1,5 +1,7 @@
 include $(top_srcdir)/Makefile.include
-EXTRAFLAGS = -unsafe -nowarn:0169 -nowarn:0612 -nowarn:0414 -d:TEST_METADATA -d:BROKEN_RSVG $(NUNIT_DEFINES) $(BEAGLE_DEFINES) $(CSC_DEFINES)
+UNSAFE = -unsafe
+NOWARN = -nowarn:0169 -nowarn:0612 -nowarn:0414  
+EXTRAFLAGS = -d:TEST_METADATA -d:BROKEN_RSVG $(NUNIT_DEFINES) $(BEAGLE_DEFINES) $(CSC_DEFINES)
 
 CMS_CSDISTFILES =				\
 	$(srcdir)/Cms/Cms.cs			\
@@ -343,7 +345,7 @@
 
 Cms.dll: $(CMS_CSFILES)
 	@echo -e "\n*** Compiling $@"
-	$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(CMS_CSFILES) $(CMS_ASSEMBLIES)
+	$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(UNSAFE) $(CMS_CSFILES) $(CMS_ASSEMBLIES)
 
 FSpot.Core.dll: $(CORE_CSFILES) FSpot.Utils.dll Cms.dll
 	@echo -e "\n*** Compiling $@"
@@ -367,7 +369,7 @@
 
 f-spot.exe: $(F_SPOT_CSFILES) FSpot.Utils.dll FSpot.Core.dll FSpot.Query.dll FSpot.JobScheduler.dll FSpot.Widgets.dll Cms.dll $(F_SPOT_RESOURCES)
 	@echo -e "\n*** Compiling $@"
-	$(CSC) -target:winexe -out:$@ $(EXTRAFLAGS) $(F_SPOT_CSFILES) $(F_SPOT_ASSEMBLIES) $(RESOURCES)
+	$(CSC) -target:winexe -out:$@ $(EXTRAFLAGS) $(UNSAFE) $(NOWARN) $(F_SPOT_CSFILES) $(F_SPOT_ASSEMBLIES) $(RESOURCES)
 
 all: f-spot.exe
 

Modified: trunk/src/SendEmail.cs
==============================================================================
--- trunk/src/SendEmail.cs	(original)
+++ trunk/src/SendEmail.cs	Tue May 20 11:55:32 2008
@@ -343,7 +343,7 @@
 						System.Diagnostics.Process.Start("kmail", "  --composer --subject \"" + mail_subject + "\"" + mail_attach);
 					break;
 					default: 
-						GnomeUtil.UrlShow (parent_window,"mailto:?subject="; + System.Web.HttpUtility.UrlEncode(mail_subject) + mail_attach);
+						GnomeUtil.UrlShow ("mailto:?subject="; + System.Web.HttpUtility.UrlEncode(mail_subject) + mail_attach);
 					break;
 				}
 				                

Modified: trunk/src/Utils/GnomeUtil.cs
==============================================================================
--- trunk/src/Utils/GnomeUtil.cs	(original)
+++ trunk/src/Utils/GnomeUtil.cs	Tue May 20 11:55:32 2008
@@ -12,12 +12,10 @@
 namespace FSpot.Utils
 {
 	public class GnomeUtil {
-		Gtk.Window window;
 		string url;
 		
-		private GnomeUtil (Gtk.Window window, string url)
+		private GnomeUtil (string url)
 		{
-			this.window = window;
 			this.url = url;
 		}
 			
@@ -30,9 +28,9 @@
 		       	}
 		}
 	
-		public static void UrlShow (Gtk.Window owner_window, string url)
+		public static void UrlShow (string url)
 		{
-			GnomeUtil disp = new GnomeUtil (owner_window, url);
+			GnomeUtil disp = new GnomeUtil (url);
 			Gtk.Application.Invoke (disp, null, delegate (object sender, EventArgs args) { ((GnomeUtil) disp).Show (); });
 		}