[brasero] Last fix for building



commit 0b20c634cc574f3a8b6a26557aab40a27998a2f9
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Sun Jun 21 23:04:42 2009 +0200

    Last fix for building

 libbrasero-burn/Makefile.am              |    3 +--
 libbrasero-burn/brasero-track-data-cfg.c |   19 +++++++++++++++++++
 libbrasero-utils/Makefile.am             |    3 +--
 3 files changed, 21 insertions(+), 4 deletions(-)
---
diff --git a/libbrasero-burn/Makefile.am b/libbrasero-burn/Makefile.am
index 06ed5a9..516e421 100644
--- a/libbrasero-burn/Makefile.am
+++ b/libbrasero-burn/Makefile.am
@@ -69,8 +69,7 @@ libbrasero_burn_la_LIBADD =					\
 libbrasero_burn_la_LDFLAGS =					\
 	-version-info $(LIBBRASERO_LT_VERSION)			\
 	-no-undefined						\
-	-export-dynamic						\
-	$(AM_LDFLAGS)
+	-export-dynamic
 #	-export-symbols ./libbrasero-burn.symbols
 
 libbrasero_burn_la_SOURCES = 		\
diff --git a/libbrasero-burn/brasero-track-data-cfg.c b/libbrasero-burn/brasero-track-data-cfg.c
index d977528..f9ca482 100644
--- a/libbrasero-burn/brasero-track-data-cfg.c
+++ b/libbrasero-burn/brasero-track-data-cfg.c
@@ -2794,6 +2794,25 @@ brasero_track_data_cfg_get_icon_path (BraseroTrackDataCfg *track)
 	return priv->image_path;
 }
 
+static 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;
+}
+
 gboolean
 brasero_track_data_cfg_set_icon (BraseroTrackDataCfg *track,
 				 const gchar *icon_path,
diff --git a/libbrasero-utils/Makefile.am b/libbrasero-utils/Makefile.am
index 2e90407..ddf912a 100644
--- a/libbrasero-utils/Makefile.am
+++ b/libbrasero-utils/Makefile.am
@@ -30,8 +30,7 @@ libbrasero_utils_la_LIBADD =					\
 
 libbrasero_utils_la_LDFLAGS =					\
 	-version-info $(LIBBRASERO_LT_VERSION)			\
-	-no-undefined						\
-	$(AM_LDFLAGS)
+	-no-undefined
 #	-export-symbols ./libbrasero-utils.symbols
 
 libbrasero_utils_la_SOURCES =		\



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