file-roller r2220 - in branches/gnome-2-22: . nautilus

[paobac svn gnome org]

Author: paobac
Date: Tue Apr  8 18:46:53 2008
New Revision: 2220
URL: http://svn.gnome.org/viewvc/file-roller?rev=2220&view=rev

Log:
2008-04-08  Paolo Bacchilega  <paobac svn gnome org>

	* configure.in: now requires Nautilus 2.22.1
	* nautilus/nautilus-fileroller.c: use nautilus_file_info_can_write
	to check file permissions.

	Patch by Christian Kellner (bug #501542)

Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/configure.in
   branches/gnome-2-22/nautilus/nautilus-fileroller.c

Modified: branches/gnome-2-22/configure.in
==============================================================================
--- branches/gnome-2-22/configure.in	(original)
+++ branches/gnome-2-22/configure.in	Tue Apr  8 18:46:53 2008
@@ -18,13 +18,13 @@
 dnl
 dnl ==========================================================================
 
-GLIB_REQUIRED=2.12.0
+GLIB_REQUIRED=2.15.0
 GTK_REQUIRED=2.10.0
 LIBGNOME_REQUIRED=2.6.0
 LIBGNOMEUI_REQUIRED=2.6.0
 GNOME_VFS_REQUIRED=2.10.0
 LIBGLADE_REQUIRED=2.4.0
-NAUTILUS_REQUIRED=2.10.0
+NAUTILUS_REQUIRED=2.22.1
 
 AC_SUBST(GLIB_REQUIRED)
 AC_SUBST(GTK_REQUIRED)
@@ -38,6 +38,7 @@
 
 PKG_CHECK_MODULES(FR,					\
 	glib-2.0 >= $GLIB_REQUIRED			\
+	gio-2.0 >= $GLIB_REQUIRED			\
 	gthread-2.0					\
 	gtk+-2.0 >= $GTK_REQUIRED			\
 	libgnome-2.0 >= $LIBGNOME_REQUIRED		\
@@ -56,8 +57,8 @@
 
 if test x"$enable_nautilus_actions" != xno; then
 	if pkg-config --atleast-version=$NAUTILUS_REQUIRED libnautilus-extension; then
-		NAUTILUS_CFLAGS=`pkg-config --cflags libnautilus-extension glib-2.0 gnome-vfs-2.0`
-		NAUTILUS_LIBS=`pkg-config --libs libnautilus-extension glib-2.0 gnome-vfs-2.0`
+		NAUTILUS_CFLAGS=`pkg-config --cflags libnautilus-extension glib-2.0 gio-2.0`
+		NAUTILUS_LIBS=`pkg-config --libs libnautilus-extension glib-2.0 gio-2.0`
 		build_nautilus_actions=yes
 	fi
 fi

Modified: branches/gnome-2-22/nautilus/nautilus-fileroller.c
==============================================================================
--- branches/gnome-2-22/nautilus/nautilus-fileroller.c	(original)
+++ branches/gnome-2-22/nautilus/nautilus-fileroller.c	Tue Apr  8 18:46:53 2008
@@ -24,9 +24,7 @@
 #include <config.h>
 #include <string.h>
 #include <glib/gi18n-lib.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-#include <libgnomevfs/gnome-vfs-file-info.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
+#include <gio/gio.h>
 #include <libnautilus-extension/nautilus-extension-types.h>
 #include <libnautilus-extension/nautilus-file-info.h>
 #include <libnautilus-extension/nautilus-menu-provider.h>
@@ -206,32 +204,17 @@
 	for (scan = files; scan; scan = scan->next) {
 		NautilusFileInfo *file = scan->data;
 
-		if (all_archives && ! is_archive (file))
-			all_archives = FALSE;
-
+		if ((all_archives = is_archive (file)) == FALSE)
+			break;
 
 		if (can_write) {
-			char             *parent_uri;
-			GnomeVFSFileInfo *info;
-			GnomeVFSResult    result;
-
-			parent_uri = nautilus_file_info_get_parent_uri (file);
-			info = gnome_vfs_file_info_new ();
-			
-			result = gnome_vfs_get_file_info (parent_uri,
-							  info,
-							  (GNOME_VFS_FILE_INFO_FOLLOW_LINKS
-					                   | GNOME_VFS_FILE_INFO_GET_ACCESS_RIGHTS));
-			if ((result == GNOME_VFS_OK) && (info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS))
-				can_write = (info->permissions & GNOME_VFS_PERM_ACCESS_WRITABLE) || (info->permissions & GNOME_VFS_PERM_USER_WRITE);
-				
-			gnome_vfs_file_info_unref (info);
-			g_free (parent_uri);
+			NautilusFileInfo *parent;
+
+			parent = nautilus_file_info_get_parent_info (file);
+ 			can_write = nautilus_file_info_can_write (parent);
 		}
 	}
 
-	/**/
-
 	one_item = (files != NULL) && (files->next == NULL);
 	one_archive = one_item && all_archives;