file-roller r2412 - in trunk: . src

[paobac svn gnome org]

Author: paobac
Date: Sat Aug  9 06:31:40 2008
New Revision: 2412
URL: http://svn.gnome.org/viewvc/file-roller?rev=2412&view=rev

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

	* src/file-utils.h: 
	
	Fixed bug #546978 â wrong icon for folders
	Patch by Matthias Clasen.
	
	* src/dlg-open-with.c: 
	
	Fixed bug #547017 â segfault in "Open with"
	Patch by Matthias Clasen.


Modified:
   trunk/ChangeLog
   trunk/TODO
   trunk/src/dlg-open-with.c
   trunk/src/file-utils.h

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Sat Aug  9 06:31:40 2008
@@ -26,3 +26,5 @@
 [?] #501660 â File-roller nautilus extension creates tarbombs
 
 [x] #503940 â Various Archive Manager documentation mistakes
+
+[ ] http://ubuntuforums.org/showthread.php?t=882771

Modified: trunk/src/dlg-open-with.c
==============================================================================
--- trunk/src/dlg-open-with.c	(original)
+++ trunk/src/dlg-open-with.c	Sat Aug  9 06:31:40 2008
@@ -410,6 +410,9 @@
 			icon_image = get_icon_pixbuf (theme, G_THEMED_ICON (icon), icon_size);
 			g_object_unref (icon);
 		}
+		else {
+			icon_image = NULL;
+		}
 		
 		gtk_list_store_append (GTK_LIST_STORE (data->app_model),
 				       &iter);

Modified: trunk/src/file-utils.h
==============================================================================
--- trunk/src/file-utils.h	(original)
+++ trunk/src/file-utils.h	Sat Aug  9 06:31:40 2008
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include <gio/gio.h>
 
-#define MIME_TYPE_DIRECTORY "gnome-fs-directory"
+#define MIME_TYPE_DIRECTORY "folder"
 #define MIME_TYPE_ARCHIVE "application/x-archive"
 
 #define get_home_relative_path(x)        \