File nautilus-share-drop-eel.patch of Package nautilus-share

Overview Repositories Revisions Requests Users Attributes Meta

File nautilus-share-drop-eel.patch of Package nautilus-share (Revision 4d53a7d3d0f64320c5b4fe42de3d23b8)

Currently displaying revision 4d53a7d3d0f64320c5b4fe42de3d23b8 , Show latest

Index: nautilus-share-0.7.2/src/nautilus-share.c
===================================================================
--- nautilus-share-0.7.2.orig/src/nautilus-share.c
+++ nautilus-share-0.7.2/src/nautilus-share.c
@@ -31,11 +31,8 @@
 #include <libnautilus-extension/nautilus-menu-provider.h>
 #include <libnautilus-extension/nautilus-property-page-provider.h>
 
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include "nautilus-share.h"
 
-#include <eel/eel-vfs-extensions.h>
-
 #include <glib/gi18n-lib.h>
 
 #include <gtk/gtktable.h>
@@ -50,6 +47,7 @@
 #include <string.h>
 #include <time.h>
 
+#include <sys/stat.h>
 #include <unistd.h>
 #include <stdlib.h>
 
@@ -421,15 +419,15 @@ property_page_commit (PropertyPage *page
 static gchar *
 get_fullpath_from_fileinfo(NautilusFileInfo *fileinfo)
 {
-  gchar *uri;
+  GFile *file;
   gchar *fullpath;
 
   g_assert (fileinfo != NULL);
   
-  uri = nautilus_file_info_get_uri(fileinfo);
-  fullpath = gnome_vfs_get_local_path_from_uri(uri);
+  file = nautilus_file_info_get_location(fileinfo);
+  fullpath = g_file_get_path(file);
   g_assert (fullpath != NULL); /* In the beginning we checked that this was a local URI */
-  g_free(uri);
+  g_object_unref(file);
 
   return(fullpath);
 }
@@ -863,15 +861,17 @@ get_share_status_and_free_share_info (Sh
 
 /*--------------------------------------------------------------------------*/
 static void
-get_share_info_for_file_info (NautilusFileInfo *file, ShareInfo **share_info, gboolean *is_shareable)
+get_share_info_for_file_info (NautilusFileInfo *fileinfo, ShareInfo **share_info, gboolean *is_shareable)
 {
+  GFile	        *file;
   char		*uri;
   char		*local_path = NULL;
 
   *share_info = NULL;
   *is_shareable = FALSE;
 
-  uri = nautilus_file_info_get_uri (file);
+  file = nautilus_file_info_get_location (fileinfo);
+  uri = g_file_get_uri (file);
   if (!uri)
     goto out;
 
@@ -887,7 +887,7 @@ get_share_info_for_file_info (NautilusFi
       if (!shares_get_share_info_for_share_name (share_name, share_info, NULL))
 	{
 	  *share_info = NULL;
-	  *is_shareable = TRUE; /* it *has* the prefix, anyway... we are just unsynchronized with what gnome-vfs thinks */
+	  *is_shareable = TRUE; /* it *has* the prefix, anyway... we are just unsynchronized with what gvfs thinks */
 	}
       else
 	{
@@ -897,10 +897,10 @@ get_share_info_for_file_info (NautilusFi
       goto out;
     }
 
-  if (!nautilus_file_info_is_directory(file))
+  if (!nautilus_file_info_is_directory(fileinfo))
     goto out;
 
-  if(!(local_path = gnome_vfs_get_local_path_from_uri(uri)))
+  if(!(local_path = g_file_get_path(file)))
     goto out;
 
   /* FIXME: NULL GError */
@@ -913,6 +913,7 @@ get_share_info_for_file_info (NautilusFi
 
   g_free (uri);
   g_free (local_path);
+  g_object_unref (file);
 }
 
 /*--------------------------------------------------------------------------*/
Index: nautilus-share-0.7.2/configure.in
===================================================================
--- nautilus-share-0.7.2.orig/configure.in
+++ nautilus-share-0.7.2/configure.in
@@ -8,7 +8,6 @@ AM_INIT_AUTOMAKE([foreign 1.9 -Wall])
 AC_PROG_INTLTOOL([0.29])
 
 NAUTILUS_REQUIRED=2.10.0
-EEL_REQUIRED=2.10.0
 GLIB_REQUIRED=2.4.0
 LIBGLADE_REQUIRED=2.4.0
 
@@ -28,7 +27,7 @@ if test "x$HAVE_PKGCONFIG" = "xno"; then
   AC_MSG_ERROR(you need to have pkgconfig installed !)
 fi
 
-PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED)
+PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED)
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
 PKG_CHECK_MODULES(LIBGLADE, libglade-2.0 >= $LIBGLADE_REQUIRED)

Places

File nautilus-share-drop-eel.patch of Package nautilus-share (Revision 4d53a7d3d0f64320c5b4fe42de3d23b8)

Places