[f-spot] use ShowUri instead of GnomeUtil/UrlShow or ShowHelp

From: Stephane Delcroix <sdelcroix src gnome org>
To: svn-commits-list gnome org
Subject: [f-spot] use ShowUri instead of GnomeUtil/UrlShow or ShowHelp
Date: Tue, 16 Jun 2009 05:44:57 -0400 (EDT)
commit 1bbf965e205aeeca7ce547b629055924544c7cdd
Author: Stephane Delcroix <stephane delcroix org>
Date:   Tue Jun 16 11:41:17 2009 +0200

    use ShowUri instead of GnomeUtil/UrlShow or ShowHelp

 .../FacebookExport/FacebookExport.addin.xml        |    2 +-
 .../Exporters/FacebookExport/FacebookExport.cs     |    2 +-
 extensions/Exporters/FacebookExport/Makefile.am    |    1 +
 .../Exporters/FlickrExport/FlickrExport.addin.xml  |    2 +-
 extensions/Exporters/FlickrExport/FlickrExport.cs  |    2 +-
 extensions/Exporters/FlickrExport/FlickrRemote.cs  |    2 +-
 extensions/Exporters/FlickrExport/Makefile.am      |    1 +
 .../Exporters/FolderExport/FolderExport.addin.xml  |    2 +-
 extensions/Exporters/FolderExport/FolderExport.cs  |    2 +-
 extensions/Exporters/FolderExport/Makefile.am      |    1 +
 .../GalleryExport/GalleryExport.addin.xml          |    2 +-
 .../Exporters/GalleryExport/GalleryExport.cs       |    2 +-
 extensions/Exporters/GalleryExport/Makefile.am     |    1 +
 .../PicasaWebExport/PicasaWebExport.addin.xml      |    2 +-
 .../Exporters/PicasaWebExport/PicasaWebExport.cs   |    2 +-
 extensions/Exporters/SmugMugExport/Makefile.am     |    1 +
 .../SmugMugExport/SmugMugExport.addin.xml          |    2 +-
 .../Exporters/SmugMugExport/SmugMugExport.cs       |    2 +-
 src/MainWindow.cs                                  |    2 +-
 src/Makefile.am                                    |    1 -
 src/SendEmail.cs                                   |    2 +-
 src/Utils/GnomeUtil.cs                             |   57 --------------------
 22 files changed, 20 insertions(+), 73 deletions(-)
---
diff --git a/extensions/Exporters/FacebookExport/FacebookExport.addin.xml b/extensions/Exporters/FacebookExport/FacebookExport.addin.xml
index 7052857..10e30ae 100644
--- a/extensions/Exporters/FacebookExport/FacebookExport.addin.xml
+++ b/extensions/Exporters/FacebookExport/FacebookExport.addin.xml
@@ -1,6 +1,6 @@
 <Addin 	namespace="FSpot"
 	id="FacebookExport"
-	version="0.6"
+	version="0.6.0.1"
 	name="FacebookExport"
 	description="Export pictures to facebook"
 	author="George Talusan"
diff --git a/extensions/Exporters/FacebookExport/FacebookExport.cs b/extensions/Exporters/FacebookExport/FacebookExport.cs
index 6e52007..ed3cba3 100644
--- a/extensions/Exporters/FacebookExport/FacebookExport.cs
+++ b/extensions/Exporters/FacebookExport/FacebookExport.cs
@@ -317,7 +317,7 @@ namespace FSpot.Exporter.Facebook
 			account = new FacebookAccount();
 
 			Uri token = account.CreateToken ();
-			GnomeUtil.UrlShow (token.ToString ());
+			GtkBeans.Global.ShowUri (Dialog.Screen, token.ToString ());
 
 			HigMessageDialog mbox = new HigMessageDialog (Dialog, Gtk.DialogFlags.DestroyWithParent | Gtk.DialogFlags.Modal, Gtk.MessageType.Info, Gtk.ButtonsType.Ok, Catalog.GetString ("Waiting for authentication"), Catalog.GetString ("F-Spot will now launch your browser so that you can log into Facebook.  Turn on the \"Save my login information\" checkbox on Facebook and F-Spot will log into Facebook automatically from now on."));
 
