brasero r750 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Mon Apr 21 18:34:44 2008
New Revision: 750
URL: http://svn.gnome.org/viewvc/brasero?rev=750&view=rev

Log:
	Last patch (hopefully) to fix mimetype icons

	* src/brasero-audio-disc.c
	(brasero_audio_disc_set_row_from_metadata):
	* src/brasero-data-tree-model.c
	(brasero_data_tree_model_get_value):
	* src/brasero-mime-filter.c (brasero_mime_filter_add_mime):
	* src/brasero-search-beagle.c (brasero_search_add_hit_to_tree):
	* src/brasero-utils.h:


Modified:
   trunk/ChangeLog
   trunk/src/brasero-audio-disc.c
   trunk/src/brasero-data-tree-model.c
   trunk/src/brasero-mime-filter.c
   trunk/src/brasero-project-size.c
   trunk/src/brasero-search-beagle.c
   trunk/src/brasero-utils.h

Modified: trunk/src/brasero-audio-disc.c
==============================================================================
--- trunk/src/brasero-audio-disc.c	(original)
+++ trunk/src/brasero-audio-disc.c	Mon Apr 21 18:34:44 2008
@@ -1153,7 +1153,7 @@
 					  GtkTreeIter *iter,
 					  GFileInfo *info)
 {
-	const gchar *icon_string = NULL;
+	const gchar *icon_string = BRASERO_DEFAULT_ICON;
 	gint64 current_length;
 	GtkTreeIter gap_iter;
 	gchar *size_string;

Modified: trunk/src/brasero-data-tree-model.c
==============================================================================
--- trunk/src/brasero-data-tree-model.c	(original)
+++ trunk/src/brasero-data-tree-model.c	Mon Apr 21 18:34:44 2008
@@ -520,7 +520,7 @@
 			g_value_set_string (value, "media-cdrom");
 		}
 		else if (BRASERO_FILE_NODE_MIME (node)) {
-			const gchar *icon_string = NULL;
+			const gchar *icon_string = BRASERO_DEFAULT_ICON;
 			GIcon *icon;
 
 			/* NOTE: implemented in glib 2.15.6 (not for windows though) */

Modified: trunk/src/brasero-mime-filter.c
==============================================================================
--- trunk/src/brasero-mime-filter.c	(original)
+++ trunk/src/brasero-mime-filter.c	Mon Apr 21 18:34:44 2008
@@ -236,7 +236,7 @@
 		GtkTreeIter row;
 		GtkTreeModel *model;
 		const gchar *description;
-		const gchar *icon_string = NULL;
+		const gchar *icon_string = BRASERO_DEFAULT_ICON;
 
 		description = g_content_type_get_description (mime);
 		display = g_strdup_printf (_("%s only"), description);

Modified: trunk/src/brasero-project-size.c
==============================================================================
--- trunk/src/brasero-project-size.c	(original)
+++ trunk/src/brasero-project-size.c	Mon Apr 21 18:34:44 2008
@@ -759,7 +759,6 @@
 
 	for (i = 1.; i < num; i ++) {
 		gchar *string;
-		guint arrow_x;
 		guint text_x;
 
 		string = brasero_utils_get_sectors_string (i * interval_size,

Modified: trunk/src/brasero-search-beagle.c
==============================================================================
--- trunk/src/brasero-search-beagle.c	(original)
+++ trunk/src/brasero-search-beagle.c	Mon Apr 21 18:34:44 2008
@@ -696,7 +696,7 @@
 	GSList *next;
 
 	gchar *name, *mime, *uri; 
-        const gchar *icon_string = NULL;
+	const gchar *icon_string = BRASERO_DEFAULT_ICON;
 	const gchar *description;
 	GIcon *icon;
 	gint score;

Modified: trunk/src/brasero-utils.h
==============================================================================
--- trunk/src/brasero-utils.h	(original)
+++ trunk/src/brasero-utils.h	Mon Apr 21 18:34:44 2008
@@ -48,6 +48,8 @@
 	BRASERO_ERROR_SYMLINK_LOOP
 } BraseroErrors;
 
+#define BRASERO_DEFAULT_ICON		"text-x-preview"
+
 void brasero_utils_init (void);
 
 inline gboolean brasero_utils_is_gid_in_groups (gid_t gid);