GNOME.org
 

file-roller r2209 - in trunk: . src

Author: paobac
Date: Thu Apr  3 16:59:33 2008
New Revision: 2209
URL: http://svn.gnome.org/viewvc/file-roller?rev=2209&view=rev

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

	* src/open-file.h: 
	* src/fr-window.h: 
	* src/fr-window.c: 
	* src/fr-archive.c: 
	* src/file-utils.h: 
	* src/file-utils.c: 
	* src/file-data.h: 
	* src/file-data.c: 
	* src/dlg-update.c: 
	* src/dlg-prop.c: 
	* src/dlg-open-with.c: 
	* src/dlg-batch-add.c: 
	* src/dlg-ask-password.c: 
	* src/actions.c: 

	Fixed all the compiler warnings and errors. 
	Removed all the libgnomevfs* includes.

Modified:
   trunk/ChangeLog
   trunk/src/actions.c
   trunk/src/dlg-ask-password.c
   trunk/src/dlg-batch-add.c
   trunk/src/dlg-open-with.c
   trunk/src/dlg-prop.c
   trunk/src/dlg-update.c
   trunk/src/file-data.c
   trunk/src/file-data.h
   trunk/src/file-utils.c
   trunk/src/file-utils.h
   trunk/src/fr-archive.c
   trunk/src/fr-window.c
   trunk/src/fr-window.h
   trunk/src/open-file.h

Modified: trunk/src/actions.c
==============================================================================
--- trunk/src/actions.c	(original)
+++ trunk/src/actions.c	Thu Apr  3 16:59:33 2008
@@ -25,8 +25,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include "actions.h"
 #include "dlg-add-files.h"
 #include "dlg-add-folder.h"
@@ -329,7 +327,6 @@
 		g_warning ("Failed to get display name for uri %s: %s", uri, err->message);
 		g_clear_error (&err);
 		g_object_unref (file);
-		g_free (uri);
 		return;
 	}
 

Modified: trunk/src/dlg-ask-password.c
==============================================================================
--- trunk/src/dlg-ask-password.c	(original)
+++ trunk/src/dlg-ask-password.c	Thu Apr  3 16:59:33 2008
@@ -25,7 +25,6 @@
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include "file-utils.h"
 #include "gtk-utils.h"
 #include "fr-window.h"

Modified: trunk/src/dlg-batch-add.c
==============================================================================
--- trunk/src/dlg-batch-add.c	(original)
+++ trunk/src/dlg-batch-add.c	Thu Apr  3 16:59:33 2008
@@ -25,10 +25,10 @@
 #include <math.h>
 #include <unistd.h>
 
+#include <gio/gio.h>
 #include <gtk/gtk.h>
 #include <libgnomeui/gnome-icon-lookup.h>
 #include <glade/glade.h>
-#include <gio.h>
 
 #include "file-utils.h"
 #include "fr-stock.h"

Modified: trunk/src/dlg-open-with.c
==============================================================================
--- trunk/src/dlg-open-with.c	(original)
+++ trunk/src/dlg-open-with.c	Thu Apr  3 16:59:33 2008
@@ -25,8 +25,6 @@
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
-#include <libgnomevfs/gnome-vfs-mime.h>
-#include <libgnomevfs/gnome-vfs-mime-handlers.h>
 #include "file-utils.h"
 #include "gconf-utils.h"
 #include "glib-utils.h"
@@ -366,7 +364,7 @@
 		const char *name = scan->data;
 
 		mime_type = get_file_mime_type (name, FALSE);
-		if ((mime_type != NULL) && (strcmp (mime_type, GNOME_VFS_MIME_TYPE_UNKNOWN) != 0))
+		if ((mime_type != NULL) && ! g_content_type_is_unknown (mime_type))
 			data->app_list = g_list_concat (data->app_list, g_app_info_get_all_for_type (mime_type));
 	}
 
@@ -406,7 +404,7 @@
 
 		app_names = g_list_prepend (app_names, (char*) g_app_info_get_executable (app));
 
