anjuta r3636 - in trunk: . plugins/file-manager

[jhs svn gnome org]

Author: jhs
Date: Mon Feb 11 20:47:08 2008
New Revision: 3636
URL: http://svn.gnome.org/viewvc/anjuta?rev=3636&view=rev

Log:
2008-02-11  Johannes Schmid <jhs gnome org>

	* plugins/file-manager/file-model.c: (file_model_expand_idle):
	#515867 â Anjuta dies on startup

Modified:
   trunk/ChangeLog
   trunk/plugins/file-manager/file-model.c

Modified: trunk/plugins/file-manager/file-model.c
==============================================================================
--- trunk/plugins/file-manager/file-model.c	(original)
+++ trunk/plugins/file-manager/file-model.c	Mon Feb 11 20:47:08 2008
@@ -165,7 +165,7 @@
 		GList* file = expand->files;
 		GnomeVFSFileInfo* info = (GnomeVFSFileInfo*) file->data;
 		GtkTreeIter new_iter;
-		GdkPixbuf* pixbuf;
+		GdkPixbuf* pixbuf = NULL;
 		gboolean directory = FALSE;
 		
 		/* Set pointer to the next element */
@@ -181,11 +181,12 @@
 		const gchar* mime_type = gnome_vfs_file_info_get_mime_type (info);
 		gchar* uri = g_build_filename (expand->uri, info->name, NULL);
 		
-		pixbuf = gdl_icons_get_mime_icon (priv->icons, mime_type);
+		if (pixbuf)
+		  pixbuf = gdl_icons_get_mime_icon (priv->icons, mime_type);
 		
 		gtk_tree_store_append (store, &new_iter, &parent);
 		
-		if (g_str_equal (mime_type, DIRECTORY_MIME_TYPE))
+		if (mime_type && g_str_equal (mime_type, DIRECTORY_MIME_TYPE))
 		{
 			file_model_add_dummy (model, &new_iter);
 			directory = TRUE;