diff --git a/extensions/Exporters/FacebookExport/Makefile.am b/extensions/Exporters/FacebookExport/Makefile.am
index e116cda..4246116 100644
--- a/extensions/Exporters/FacebookExport/Makefile.am
+++ b/extensions/Exporters/FacebookExport/Makefile.am
@@ -33,6 +33,7 @@ REFS =					\
 	-r:$(top_builddir)/src/FSpot.Core.dll	\
 	-r:$(top_builddir)/src/FSpot.Utils.dll	\
 	-r:$(top_builddir)/src/FSpot.Platform.dll	\
+	$(LINK_GTKSHARPBEANS)				\
 	-r:Mono.Posix
 
 PKGS =					\
diff --git a/extensions/Exporters/FlickrExport/FlickrExport.addin.xml b/extensions/Exporters/FlickrExport/FlickrExport.addin.xml
index b79d608..5a3447a 100644
--- a/extensions/Exporters/FlickrExport/FlickrExport.addin.xml
+++ b/extensions/Exporters/FlickrExport/FlickrExport.addin.xml
@@ -1,5 +1,5 @@
 <Addin namespace="FSpot"
-	version="0.6"
+	version="0.6.0.1"
 	name="Flickr Export"
 	description="This extension allows you to export your photos to Flickr and 23hq."
 	author="F-Spot team"
diff --git a/extensions/Exporters/FlickrExport/FlickrExport.cs b/extensions/Exporters/FlickrExport/FlickrExport.cs
index 1e988b9..4e23a44 100644
--- a/extensions/Exporters/FlickrExport/FlickrExport.cs
+++ b/extensions/Exporters/FlickrExport/FlickrExport.cs
@@ -395,7 +395,7 @@ namespace FSpotFlickrExport {
 					}
 				}
 
-				GnomeUtil.UrlShow (view_url);
+				GtkBeans.Global.ShowUri (Dialog.Screen, view_url);
 			}
 		}
 