-		utf8_name = g_locale_to_utf8 (app->name, -1, NULL, NULL, NULL);
+		utf8_name = g_locale_to_utf8 (g_app_info_get_name (app), -1, NULL, NULL, NULL);
 		/*icon = create_pixbuf (theme, gnome_vfs_mime_application_get_icon (app), icon_size);*/
 
 		gtk_list_store_append (GTK_LIST_STORE (data->app_model),

Modified: trunk/src/dlg-prop.c
==============================================================================
--- trunk/src/dlg-prop.c	(original)
+++ trunk/src/dlg-prop.c	Thu Apr  3 16:59:33 2008
@@ -25,7 +25,6 @@
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include "glib-utils.h"
 #include "file-utils.h"
 #include "gtk-utils.h"

Modified: trunk/src/dlg-update.c
==============================================================================
--- trunk/src/dlg-update.c	(original)
+++ trunk/src/dlg-update.c	Thu Apr  3 16:59:33 2008
@@ -25,7 +25,6 @@
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include "dlg-update.h"
 #include "file-utils.h"
 #include "gconf-utils.h"

Modified: trunk/src/file-data.c
==============================================================================
--- trunk/src/file-data.c	(original)
+++ trunk/src/file-data.c	Thu Apr  3 16:59:33 2008
@@ -124,11 +124,6 @@
 
 	mime_type = get_file_mime_type (fdata->full_path, TRUE);
 
-	if (mime_type == NULL) {
-		fdata->mime_type = 0;
-		return;
-	}
-
 	fdata->mime_type = g_str_hash ((gconstpointer) mime_type);
 	if (g_hash_table_lookup (mime_type_hash, (gconstpointer) &fdata->mime_type) == NULL)
 		g_hash_table_insert (mime_type_hash, (gpointer) &fdata->mime_type, g_strdup (mime_type));
@@ -136,25 +131,16 @@
 
 
 const char *
-file_data_get_mime_type (const FileData *fdata)
+file_data_get_mime_type (FileData *fdata)
 {
-	const char *mime_type;
-
-	if (fdata->mime_type == 0)
-		file_data_update_mime_type ((FileData*)fdata);
 	if (fdata->mime_type == 0)
-		return GNOME_VFS_MIME_TYPE_UNKNOWN;
-
-	mime_type = g_hash_table_lookup (mime_type_hash, (gconstpointer) &fdata->mime_type);
-	if (mime_type == NULL)
-		mime_type = GNOME_VFS_MIME_TYPE_UNKNOWN;
-
-	return mime_type;
+		file_data_update_mime_type (fdata);
+	return g_hash_table_lookup (mime_type_hash, (gconstpointer) &fdata->mime_type);
 }
 
 
 const char *
-file_data_get_mime_type_description (const FileData *fdata)
+file_data_get_mime_type_description (FileData *fdata)
 {
 	const char *desc;
 
@@ -170,7 +156,7 @@
 
 
 gboolean
-file_data_is_dir (const FileData *fdata)
+file_data_is_dir (FileData *fdata)
 {
 	return fdata->dir || fdata->list_dir;
 }

Modified: trunk/src/file-data.h
==============================================================================
--- trunk/src/file-data.h	(original)
+++ trunk/src/file-data.h	Thu Apr  3 16:59:33 2008
@@ -59,9 +59,9 @@
 FileData *      file_data_new                       (void);
 FileData *      file_data_copy                      (FileData *src);
 void            file_data_free                      (FileData *fdata);
-const char *    file_data_get_mime_type             (const FileData *fdata);
-const char *    file_data_get_mime_type_description (const FileData *fdata);
-gboolean        file_data_is_dir                    (const FileData *fdata);
+const char *    file_data_get_mime_type             (FileData *fdata);
+const char *    file_data_get_mime_type_description (FileData *fdata);
+gboolean        file_data_is_dir                    (FileData *fdata);
 
 void            file_data_release_data (void);
 

Modified: trunk/src/file-utils.c
==============================================================================
--- trunk/src/file-utils.c	(original)
+++ trunk/src/file-utils.c	Thu Apr  3 16:59:33 2008
@@ -92,7 +92,7 @@
 		result = (g_file_info_get_file_type (info) == file_type);
 	}
 	else {
-		g_warning ("Failed to get file type for uri %s: %s", uri, err->message);
+		g_warning ("Failed to get file type for uri %s: %s", uri, error->message);
 		g_error_free (error);
 	}
 	
@@ -499,7 +499,12 @@
 
 	parent = g_file_get_parent (dir);
 	if (parent != NULL) {
-		ensure_dir_exists (parent, mode, error);
+		char *uri;
+		
+		uri = g_file_get_uri (parent);
+		ensure_dir_exists (uri, mode, error);
+		g_free (uri);
+		
 		if (error != NULL) {
 			g_object_unref (parent);
 			return FALSE;
@@ -523,7 +528,7 @@
 
 gboolean
 ensure_dir_exists (const char  *uri,
-		   mode_t       mode.
+		   mode_t       mode,
 		   GError     **error)
 {
 	GFile  *dir;
@@ -643,15 +648,17 @@
 delete_directory_recursive (GFile   *dir,
 			    GError **error)
 {
+	char            *uri;
 	GFileEnumerator *file_enum;
 	GFileInfo       *info;
 	gboolean         error_occurred = FALSE;
-	         
+	
 	file_enum = g_file_enumerate_children (dir, 
 					       G_FILE_ATTRIBUTE_STANDARD_NAME "," 
 					       G_FILE_ATTRIBUTE_STANDARD_TYPE,
 					       0, NULL, error);
 
+	uri = g_file_get_uri (dir);
 	while (! error_occurred && (info = g_file_enumerator_next_file (file_enum, NULL, error)) != NULL) {
 		const char *name;
 		char       *child_uri;
@@ -674,7 +681,8 @@
 		g_object_unref (child);
 		g_free (child_uri);
 	}
-
+	g_free (uri);
+	
 	if (! error_occurred && ! g_file_delete (dir, NULL, error)) 
  		error_occurred = TRUE;
 	
@@ -695,7 +703,7 @@
 	result = delete_directory_recursive (dir, &error);
 	if (error != NULL) {
 		g_warning ("Cannot delete %s: %s", uri, error->message);
-		g_clear_error (&err);
+		g_clear_error (&error);
 	}
 	g_object_unref (dir);
 	
@@ -725,7 +733,7 @@
 	
 	dir = g_file_new_for_uri (uri);
 	if (! make_directory_tree (dir, 0755, error)) {
-		g_warning ("could create directory %s: %s", uri, error->message);
+		g_warning ("could create directory %s: %s", uri, (*error)->message);
 		return FALSE;
 	}
 	

Modified: trunk/src/file-utils.h
==============================================================================
--- trunk/src/file-utils.h	(original)
+++ trunk/src/file-utils.h	Thu Apr  3 16:59:33 2008
@@ -26,8 +26,6 @@
 #include <sys/types.h>
 #include <time.h>
 #include <gio/gio.h>
-#include <libgnomevfs/gnome-vfs-file-size.h>
-#include <libgnomevfs/gnome-vfs-mime-handlers.h>
 
 
 #define FILENAME_MAX_LENGTH 30 /* FIXME: find out the best value */

Modified: trunk/src/fr-archive.c
==============================================================================
--- trunk/src/fr-archive.c	(original)
+++ trunk/src/fr-archive.c	Thu Apr  3 16:59:33 2008
@@ -3158,12 +3158,13 @@
 
 
 static char *
-get_extract_here_destination (const char *uri,
-			      GError     *error)
+get_extract_here_destination (const char  *uri,
+			      GError     **error)
 {
-	char *desired_destination;
-	char *destination = NULL;
-	int   n = 1;
+	char  *desired_destination;
+	char  *destination = NULL;
+	int    n = 1;
+	GFile *file;
 	
 	desired_destination = get_desired_destination_from_archive_uri (uri);
 	
@@ -3173,13 +3174,17 @@
 			destination = g_strdup (desired_destination);
 		else
 			destination = g_strdup_printf ("%s%%20(%d)", desired_destination, n);
-		g_file_make_directory (destination, NULL, error);
+			
+		file = g_file_new_for_uri (destination);
+		g_file_make_directory (file, NULL, error);
+		g_object_unref (file);
+		
 		n++;
-	} while ((*error == NULL) && (*error->code == G_IO_ERROR_EXISTS));
+	} while ((*error == NULL) && ((*error)->code == G_IO_ERROR_EXISTS));
 	
 	g_free (desired_destination);
 	
-	if (*result != GNOME_VFS_OK) {
+	if (*error != NULL) {
 		g_free (destination);
 		destination = NULL;
 	}

Modified: trunk/src/fr-window.c
==============================================================================
--- trunk/src/fr-window.c	(original)
+++ trunk/src/fr-window.c	Thu Apr  3 16:59:33 2008
@@ -27,13 +27,6 @@
 #include <gdk/gdkcursor.h>
 #include <gdk/gdkkeysyms.h>
 #include <libgnomeui/gnome-icon-lookup.h>
-#include <libgnomevfs/gnome-vfs-directory.h>
-#include <libgnomevfs/gnome-vfs-mime.h>
-#include <libgnomevfs/gnome-vfs-mime-handlers.h>
-#include <libgnomevfs/gnome-vfs-monitor.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include <gio/gio.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
@@ -820,8 +813,8 @@
 sort_by_name (gconstpointer  ptr1,
 	      gconstpointer  ptr2)
 {
-	const FileData *fdata1 = *((FileData **) ptr1);
-	const FileData *fdata2 = *((FileData **) ptr2);
+	FileData *fdata1 = *((FileData **) ptr1);
+	FileData *fdata2 = *((FileData **) ptr2);
 
 	if (file_data_is_dir (fdata1) != file_data_is_dir (fdata2)) {
 		if (file_data_is_dir (fdata1))
@@ -838,8 +831,8 @@
 sort_by_size (gconstpointer  ptr1,
 	      gconstpointer  ptr2)
 {
-	const FileData *fdata1 = *((FileData **) ptr1);
-	const FileData *fdata2 = *((FileData **) ptr2);
+	FileData *fdata1 = *((FileData **) ptr1);
+	FileData *fdata2 = *((FileData **) ptr2);
 
 	if (file_data_is_dir (fdata1) != file_data_is_dir (fdata2)) {
 		if (file_data_is_dir (fdata1))
@@ -867,10 +860,10 @@
 sort_by_type (gconstpointer  ptr1,
 	      gconstpointer  ptr2)
 {
-	const FileData *fdata1 = *((FileData **) ptr1);
-	const FileData *fdata2 = *((FileData **) ptr2);
-	int             result;
-	const char     *desc1, *desc2;
+	FileData    *fdata1 = *((FileData **) ptr1);
+	FileData    *fdata2 = *((FileData **) ptr2);
+	int          result;
+	const char  *desc1, *desc2;
 
 	if (file_data_is_dir (fdata1) != file_data_is_dir (fdata2)) {
 		if (file_data_is_dir (fdata1))
@@ -896,8 +889,8 @@
 sort_by_time (gconstpointer  ptr1,
 	      gconstpointer  ptr2)
 {
-	const FileData *fdata1 = *((FileData **) ptr1);
-	const FileData *fdata2 = *((FileData **) ptr2);
+	FileData *fdata1 = *((FileData **) ptr1);
+	FileData *fdata2 = *((FileData **) ptr2);
 
 	if (file_data_is_dir (fdata1) != file_data_is_dir (fdata2)) {
 		if (file_data_is_dir (fdata1))
@@ -921,9 +914,9 @@
 sort_by_path (gconstpointer  ptr1,
 	      gconstpointer  ptr2)
 {
-	const FileData *fdata1 = *((FileData **) ptr1);
-	const FileData *fdata2 = *((FileData **) ptr2);
-	int             result;
+	FileData *fdata1 = *((FileData **) ptr1);
+	FileData *fdata2 = *((FileData **) ptr2);
+	int       result;
 
 	if (file_data_is_dir (fdata1) != file_data_is_dir (fdata2)) {
 		if (file_data_is_dir (fdata1))
@@ -7446,7 +7439,7 @@
 		_gtk_error_dialog_run (GTK_WINDOW (window),
 				       _("Could not perform the operation"),
 				       "%s",
-				       error->messsage);
+				       error->message);
 		g_clear_error (&error);
 	}
 
@@ -7544,7 +7537,7 @@
 
 static void
 open_file_modified_cb (GFileMonitor     *monitor,
-		       GFile            *file,
+		       GFile            *monitor_file,
 		       GFile            *other_file,
 		       GFileMonitorEvent event_type,
 		       gpointer          user_data)
@@ -7560,7 +7553,7 @@
 		return;
 	}
 
-	monitor_uri = g_file_get_uri (file);
+	monitor_uri = g_file_get_uri (monitor_file);
 	file = NULL;
 	for (scan = window->priv->open_files; scan; scan = scan->next) {
 		OpenFile *test = scan->data;
@@ -7590,7 +7583,7 @@
 	file->monitor = g_file_monitor_file (f, 0, NULL, NULL);
 	g_signal_connect (file->monitor, 
 			  "changed",
-			  open_file_modified_cb,
+			  G_CALLBACK (open_file_modified_cb),
 			  window);
 	g_object_unref (f);
 }
@@ -7625,6 +7618,7 @@
         const char *first_mime_type;
         GAppInfo   *app;
         GList      *files_to_open = NULL;
+        GError     *error;
 
 	g_return_val_if_fail (file_list != NULL, FALSE);
 
@@ -7649,7 +7643,7 @@
         
         files_to_open = g_list_append (files_to_open, (char*) first_file);
         
-        if (app->can_open_multiple_files) {
+        if (g_app_info_supports_files (app)) {
         	GList *scan;
         	
 		for (scan = file_list->next; scan; scan = scan->next) {

Modified: trunk/src/fr-window.h
==============================================================================
--- trunk/src/fr-window.h	(original)
+++ trunk/src/fr-window.h	Thu Apr  3 16:59:33 2008
@@ -23,9 +23,9 @@
 #ifndef FR_WINDOW_H
 #define FR_WINDOW_H
 
+#include <gio/gio.h>
 #include <gtk/gtk.h>
 #include <libgnomeui/libgnomeui.h>
-#include <libgnomevfs/gnome-vfs-mime-handlers.h>
 #include "typedefs.h"
 #include "fr-archive.h"
 

Modified: trunk/src/open-file.h
==============================================================================
--- trunk/src/open-file.h	(original)
+++ trunk/src/open-file.h	Thu Apr  3 16:59:33 2008
@@ -25,8 +25,8 @@
 
 #include <glib.h>
 #include <glib-object.h>
+#include <gio/gio.h>
 #include <time.h>
-#include <libgnomevfs/gnome-vfs-monitor.h>
 
 typedef struct {
 	char         *path;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]