GNOME.org
 

file-roller r2364 - in trunk: . src

Author: paobac
Date: Sun Jul 13 07:17:31 2008
New Revision: 2364
URL: http://svn.gnome.org/viewvc/file-roller?rev=2364&view=rev

Log:
2008-07-13  Paolo Bacchilega  <paobac svn gnome org>

	* src/typedefs.h: 
	* src/actions.c: 
	* src/dlg-batch-add.c: 
	* src/fr-archive.c: 
	* src/fr-command.c: 
	* src/fr-command-7z.c: 
	* src/fr-command-ace.c: 
	* src/fr-command-alz.c: 
	* src/fr-command-ar.c: 
	* src/fr-command-arj.c: 
	* src/fr-command-cfile.c: 
	* src/fr-command-cpio.c: 
	* src/fr-command-iso.c: 
	* src/fr-command-jar.c: 
	* src/fr-command-lha.c: 
	* src/fr-command-rar.c: 
	* src/fr-command-rpm.c: 
	* src/fr-command-tar.c: 
	* src/fr-command-unstuff.c: 
	* src/fr-command-zip.c: 
	* src/fr-command-zoo.c: 
	
	Renamed the FrCommandCap values.
	
	* src/gtk-utils.c (get_icon_pixbuf): use 'text-x-generic' for unknown 
	file types.
	
	* TODO: updated.

Modified:
   trunk/ChangeLog
   trunk/TODO
   trunk/src/actions.c
   trunk/src/dlg-batch-add.c
   trunk/src/fr-archive.c
   trunk/src/fr-command-7z.c
   trunk/src/fr-command-ace.c
   trunk/src/fr-command-alz.c
   trunk/src/fr-command-ar.c
   trunk/src/fr-command-arj.c
   trunk/src/fr-command-cfile.c
   trunk/src/fr-command-cpio.c
   trunk/src/fr-command-iso.c
   trunk/src/fr-command-jar.c
   trunk/src/fr-command-lha.c
   trunk/src/fr-command-rar.c
   trunk/src/fr-command-rpm.c
   trunk/src/fr-command-tar.c
   trunk/src/fr-command-unstuff.c
   trunk/src/fr-command-zip.c
   trunk/src/fr-command-zoo.c
   trunk/src/fr-command.c
   trunk/src/gtk-utils.c
   trunk/src/main.c
   trunk/src/typedefs.h

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Sun Jul 13 07:17:31 2008
@@ -12,6 +12,8 @@
 
 [ ] #482560 â totem-like plugin installer for file-roller
 
+[ ] #153281 â Progress bar should be exact
+
 == Done ==
 
 [x] #521324 â ALZ archive support

Modified: trunk/src/actions.c
==============================================================================
--- trunk/src/actions.c	(original)
+++ trunk/src/actions.c	Sun Jul 13 07:17:31 2008
@@ -313,8 +313,8 @@
 
 	for (i = 0; mime_type_desc[i].mime_type != NULL; i++) {
 		if (strcmp (mime_type_desc[i].default_ext, ext) == 0) {
-			gtk_widget_set_sensitive (data->password, mime_type_desc[i].capabilities & FR_COMMAND_CAP_ENCRYPT);
-			gtk_widget_set_sensitive (data->password_label, mime_type_desc[i].capabilities & FR_COMMAND_CAP_ENCRYPT);
+			gtk_widget_set_sensitive (data->password, mime_type_desc[i].capabilities & FR_COMMAND_CAN_ENCRYPT);
+			gtk_widget_set_sensitive (data->password_label, mime_type_desc[i].capabilities & FR_COMMAND_CAN_ENCRYPT);
 			break;
 		}
 	}

Modified: trunk/src/dlg-batch-add.c
==============================================================================
--- trunk/src/dlg-batch-add.c	(original)
+++ trunk/src/dlg-batch-add.c	Sun Jul 13 07:17:31 2008
@@ -110,7 +110,7 @@
 		save_type_list =  save_type;
 
 	idx = gtk_combo_box_get_active (GTK_COMBO_BOX (data->a_archive_type_combo_box));
