[brasero] Remove unnecessary function and set image filter active when choosing an icon for the image



commit 668cc4fcbb66b50f2f01e30a0969aad8e9c05c4a
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Sun Jun 21 20:47:13 2009 +0200

    Remove unnecessary function and set image filter active when choosing an icon for the image

 libbrasero-burn/brasero-track-data-cfg.c |   20 --------------------
 libbrasero-burn/brasero-track-data-cfg.h |    2 --
 src/brasero-project-name.c               |   10 +++++-----
 3 files changed, 5 insertions(+), 27 deletions(-)
---
diff --git a/libbrasero-burn/brasero-track-data-cfg.c b/libbrasero-burn/brasero-track-data-cfg.c
index 8648917..d977528 100644
--- a/libbrasero-burn/brasero-track-data-cfg.c
+++ b/libbrasero-burn/brasero-track-data-cfg.c
@@ -2783,26 +2783,6 @@ brasero_track_data_cfg_span_stop (BraseroTrackDataCfg *track)
  * This is to handle the icon for the image
  */
 
-gchar *
-brasero_track_data_cfg_get_scaled_icon_path (BraseroTrackDataCfg *track)
-{
-	BraseroTrackDataCfgPrivate *priv;
-	gchar *path;
-	gchar *uri;
-
-	g_return_val_if_fail (BRASERO_IS_TRACK_DATA_CFG (track), NULL);
-
-	priv = BRASERO_TRACK_DATA_CFG_PRIVATE (track);
-	if (!priv->icon || BRASERO_FILE_NODE_VIRTUAL (priv->icon))
-		return NULL;
-
-	uri = brasero_data_project_node_to_uri (BRASERO_DATA_PROJECT (priv->tree), priv->icon);
-	path = g_filename_from_uri (uri, NULL, NULL);
-	g_free (uri);
-
-	return path;
-}
-
 const gchar *
 brasero_track_data_cfg_get_icon_path (BraseroTrackDataCfg *track)
 {
diff --git a/libbrasero-burn/brasero-track-data-cfg.h b/libbrasero-burn/brasero-track-data-cfg.h
index ec39ccf..28249eb 100644
--- a/libbrasero-burn/brasero-track-data-cfg.h
+++ b/libbrasero-burn/brasero-track-data-cfg.h
@@ -175,8 +175,6 @@ brasero_track_data_cfg_span_stop (BraseroTrackDataCfg *track);
 /**
  * Icon
  */
-gchar *
-brasero_track_data_cfg_get_scaled_icon_path (BraseroTrackDataCfg *track);
 
 const gchar *
 brasero_track_data_cfg_get_icon_path (BraseroTrackDataCfg *track);
diff --git a/src/brasero-project-name.c b/src/brasero-project-name.c
index bb13d3c..c733196 100644
--- a/src/brasero-project-name.c
+++ b/src/brasero-project-name.c
@@ -92,7 +92,7 @@ brasero_project_name_icon_update (BraseroProjectName *self,
 {
 	GError *error = NULL;
 	GdkPixbuf *pixbuf;
-	gchar *icon; 
+	const gchar *icon; 
 
 	gtk_entry_set_icon_from_pixbuf (GTK_ENTRY (self),
 					GTK_ENTRY_ICON_PRIMARY,
@@ -101,7 +101,7 @@ brasero_project_name_icon_update (BraseroProjectName *self,
 					   GTK_ENTRY_ICON_PRIMARY,
 					   NULL);
 
-	icon = brasero_track_data_cfg_get_scaled_icon_path (track);
+	icon = brasero_track_data_cfg_get_icon_path (track);
 	if (!icon) {
 		gtk_entry_set_icon_from_icon_name (GTK_ENTRY (self),
 						   GTK_ENTRY_ICON_PRIMARY,
@@ -115,8 +115,6 @@ brasero_project_name_icon_update (BraseroProjectName *self,
 						    24,
 						    FALSE,
 						    &error);
-	g_free (icon);
-
 	if (!pixbuf) {
 		gtk_entry_set_icon_from_icon_name (GTK_ENTRY (self),
 						   GTK_ENTRY_ICON_PRIMARY,
@@ -200,6 +198,8 @@ brasero_project_name_icon_button_clicked (BraseroProjectName *project,
 	gtk_file_filter_add_mime_type (filter, "image/*");
 	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
 
+	gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (chooser), filter);
+
 	if (filename)
 		gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (chooser), filename);
 
@@ -547,7 +547,7 @@ brasero_project_name_track_changed (BraseroBurnSession *session,
 				    BraseroProjectName *self)
 {
 	/* It can happen that stream tracks change */
-	brasero_project_name_session_changed (self);
+	brasero_project_name_set_type (self);
 }
 
 static void



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]