[Xfce4-commits] r25949 - xarchiver/trunk/src

[Giuseppe Torelli]

Author: colossus
Date: 2007-08-01 13:15:29 +0000 (Wed, 01 Aug 2007)
New Revision: 25949

Modified:
   xarchiver/trunk/src/archive.c
   xarchiver/trunk/src/mime.c
   xarchiver/trunk/src/window.c
Log:
Updated icons with tar.gz and tar.bz2 icons.
Fized wrong icon for .ogg and .flac.


Modified: xarchiver/trunk/src/archive.c
===================================================================
--- xarchiver/trunk/src/archive.c	2007-08-01 12:48:16 UTC (rev 25948)
+++ xarchiver/trunk/src/archive.c	2007-08-01 13:15:29 UTC (rev 25949)
@@ -386,10 +386,9 @@
 				child_entry->filename = g_strdup(full_path_name);
 				child_entry->columns = xa_fill_archive_entry_columns_for_each_row(archive,child_entry,items);
 				child_entry->is_dir = TRUE;
-				g_print ("%s in %x è %d\n",child_entry->filename,child_entry,child_entry->is_dir);
+
 				child_entry->next = last_entry->child;
 				last_entry->child = child_entry;
-				//this entry, last_entry->child, contains all the dirs
 			}
 			g_free(full_path_name);
 			last_entry = child_entry;

Modified: xarchiver/trunk/src/mime.c
===================================================================
--- xarchiver/trunk/src/mime.c	2007-08-01 12:48:16 UTC (rev 25948)
+++ xarchiver/trunk/src/mime.c	2007-08-01 13:15:29 UTC (rev 25949)
@@ -26,8 +26,10 @@
 	const char *icon_name = "binary";
 
 	mime = xdg_mime_get_mime_type_from_file_name(filename);
-	//g_print ("%s\t%s\n",filename,mime);
-	if (strncmp(mime,"image/",6) == 0)
+	g_print ("%s\t%s\n",filename,mime);
+	if (strstr(filename,".ogg") || strstr(filename,".flac") )
+		icon_name = "sound";
+	else if (strncmp(mime,"image/",6) == 0)
 		icon_name = "image";
 	else if (strcmp(mime,"text/html") == 0)
 		icon_name = "html";
@@ -40,7 +42,8 @@
 	else if (strcmp(mime,"application/vnd.ms-excel") == 0)
 		icon_name = "gnome-mime-application-vnd.ms-excel";
 	else if (strcmp(mime,"application/zip") == 0 || strcmp(mime,"application/x-rar") == 0 || strcmp(mime,"application/x-tar") == 0
-		|| strcmp(mime,"application/x-7z-compressed") == 0)
+		|| strcmp(mime,"application/x-7z-compressed") == 0 || strcmp(mime,"application/x-bzip-compressed-tar") == 0
+		|| strcmp (mime,"application/x-compressed-tar") == 0 )
 		icon_name = "package";
 	else if (strcmp(mime,"application/x-shockwave-flash") == 0 || strcmp(mime,"video/mpeg") == 0 || strcmp(mime,"video/quicktime") == 0
 		|| strcmp(mime,"video/x-msvideo") == 0)
@@ -51,7 +54,8 @@
 		icon_name = "gnome-mime-application-x-php";
 	else if (strcmp(mime,"application/x-perl") == 0 || strcmp (mime,"application/x-csh") == 0 || strcmp (mime,"application/x-shellscript") == 0)
 		icon_name = "gnome-mime-application-x-perl";
-
+	else if (strcmp(mime,"application/vnd.ms-powerpoint") == 0)
+		icon_name = "gnome-mime-application-vnd.ms-powerpoint";
 	return icon_name;		
 }
 

Modified: xarchiver/trunk/src/window.c
===================================================================
--- xarchiver/trunk/src/window.c	2007-08-01 12:48:16 UTC (rev 25948)
+++ xarchiver/trunk/src/window.c	2007-08-01 13:15:29 UTC (rev 25949)
@@ -1164,6 +1164,8 @@
 	/* First column: icon + text */
 	column = gtk_tree_view_column_new();
 	renderer = gtk_cell_renderer_pixbuf_new();
+	//GTK_ICON_SIZE_SMALL_TOOLBAR = 2;
+	//GTK_ICON_SIZE_LARGE_TOOLBAR = 3;
 	g_object_set(G_OBJECT(renderer), "stock-size", GTK_ICON_SIZE_SMALL_TOOLBAR, NULL);
 	gtk_tree_view_column_pack_start(column, renderer, FALSE);
 	gtk_tree_view_column_set_attributes(column, renderer, "icon-name",0,NULL);