-	if (mime_type_desc[save_type_list[idx]].capabilities & FR_COMMAND_CAP_ENCRYPT) {
+	if (mime_type_desc[save_type_list[idx]].capabilities & FR_COMMAND_CAN_ENCRYPT) {
 		char *pwd;
 
 		pwd = (char*) gtk_entry_get_text (GTK_ENTRY (data->a_password_entry));
@@ -118,7 +118,7 @@
 			pwd = g_strstrip (pwd);
 			if (strcmp (pwd, "") != 0) {
 				fr_window_set_password (data->window, pwd);
-				if (mime_type_desc[save_type_list[idx]].capabilities & FR_COMMAND_CAP_ENCRYPT_HEADER)
+				if (mime_type_desc[save_type_list[idx]].capabilities & FR_COMMAND_CAN_ENCRYPT_HEADER)
 					fr_window_set_encrypt_header (data->window, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->a_encrypt_header_checkbutton)));
 			}
 		}
@@ -370,9 +370,9 @@
 
 	for (i = 0; mime_type_desc[i].mime_type != NULL; i++) {
 		if (strcmp (mime_type_desc[i].mime_type, mime_type) == 0) {
-			gtk_widget_set_sensitive (data->a_password_entry, mime_type_desc[i].capabilities & FR_COMMAND_CAP_ENCRYPT);
-			gtk_widget_set_sensitive (data->a_password_label, mime_type_desc[i].capabilities & FR_COMMAND_CAP_ENCRYPT);
-			gtk_widget_set_sensitive (data->a_encrypt_header_checkbutton, mime_type_desc[i].capabilities & FR_COMMAND_CAP_ENCRYPT_HEADER);
+			gtk_widget_set_sensitive (data->a_password_entry, mime_type_desc[i].capabilities & FR_COMMAND_CAN_ENCRYPT);
+			gtk_widget_set_sensitive (data->a_password_label, mime_type_desc[i].capabilities & FR_COMMAND_CAN_ENCRYPT);
+			gtk_widget_set_sensitive (data->a_encrypt_header_checkbutton, mime_type_desc[i].capabilities & FR_COMMAND_CAN_ENCRYPT_HEADER);
 			break;
 		}
 	}

Modified: trunk/src/fr-archive.c
==============================================================================
--- trunk/src/fr-archive.c	(original)
+++ trunk/src/fr-archive.c	Sun Jul 13 07:17:31 2008
@@ -570,7 +570,7 @@
 			       const char *mime_type,
 			       gboolean    loading)
 {
-	FrCommandCaps  requested_capabilities = FR_COMMAND_CAP_NONE;
+	FrCommandCaps  requested_capabilities = FR_COMMAND_CAN_DO_NOTHING;
 	GType          command_type;
 	char          *filename;
 
@@ -583,16 +583,16 @@
 	 * priority to the commands that can read and write over commands
 	 * that can only read a specific file format. */
 
-	requested_capabilities |= FR_COMMAND_CAP_READ_WRITE;
+	requested_capabilities |= FR_COMMAND_CAN_READ_WRITE;
 	if (! loading && ! archive->can_create_compressed_file)
-		requested_capabilities |= FR_COMMAND_CAP_ARCHIVE_MANY_FILES;
+		requested_capabilities |= FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 	command_type = get_command_type_from_mime_type (mime_type, requested_capabilities);
 
 	/* if no command was found and we are loading, remove the write
 	 * capability and try again */
 
 	if ((command_type == 0) && loading) {
-		requested_capabilities ^= FR_COMMAND_CAP_WRITE;
+		requested_capabilities ^= FR_COMMAND_CAN_WRITE;
 		command_type = get_command_type_from_mime_type (mime_type, requested_capabilities);
 	}
 
@@ -612,7 +612,7 @@
 		archive->command = NULL;
 	}
 	else if (archive->command != NULL)
-		archive->is_compressed_file = ! fr_command_is_capable_of (archive->command, FR_COMMAND_CAP_ARCHIVE_MANY_FILES);
+		archive->is_compressed_file = ! fr_command_is_capable_of (archive->command, FR_COMMAND_CAN_ARCHIVE_MANY_FILES);
 
 	return (archive->command != NULL);
 }
@@ -1045,7 +1045,7 @@
 
 	archive->content_type = mime_type;
 
