file-roller r2225 - in trunk: . nautilus

[paobac svn gnome org]

Author: paobac
Date: Thu Apr 10 11:52:15 2008
New Revision: 2225
URL: http://svn.gnome.org/viewvc/file-roller?rev=2225&view=rev

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

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

	Patch by Christian Kellner (bug #501542)

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/nautilus/fileroller-module.c
   trunk/nautilus/nautilus-fileroller.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Apr 10 11:52:15 2008
@@ -18,13 +18,13 @@
 dnl
 dnl ==========================================================================
 
-GLIB_REQUIRED=2.12.0
+GLIB_REQUIRED=2.16.0
 GIO_REQUIRED=2.16.0
 GTK_REQUIRED=2.10.0
 LIBGNOME_REQUIRED=2.6.0
 LIBGNOMEUI_REQUIRED=2.6.0
 LIBGLADE_REQUIRED=2.4.0
-NAUTILUS_REQUIRED=2.22.0
+NAUTILUS_REQUIRED=2.22.2
 
 AC_SUBST(GLIB_REQUIRED)
 AC_SUBST(GIO_REQUIRED)

Modified: trunk/nautilus/fileroller-module.c
==============================================================================
--- trunk/nautilus/fileroller-module.c	(original)
+++ trunk/nautilus/fileroller-module.c	Thu Apr 10 11:52:15 2008
@@ -54,6 +54,3 @@
 	*types = type_list;
 	*num_types = 1;
 }
-
-
-

Modified: trunk/nautilus/nautilus-fileroller.c
==============================================================================
--- trunk/nautilus/nautilus-fileroller.c	(original)
+++ trunk/nautilus/nautilus-fileroller.c	Thu Apr 10 11:52:15 2008
@@ -208,21 +208,10 @@
 			all_archives = FALSE;
 
 		if (can_write) {
-			char      *parent_uri;
-			GFile     *parent;
-			GFileInfo *info;
-
-			parent_uri = nautilus_file_info_get_parent_uri (file);
-			parent =  g_file_new_for_uri (parent_uri);
-			
-			info = g_file_query_info (parent, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, 0, NULL, NULL);
-			if (info != NULL) { 
-				can_write = g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE);
-				g_object_unref (info);
-			}
-			
-			g_object_unref (parent);
-			g_free (parent_uri);
+			NautilusFileInfo *parent;
+
+			parent = nautilus_file_info_get_parent_info (file);
+ 			can_write = nautilus_file_info_can_write (parent);
 		}
 	}