diff --git a/extensions/Exporters/FlickrExport/FlickrRemote.cs b/extensions/Exporters/FlickrExport/FlickrRemote.cs
index 477ca23..fbe42c1 100644
--- a/extensions/Exporters/FlickrExport/FlickrRemote.cs
+++ b/extensions/Exporters/FlickrExport/FlickrRemote.cs
@@ -197,7 +197,7 @@ public class FlickrRemote {
 		frob = flickr.AuthGetFrob ();
 		string login_url = flickr.AuthCalcUrl (frob, FlickrNet.AuthLevel.Write);
 
-		GnomeUtil.UrlShow (login_url);
+		GtkBeans.Global.ShowUri (null, login_url);
 	}
 
 	public class Service {
diff --git a/extensions/Exporters/FlickrExport/Makefile.am b/extensions/Exporters/FlickrExport/Makefile.am
index 6e0d5c2..3888a2e 100644
--- a/extensions/Exporters/FlickrExport/Makefile.am
+++ b/extensions/Exporters/FlickrExport/Makefile.am
@@ -15,6 +15,7 @@ REFS =					\
 	-r:$(top_builddir)/src/FSpot.Core.dll	\
 	-r:$(top_builddir)/src/FSpot.Utils.dll	\
 	$(LINK_SEMWEB)			\
+	$(LINK_GTKSHARPBEANS)		\
 	-r:FlickrNet/FlickrNet.dll	\
 	-r:Mono.Posix
 
diff --git a/extensions/Exporters/FolderExport/FolderExport.addin.xml b/extensions/Exporters/FolderExport/FolderExport.addin.xml
index 45be618..31cab19 100644
--- a/extensions/Exporters/FolderExport/FolderExport.addin.xml
+++ b/extensions/Exporters/FolderExport/FolderExport.addin.xml
@@ -1,5 +1,5 @@
 <Addin namespace="FSpot"
-	version="0.6"
+	version="0.6.0.1"
 	name="Folder Export"
 	description="This extension allows you to export your photos to HTML galleries, Original galleries or just to a folder."
 	author="F-Spot team"
diff --git a/extensions/Exporters/FolderExport/FolderExport.cs b/extensions/Exporters/FolderExport/FolderExport.cs
index 3aabcd4..da75d8c 100644
--- a/extensions/Exporters/FolderExport/FolderExport.cs
+++ b/extensions/Exporters/FolderExport/FolderExport.cs
@@ -293,7 +293,7 @@ namespace FSpotFolderExport {
 				}
 
 				if (open) {
-					GnomeUtil.UrlShow (target.ToString ());
+					GtkBeans.Global.ShowUri (Dialog.Screen, target.ToString ());
 				}
 
 				// Save these settings for next time
diff --git a/extensions/Exporters/FolderExport/Makefile.am b/extensions/Exporters/FolderExport/Makefile.am
index 7e3b10b..2edf2a3 100644
--- a/extensions/Exporters/FolderExport/Makefile.am
+++ b/extensions/Exporters/FolderExport/Makefile.am
@@ -14,6 +14,7 @@ REFS =					\
 	-r:$(top_builddir)/src/FSpot.Core.dll	\
 	-r:$(top_builddir)/src/FSpot.Utils.dll	\
 	$(LINK_SEMWEB)			\
+	$(LINK_GTKSHARPBEANS)		\
 	-r:System.Web			\
 	-r:ICSharpCode.SharpZipLib	\
 	-r:Mono.Posix
diff --git a/extensions/Exporters/GalleryExport/GalleryExport.addin.xml b/extensions/Exporters/GalleryExport/GalleryExport.addin.xml
index e089ac2..744a5b4 100644
--- a/extensions/Exporters/GalleryExport/GalleryExport.addin.xml
+++ b/extensions/Exporters/GalleryExport/GalleryExport.addin.xml
@@ -1,5 +1,5 @@
 <Addin namespace="FSpot"
-	version="0.6"
+	version="0.6.0.1"
 	name="Gallery Export"
 	description="This extension allows you to export your photos to PHP Gallery (http://gallery.menalto.com)."
 	author="F-Spot team"
diff --git a/extensions/Exporters/GalleryExport/GalleryExport.cs b/extensions/Exporters/GalleryExport/GalleryExport.cs
index e2a5baa..8572930 100644
--- a/extensions/Exporters/GalleryExport/GalleryExport.cs
+++ b/extensions/Exporters/GalleryExport/GalleryExport.cs
@@ -811,7 +811,7 @@ namespace G2Export {
 			progress_dialog.ButtonLabel = Gtk.Stock.Ok;
 
 			if (browser) {
-				GnomeUtil.UrlShow (album.GetUrl());
+				GtkBeans.Global.ShowUri (export_dialog.Screen, album.GetUrl());
 			}
 		}
 
diff --git a/extensions/Exporters/GalleryExport/Makefile.am b/extensions/Exporters/GalleryExport/Makefile.am
index e3b589c..d1b4a1b 100644
--- a/extensions/Exporters/GalleryExport/Makefile.am
+++ b/extensions/Exporters/GalleryExport/Makefile.am
@@ -15,6 +15,7 @@ REFS =					\
 	-r:$(top_builddir)/src/FSpot.Core.dll	\
 	-r:$(top_builddir)/src/FSpot.Utils.dll	\
 	$(LINK_SEMWEB)			\
+	$(LINK_GTKSHARPBEANS)		\
 	-r:Mono.Posix
 
 PKGS =					\
diff --git a/extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml b/extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml
index b9c9cc7..3e37468 100644
--- a/extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml
+++ b/extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml
@@ -1,5 +1,5 @@
 <Addin namespace="FSpot"
-	version="0.6.0.1"
+	version="0.6.0.2"
 	name="PicasaWeb Export"
 	description="This extension allows you to export your photos to PicasaWeb."
 	author="F-Spot team"
diff --git a/extensions/Exporters/PicasaWebExport/PicasaWebExport.cs b/extensions/Exporters/PicasaWebExport/PicasaWebExport.cs
index 9926c77..0454688 100644
--- a/extensions/Exporters/PicasaWebExport/PicasaWebExport.cs
+++ b/extensions/Exporters/PicasaWebExport/PicasaWebExport.cs
@@ -707,7 +707,7 @@ namespace FSpotGoogleExport {
 			progress_dialog.ButtonLabel = Gtk.Stock.Ok;
 
 			if (browser) {
-				GnomeUtil.UrlShow (album.Link);
+				GtkBeans.Global.ShowUri (Dialog.Screen, album.Link);
 			}
 		}
 
diff --git a/extensions/Exporters/SmugMugExport/Makefile.am b/extensions/Exporters/SmugMugExport/Makefile.am
index 7e3a1a9..8c796c5 100644
--- a/extensions/Exporters/SmugMugExport/Makefile.am
+++ b/extensions/Exporters/SmugMugExport/Makefile.am
@@ -15,6 +15,7 @@ REFS =					\
 	-r:$(top_builddir)/src/FSpot.Utils.dll	\
 	$(LINK_SEMWEB)			\
 	-r:SmugMugNet/SmugMugNet.dll	\
+	$(LINK_GTKSHARPBEANS)		\
 	$(LINK_KEYRING)			\
 	-r:Mono.Posix
 
diff --git a/extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml b/extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml
index ee23b1d..e7a2c09 100644
--- a/extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml
+++ b/extensions/Exporters/SmugMugExport/SmugMugExport.addin.xml
@@ -1,5 +1,5 @@
 <Addin namespace="FSpot"
-	version="0.6.0.1"
+	version="0.6.0.2"
 	name="SmugMug Export"
 	description="This extension allows you to export your photos to SmugMug."
 	author="F-Spot team"
diff --git a/extensions/Exporters/SmugMugExport/SmugMugExport.cs b/extensions/Exporters/SmugMugExport/SmugMugExport.cs
index cf81223..75a3826 100644
--- a/extensions/Exporters/SmugMugExport/SmugMugExport.cs
+++ b/extensions/Exporters/SmugMugExport/SmugMugExport.cs
@@ -610,7 +610,7 @@ namespace FSpotSmugMugExport {
 			progress_dialog.ButtonLabel = Gtk.Stock.Ok;
 
 			if (browser && album_uri != null) {
-				GnomeUtil.UrlShow (album_uri.ToString ());
+				GtkBeans.Global.ShowUri (Dialog.Screen, album_uri.ToString ());
 			}
 		}
 
diff --git a/src/MainWindow.cs b/src/MainWindow.cs
index 7321ec4..65d88fc 100644
--- a/src/MainWindow.cs
+++ b/src/MainWindow.cs
@@ -1782,7 +1782,7 @@ public class MainWindow {
 
 	public static void HandleHelp (object sender, EventArgs args)
 	{
-		GnomeUtil.ShowHelp ("f-spot.xml", null, FSpot.Global.HelpDirectory, Toplevel.Window.Screen);
+		GtkBeans.Global.ShowUri (Toplevel.Window.Screen, "ghelp:f-spot");
 	}
 
 	public static void HandleAbout (object sender, EventArgs args)
diff --git a/src/Makefile.am b/src/Makefile.am
index b34eeee..9459cd3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,7 +52,6 @@ UTILS_CSDISTFILES =				\
 	$(srcdir)/Utils/CairoUtils.cs		\
 	$(srcdir)/Utils/ConsoleCrayon.cs	\
 	$(srcdir)/Utils/DbUtils.cs		\
-	$(srcdir)/Utils/GnomeUtil.cs		\
 	$(srcdir)/Utils/GdkUtils.cs		\
 	$(srcdir)/Utils/GtkUtil.cs		\
 	$(srcdir)/Utils/Log.cs			\
diff --git a/src/SendEmail.cs b/src/SendEmail.cs
index b9f1af9..7bb1058 100644
--- a/src/SendEmail.cs
+++ b/src/SendEmail.cs
@@ -345,7 +345,7 @@ namespace FSpot {
 						System.Diagnostics.Process.Start("kmail", "  --composer --subject \"" + mail_subject + "\"" + mail_attach);
 					break;
 					default: 
-						GnomeUtil.UrlShow ("mailto:?subject="; + System.Web.HttpUtility.UrlEncode(mail_subject) + mail_attach);
+						GtkBeans.Global.ShowUri (Dialog.Screen, "mailto:?subject="; + System.Web.HttpUtility.UrlEncode(mail_subject) + mail_attach);
 					break;
 				}
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]