-	if (! fr_command_is_capable_of (archive->command, FR_COMMAND_CAP_WRITE))
+	if (! fr_command_is_capable_of (archive->command, FR_COMMAND_CAN_WRITE))
 		archive->read_only = TRUE;
 
 	g_signal_connect (G_OBJECT (archive->command),

Modified: trunk/src/fr-command-7z.c
==============================================================================
--- trunk/src/fr-command-7z.c	(original)
+++ trunk/src/fr-command-7z.c	Sun Jul 13 07:17:31 2008
@@ -414,20 +414,20 @@
 {
 	FrCommandCap capabilities;
 
-	capabilities = FR_COMMAND_CAP_ARCHIVE_MANY_FILES;
+	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 	if (! is_program_in_path ("7za") && ! is_program_in_path ("7zr") && ! is_program_in_path ("7z"))
 		return capabilities;
 
 	if (is_mime_type (mime_type, "application/x-7z-compressed"))
-		capabilities |= FR_COMMAND_CAP_READ_WRITE | FR_COMMAND_CAP_ENCRYPT | FR_COMMAND_CAP_ENCRYPT_HEADER;
+		capabilities |= FR_COMMAND_CAN_READ_WRITE | FR_COMMAND_CAN_ENCRYPT | FR_COMMAND_CAN_ENCRYPT_HEADER;
 
 	else if (is_program_in_path ("7z")) {
-		capabilities |= FR_COMMAND_CAP_READ;
+		capabilities |= FR_COMMAND_CAN_READ;
 		if (is_mime_type (mime_type, "application/x-cbz")
 		    || is_mime_type (mime_type, "application/x-executable")
 		    || is_mime_type (mime_type, "application/zip"))
 		{
-			capabilities |= FR_COMMAND_CAP_WRITE | FR_COMMAND_CAP_ENCRYPT;
+			capabilities |= FR_COMMAND_CAN_WRITE | FR_COMMAND_CAN_ENCRYPT;
 		}
 	}
 

Modified: trunk/src/fr-command-ace.c
==============================================================================
--- trunk/src/fr-command-ace.c	(original)
+++ trunk/src/fr-command-ace.c	Sun Jul 13 07:17:31 2008
@@ -247,9 +247,9 @@
 {
 	FrCommandCap capabilities;
 	
-	capabilities = FR_COMMAND_CAP_ARCHIVE_MANY_FILES;
+	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 	if (is_program_in_path ("unace")) 
-		capabilities |= FR_COMMAND_CAP_READ;
+		capabilities |= FR_COMMAND_CAN_READ;
 		
 	return capabilities;
 }

Modified: trunk/src/fr-command-alz.c
==============================================================================
--- trunk/src/fr-command-alz.c	(original)
+++ trunk/src/fr-command-alz.c	Sun Jul 13 07:17:31 2008
@@ -309,9 +309,9 @@
 {
 	FrCommandCap capabilities;
 	
-	capabilities = FR_COMMAND_CAP_ARCHIVE_MANY_FILES;
+	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 	if (is_program_in_path ("unalz")) 
-		capabilities |= FR_COMMAND_CAP_READ;
+		capabilities |= FR_COMMAND_CAN_READ;
 		
 	return capabilities;
 }

Modified: trunk/src/fr-command-ar.c
==============================================================================
--- trunk/src/fr-command-ar.c	(original)
+++ trunk/src/fr-command-ar.c	Sun Jul 13 07:17:31 2008
@@ -296,9 +296,9 @@
 {
 	FrCommandCap capabilities;
 	
-	capabilities = FR_COMMAND_CAP_ARCHIVE_MANY_FILES;
+	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 	if (is_program_in_path ("ar")) 
-		capabilities |= FR_COMMAND_CAP_READ_WRITE;
+		capabilities |= FR_COMMAND_CAN_READ_WRITE;
 		
 	return capabilities;
 }

Modified: trunk/src/fr-command-arj.c
==============================================================================
--- trunk/src/fr-command-arj.c	(original)
+++ trunk/src/fr-command-arj.c	Sun Jul 13 07:17:31 2008
@@ -336,9 +336,9 @@
 {
 	FrCommandCap capabilities;
 
-	capabilities = FR_COMMAND_CAP_ARCHIVE_MANY_FILES | FR_COMMAND_CAP_ENCRYPT;
+	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES | FR_COMMAND_CAN_ENCRYPT;
 	if (is_program_in_path ("arj"))
-		capabilities |= FR_COMMAND_CAP_READ_WRITE;
+		capabilities |= FR_COMMAND_CAN_READ_WRITE;
 
 	return capabilities;
 }

Modified: trunk/src/fr-command-cfile.c
==============================================================================
--- trunk/src/fr-command-cfile.c	(original)
+++ trunk/src/fr-command-cfile.c	Sun Jul 13 07:17:31 2008
@@ -447,32 +447,32 @@
 {
 	FrCommandCap capabilities;
 	
-	capabilities = FR_COMMAND_CAP_NONE;
+	capabilities = FR_COMMAND_CAN_DO_NOTHING;
 	if (is_mime_type (mime_type, "application/x-gzip")) {
 		if (is_program_in_path ("gzip"))
-			capabilities |= FR_COMMAND_CAP_READ_WRITE;
+			capabilities |= FR_COMMAND_CAN_READ_WRITE;
 	}
 	else if (is_mime_type (mime_type, "application/x-bzip")) {
 		if (is_program_in_path ("bzip2"))
-			capabilities |= FR_COMMAND_CAP_READ_WRITE;
+			capabilities |= FR_COMMAND_CAN_READ_WRITE;
 	}
 	else if (is_mime_type (mime_type, "application/x-compress")) {
 		if (is_program_in_path ("compress"))
-			capabilities |= FR_COMMAND_CAP_WRITE;
+			capabilities |= FR_COMMAND_CAN_WRITE;
 		if (is_program_in_path ("uncompress"))
-			capabilities |= FR_COMMAND_CAP_READ;
+			capabilities |= FR_COMMAND_CAN_READ;
 	}
 	else if (is_mime_type (mime_type, "application/x-lzma")) {
 		if (is_program_in_path ("lzma"))
-			capabilities |= FR_COMMAND_CAP_READ_WRITE;
+			capabilities |= FR_COMMAND_CAN_READ_WRITE;
 	}
 	else if (is_mime_type (mime_type, "application/x-lzop")) {
 		if (is_program_in_path ("lzop"))
-			capabilities |= FR_COMMAND_CAP_READ_WRITE;
+			capabilities |= FR_COMMAND_CAN_READ_WRITE;
 	}
 	else if (is_mime_type (mime_type, "application/x-rzip")) {
 		if (is_program_in_path ("rzip"))
-			capabilities |= FR_COMMAND_CAP_READ_WRITE;
+			capabilities |= FR_COMMAND_CAN_READ_WRITE;
 	}
 	
 	return capabilities;

Modified: trunk/src/fr-command-cpio.c
==============================================================================
--- trunk/src/fr-command-cpio.c	(original)
+++ trunk/src/fr-command-cpio.c	Sun Jul 13 07:17:31 2008
@@ -245,9 +245,9 @@
 {
 	FrCommandCap capabilities;
 	
-	capabilities = FR_COMMAND_CAP_ARCHIVE_MANY_FILES;
+	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 	if (is_program_in_path ("cpio")) 
-		capabilities |= FR_COMMAND_CAP_READ;
+		capabilities |= FR_COMMAND_CAN_READ;
 		
 	return capabilities;
 }

Modified: trunk/src/fr-command-iso.c
==============================================================================
--- trunk/src/fr-command-iso.c	(original)
+++ trunk/src/fr-command-iso.c	Sun Jul 13 07:17:31 2008
@@ -214,9 +214,9 @@
 {
 	FrCommandCap capabilities;
 	
-	capabilities = FR_COMMAND_CAP_ARCHIVE_MANY_FILES;
+	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 	if (is_program_in_path ("isoinfo")) 
-		capabilities |= FR_COMMAND_CAP_READ;
+		capabilities |= FR_COMMAND_CAN_READ;
 		
 	return capabilities;
 }

Modified: trunk/src/fr-command-jar.c
==============================================================================
--- trunk/src/fr-command-jar.c	(original)
+++ trunk/src/fr-command-jar.c	Sun Jul 13 07:17:31 2008
@@ -164,9 +164,9 @@
 {
 	FrCommandCap capabilities;
 
-	capabilities = FR_COMMAND_CAP_ARCHIVE_MANY_FILES;
+	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 	if (is_program_in_path ("zip"))
-		capabilities |= FR_COMMAND_CAP_READ_WRITE;
+		capabilities |= FR_COMMAND_CAN_READ_WRITE;
 
 	return capabilities;
 }

Modified: trunk/src/fr-command-lha.c
==============================================================================
--- trunk/src/fr-command-lha.c	(original)
+++ trunk/src/fr-command-lha.c	Sun Jul 13 07:17:31 2008
@@ -320,9 +320,9 @@
 {
 	FrCommandCap capabilities;
 	
-	capabilities = FR_COMMAND_CAP_ARCHIVE_MANY_FILES;
+	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 	if (is_program_in_path ("lha")) 
-		capabilities |= FR_COMMAND_CAP_READ_WRITE;
+		capabilities |= FR_COMMAND_CAN_READ_WRITE;
 		
 	return capabilities;
 }

Modified: trunk/src/fr-command-rar.c
==============================================================================
--- trunk/src/fr-command-rar.c	(original)
+++ trunk/src/fr-command-rar.c	Sun Jul 13 07:17:31 2008
@@ -405,11 +405,11 @@
 {
 	FrCommandCap capabilities;
 
-	capabilities = FR_COMMAND_CAP_ARCHIVE_MANY_FILES | FR_COMMAND_CAP_ENCRYPT | FR_COMMAND_CAP_ENCRYPT_HEADER;
+	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES | FR_COMMAND_CAN_ENCRYPT | FR_COMMAND_CAN_ENCRYPT_HEADER;
 	if (is_program_in_path ("rar"))
-		capabilities |= FR_COMMAND_CAP_READ_WRITE;
+		capabilities |= FR_COMMAND_CAN_READ_WRITE;
 	else if (is_program_in_path ("unrar"))
-		capabilities |= FR_COMMAND_CAP_READ;
+		capabilities |= FR_COMMAND_CAN_READ;
 
 	return capabilities;
 }

Modified: trunk/src/fr-command-rpm.c
==============================================================================
--- trunk/src/fr-command-rpm.c	(original)
+++ trunk/src/fr-command-rpm.c	Sun Jul 13 07:17:31 2008
@@ -217,9 +217,9 @@
 {
 	FrCommandCap capabilities;
 	
-	capabilities = FR_COMMAND_CAP_ARCHIVE_MANY_FILES;
+	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 	if (is_program_in_path ("rpm2cpio")) 
-		capabilities |= FR_COMMAND_CAP_READ;
+		capabilities |= FR_COMMAND_CAN_READ;
 		
 	return capabilities;
 }

Modified: trunk/src/fr-command-tar.c
==============================================================================
--- trunk/src/fr-command-tar.c	(original)
+++ trunk/src/fr-command-tar.c	Sun Jul 13 07:17:31 2008
@@ -817,36 +817,36 @@
 {
 	FrCommandCap capabilities;
 	
-	capabilities = FR_COMMAND_CAP_ARCHIVE_MANY_FILES;
+	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 	
 	/* In solaris gtar is present under /usr/sfw/bin */
 	if (! is_program_in_path ("tar") && ! is_program_in_path ("/usr/sfw/bin/gtar")) 
 		return capabilities;
 
 	if (is_mime_type (mime_type, "application/x-tar")) {
-		capabilities |= FR_COMMAND_CAP_READ_WRITE;
+		capabilities |= FR_COMMAND_CAN_READ_WRITE;
 	}
 	else if (is_mime_type (mime_type, "application/x-compressed-tar")) {
 		if (is_program_in_path ("gzip"))
-			capabilities |= FR_COMMAND_CAP_READ_WRITE;
+			capabilities |= FR_COMMAND_CAN_READ_WRITE;
 	}
 	else if (is_mime_type (mime_type, "application/x-bzip-compressed-tar")) {
 		if (is_program_in_path ("bzip2"))
-			capabilities |= FR_COMMAND_CAP_READ_WRITE;
+			capabilities |= FR_COMMAND_CAN_READ_WRITE;
 	}
 	else if (is_mime_type (mime_type, "application/x-tarz")) {
 		if (is_program_in_path ("compress"))
-			capabilities |= FR_COMMAND_CAP_WRITE;
+			capabilities |= FR_COMMAND_CAN_WRITE;
 		if (is_program_in_path ("uncompress"))
-			capabilities |= FR_COMMAND_CAP_READ;
+			capabilities |= FR_COMMAND_CAN_READ;
 	}
 	else if (is_mime_type (mime_type, "application/x-lzma-compressed-tar")) {
 		if (is_program_in_path ("lzma"))
-			capabilities |= FR_COMMAND_CAP_READ_WRITE;
+			capabilities |= FR_COMMAND_CAN_READ_WRITE;
 	}
 	else if (is_mime_type (mime_type, "application/x-lzop-compressed-tar")) {
 		if (is_program_in_path ("lzop"))
-			capabilities |= FR_COMMAND_CAP_READ_WRITE;
+			capabilities |= FR_COMMAND_CAN_READ_WRITE;
 	}
 	else if (is_mime_type (mime_type, "application/x-7z-compressed-tar")) {
 		char *try_command[3] = { "7za", "7zr", "7z" };
@@ -854,7 +854,7 @@
 		
 		for (i = 0; i < G_N_ELEMENTS (try_command); i++) {
 			if (is_program_in_path (try_command[i])) {
-				capabilities |= FR_COMMAND_CAP_READ_WRITE;
+				capabilities |= FR_COMMAND_CAN_READ_WRITE;
 				break;
 			}
 		}

Modified: trunk/src/fr-command-unstuff.c
==============================================================================
--- trunk/src/fr-command-unstuff.c	(original)
+++ trunk/src/fr-command-unstuff.c	Sun Jul 13 07:17:31 2008
@@ -283,9 +283,9 @@
 {
 	FrCommandCap capabilities;
 	
-	capabilities = FR_COMMAND_CAP_ARCHIVE_MANY_FILES;
+	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 	if (is_program_in_path ("unstuff")) 
-		capabilities |= FR_COMMAND_CAP_READ;
+		capabilities |= FR_COMMAND_CAN_READ;
 		
 	return capabilities;
 }

Modified: trunk/src/fr-command-zip.c
==============================================================================
--- trunk/src/fr-command-zip.c	(original)
+++ trunk/src/fr-command-zip.c	Sun Jul 13 07:17:31 2008
@@ -378,15 +378,15 @@
 {
 	FrCommandCap capabilities;
 
-	capabilities = FR_COMMAND_CAP_ARCHIVE_MANY_FILES | FR_COMMAND_CAP_ENCRYPT;
+	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES | FR_COMMAND_CAN_ENCRYPT;
 	if (is_program_in_path ("zip")) {
 		if (strcmp (mime_type, "application/x-executable") == 0)
-			capabilities |= FR_COMMAND_CAP_READ;
+			capabilities |= FR_COMMAND_CAN_READ;
 		else
-			capabilities |= FR_COMMAND_CAP_READ_WRITE;
+			capabilities |= FR_COMMAND_CAN_READ_WRITE;
 	}
 	else if (is_program_in_path ("unzip"))
-		capabilities |= FR_COMMAND_CAP_READ;
+		capabilities |= FR_COMMAND_CAN_READ;
 
 	return capabilities;
 }

Modified: trunk/src/fr-command-zoo.c
==============================================================================
--- trunk/src/fr-command-zoo.c	(original)
+++ trunk/src/fr-command-zoo.c	Sun Jul 13 07:17:31 2008
@@ -340,9 +340,9 @@
 {
 	FrCommandCap capabilities;
 
-	capabilities = FR_COMMAND_CAP_ARCHIVE_MANY_FILES;
+	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 	if (is_program_in_path ("zoo"))
-		capabilities |= FR_COMMAND_CAP_READ_WRITE;
+		capabilities |= FR_COMMAND_CAN_READ_WRITE;
 
 	return capabilities;
 }

Modified: trunk/src/fr-command.c
==============================================================================
--- trunk/src/fr-command.c	(original)
+++ trunk/src/fr-command.c	Sun Jul 13 07:17:31 2008
@@ -178,7 +178,7 @@
 base_fr_command_get_capabilities (FrCommand  *comm,
 			          const char *mime_type)
 {
-	return FR_COMMAND_CAP_NONE;
+	return FR_COMMAND_CAN_DO_NOTHING;
 }
 
 

Modified: trunk/src/gtk-utils.c
==============================================================================
--- trunk/src/gtk-utils.c	(original)
+++ trunk/src/gtk-utils.c	Sun Jul 13 07:17:31 2008
@@ -806,8 +806,8 @@
 	g_object_get (icon, "names", &icon_names, NULL);
 
 	icon_info = gtk_icon_theme_choose_icon (icon_theme, (const char **)icon_names, size, 0);
-	if (icon_info == NULL) 
-		icon_info = gtk_icon_theme_lookup_icon (icon_theme, "folder", size, GTK_ICON_LOOKUP_USE_BUILTIN);
+	if (icon_info == NULL)
+		icon_info = gtk_icon_theme_lookup_icon (icon_theme, "text-x-generic", size, GTK_ICON_LOOKUP_USE_BUILTIN);
 
 	pixbuf = gtk_icon_info_load_icon (icon_info, &error);
 	if (pixbuf == NULL) {

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Sun Jul 13 07:17:31 2008
@@ -478,7 +478,7 @@
 			return cap->capabilities;
 	}
 
-	return FR_COMMAND_CAP_NONE;
+	return FR_COMMAND_CAN_DO_NOTHING;
 }
 
 
@@ -653,12 +653,12 @@
 				continue;
 			}
 			mime_type_desc[idx].capabilities |= cap->capabilities;
-			if (cap->capabilities & FR_COMMAND_CAP_READ)
+			if (cap->capabilities & FR_COMMAND_CAN_READ)
 				add_if_non_present (open_type, &o_i, idx);
-			if (cap->capabilities & FR_COMMAND_CAP_WRITE) {
-				if (cap->capabilities & FR_COMMAND_CAP_ARCHIVE_MANY_FILES) {
+			if (cap->capabilities & FR_COMMAND_CAN_WRITE) {
+				if (cap->capabilities & FR_COMMAND_CAN_ARCHIVE_MANY_FILES) {
 					add_if_non_present (save_type, &s_i, idx);
-					if (cap->capabilities & FR_COMMAND_CAP_WRITE)
+					if (cap->capabilities & FR_COMMAND_CAN_WRITE)
 						add_if_non_present (create_type, &c_i, idx);
 				}
 				add_if_non_present (single_file_save_type, &sf_i, idx);

Modified: trunk/src/typedefs.h
==============================================================================
--- trunk/src/typedefs.h	(original)
+++ trunk/src/typedefs.h	Sun Jul 13 07:17:31 2008
@@ -70,15 +70,15 @@
 } FrProcError;
 
 typedef enum {
-	FR_COMMAND_CAP_NONE = 0,
-	FR_COMMAND_CAP_READ = 1 << 0,
-	FR_COMMAND_CAP_WRITE = 1 << 1,
-	FR_COMMAND_CAP_ARCHIVE_MANY_FILES = 1 << 2,
-	FR_COMMAND_CAP_ENCRYPT = 1 << 3,
-	FR_COMMAND_CAP_ENCRYPT_HEADER = 1 << 4
+	FR_COMMAND_CAN_DO_NOTHING = 0,
+	FR_COMMAND_CAN_READ = 1 << 0,
+	FR_COMMAND_CAN_WRITE = 1 << 1,
+	FR_COMMAND_CAN_ARCHIVE_MANY_FILES = 1 << 2,
+	FR_COMMAND_CAN_ENCRYPT = 1 << 3,
+	FR_COMMAND_CAN_ENCRYPT_HEADER = 1 << 4
 } FrCommandCap;
 
-#define FR_COMMAND_CAP_READ_WRITE (FR_COMMAND_CAP_READ | FR_COMMAND_CAP_WRITE)
+#define FR_COMMAND_CAN_READ_WRITE (FR_COMMAND_CAN_READ | FR_COMMAND_CAN_WRITE)
 
 typedef guint8 FrCommandCaps;
 
@@ -105,11 +105,4 @@
 	const char *mime_type;
 } FrExtensionType;
 
-typedef struct {
-	char       *command;
-	const char *mime_type;
-	gboolean    can_open;
-	gboolean    can_save;
-} FrCommandDescription;
-
 #endif /* TYPEDEFS_H */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]