seahorse r2208 - in trunk: . libseahorse

[asaleem svn gnome org]

Author: asaleem
Date: Tue May  6 03:12:16 2008
New Revision: 2208
URL: http://svn.gnome.org/viewvc/seahorse?rev=2208&view=rev

Log:
remove gnome-vfs usage in seahorse

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libseahorse/seahorse-widget.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue May  6 03:12:16 2008
@@ -46,8 +46,7 @@
 AC_SUBST([GTK_CFLAGS])
  
   AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-PKG_CHECK_MODULES(SEAHORSE, libglade-2.0 gconf-2.0 gtk+-2.0 >= 2.10.0 
-gnome-vfs-2.0)
+PKG_CHECK_MODULES(SEAHORSE, libglade-2.0 gconf-2.0 gtk+-2.0 >= 2.10.0)
 
 
 AC_MSG_CHECKING([for some Win32 platform])

Modified: trunk/libseahorse/seahorse-widget.c
==============================================================================
--- trunk/libseahorse/seahorse-widget.c	(original)
+++ trunk/libseahorse/seahorse-widget.c	Tue May  6 03:12:16 2008
@@ -29,9 +29,6 @@
 #include <glade/glade.h>
 #include <glade/glade-build.h>
 
-#include <libgnomevfs/gnome-vfs.h>
-#include <libgnomevfs/gnome-vfs-result.h>
-
 #include "seahorse-widget.h"
 #include "seahorse-gtkstock.h"
 
@@ -317,8 +314,9 @@
 void
 seahorse_widget_show_help (SeahorseWidget *swidget)
 {
+    GError *error = NULL;
     gchar *document = NULL;
-    GnomeVFSResult error;
+    GtkWidget *dialog = NULL;
 
     if (g_str_equal (swidget->name, "key-manager") || 
         g_str_equal (swidget->name, "keyserver-results")) {
@@ -327,20 +325,18 @@
         document = g_strdup_printf ("ghelp:" PACKAGE "?%s", swidget->name);
     }
 
-    error = gnome_vfs_url_show (document);
-    g_free (document);
-
-    if (error != GNOME_VFS_OK) {
-        GtkWidget *dialog;
-
-        dialog = gtk_message_dialog_new (GTK_WINDOW (seahorse_widget_get_top (swidget)), GTK_DIALOG_MODAL, 
-                                         GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, 
-                                         _("Could not display help: %s"),
-                                         gnome_vfs_result_to_string (error));
-        g_signal_connect (G_OBJECT (dialog), "response",
-                          G_CALLBACK (gtk_widget_destroy), NULL);
+    if (!g_app_info_launch_default_for_uri (document, NULL, &error)) {
+        dialog = gtk_message_dialog_new (GTK_WINDOW (seahorse_widget_get_top (swidget)),
+                                         GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+                                         _("Could not display help: %s"), error->message);
+        g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (gtk_widget_destroy), NULL);
         gtk_widget_show (dialog);
     }
+
+    g_free (document);
+
+    if (error)
+        g_error_free (error);
 }
 
 /**