brasero r1929 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Mon Feb 16 20:40:05 2009
New Revision: 1929
URL: http://svn.gnome.org/viewvc/brasero?rev=1929&view=rev

Log:
2009-02-16  Philippe Rouquier  <ykw localhost localdomain>

	Updated NEWS file

	Also some code cleaning

	* NEWS:
	* src/brasero-data-project.c (brasero_data_project_node_loaded),
	(brasero_data_project_add_node_from_info):
	* src/brasero-file-node.c (brasero_file_node_set_from_info):


Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/src/brasero-data-project.c
   trunk/src/brasero-file-node.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Mon Feb 16 20:40:05 2009
@@ -1,3 +1,48 @@
+16-2-2009 Brasero 2.25.91
+
+Changes and bugs fixed:
+Fix #570224 â Missing widgets while renaming multiple files.
+Fix #569204 â Language in Nautilus changed after Brasero 0.9.1 installation
+Fix #570227 â Slicing tracks in audio project is not working correctly
+Fix #571218 â Brasero crashes from Cover Editor
+Fix #571776 â [regression] No possible to set media title when using the replacing nautilus-cd-burner 
+
+Some additional bug and memleaks fixed (not reported) and improvements (See ChangeLog):
+- symlinks and joliet
+- cover editor
+mainly
+
+Translations:
+
+* cs.po: Updated Czech translation by Kamil Paral.
+* pl.po: Updated Polish translation Tomasz Dominikowski  <tdominikowski aviary pl>
+* hu.po: Translation updated. Gabor Kelemen  <kelemeng gnome hu>
+* de.po: Updated German translation Hendrik Richter  <hendrikr gnome org>
+* ro.po: Updated Romanian translation by Adi Roiban <adi roiban ro>
+* eu.po: Add Basque translation. Inaki Larranaga Murgoitio  <dooteo euskalgnu org>
+* ca.po: Updated Catalan translation by Joan Duran.
+* sr.po, sr latin po: Updated Serbian Translation (by MiloÅ PopoviÄ).
+* vi.po: Added Vietnamese translation.Clytie Siddall <clytie riverland net au>
+* sv.po: Updated Swedish translation. Daniel Nylander <po danielnylander se>
+* te.po: Updated Telugu Translations. Krishnababu K  <kkrothap redhat com>
+* ru.po: Updated Russian translation. Nickolay V. Shmyrev  <nshmyrev yandex ru>
+* bg.po: Added Bulgarian translation by	Ivaylo Valkov <ivaylo e-valkov org>
+* es.po: Updated Spanish translation. Jorge Gonzalez  <jorgegonz svn gnome org>
+* ko.po: Added Korean translation. Changwoo Ryu  <cwryu debian org>
+* he.po: Updated Hebrew translation. Mark Krapivner  <mark125 gmail com>
+* nb.po: Updated Norwegian bokmÃl translation.Kjartan Maraas  <kmaraas gnome org>
+* da.po: Updated Danish translation by Mads Lundby
+
+Homepage: http://www.gnome.org/projects/brasero
+
+Please report bugs to: http://bugzilla.gnome.org/browse.cgi?product=brasero
+
+Mailing List for User and Developer discussion: brasero-list gnome org
+
+Svn Repository: http://svn.gnome.org/viewcvs/brasero/
+
+Thanks to all the people who contributed to this release through patches, translation, advices, artwork, bug reports.
+
 31-1-2009 Brasero 2.25.90
 
 Changes and bugs fixed:

Modified: trunk/src/brasero-data-project.c
==============================================================================
--- trunk/src/brasero-data-project.c	(original)
+++ trunk/src/brasero-data-project.c	Mon Feb 16 20:40:05 2009
@@ -1883,14 +1883,10 @@
 	/* Check it that needs a graft: this node has not been moved so we don't
 	 * need to check these cases yet it could turn out that it was a symlink
 	 * then we need a graft. */
-	if (node->is_symlink && g_file_info_get_file_type (info) != G_FILE_TYPE_SYMBOLIC_LINK) {
+	if (g_file_info_get_is_symlink (info) && g_file_info_get_file_type (info) != G_FILE_TYPE_SYMBOLIC_LINK) {
 		BraseroURINode *graft;
 		gchar *uri;
 
-		/* Update our stats and node state as it won't be a symlink anymore */
-		node->is_symlink = FALSE;
-		stats->num_sym --;
-
 		/* first we exclude the symlink, then we graft its target. */
 		uri = brasero_data_project_node_to_uri (self, node);
 		brasero_file_node_ungraft (node);
@@ -2056,7 +2052,6 @@
 	}
 }
 
-
 /* This function is only used in brasero-data-vfs.c to add new nodes
  * discovered through exploration */
 
@@ -2144,15 +2139,13 @@
 	node = brasero_file_node_new_from_info (info,
 						parent,
 						priv->sort_func);
-	if (node->is_symlink && g_file_info_get_file_type (info) != G_FILE_TYPE_SYMBOLIC_LINK) {
-		BraseroFileTreeStats *stats;
-
-		/* Update our stats and node state as it won't be a symlink anymore */
-		node->is_symlink = FALSE;
-
-		stats = brasero_file_node_get_tree_stats (priv->root, NULL);
-		stats->num_sym --;
 
+	g_file_info_get_is_symlink (info),
+	 g_file_info_get_name (info),
+	 g_file_info_get_file_type (info),
+	 uri);
+	if (g_file_info_get_is_symlink (info)
+	&&  g_file_info_get_file_type (info) != G_FILE_TYPE_SYMBOLIC_LINK) {
 		/* first we exclude the symlink, then we graft its target */
 		brasero_data_project_exclude_uri (self, uri);
 

Modified: trunk/src/brasero-file-node.c
==============================================================================
--- trunk/src/brasero-file-node.c	(original)
+++ trunk/src/brasero-file-node.c	Mon Feb 16 20:40:05 2009
@@ -746,7 +746,7 @@
 		stats->children ++;
 	}
 
-	if (!node->is_symlink && g_file_info_get_is_symlink (info)) {
+	if (!node->is_symlink && (g_file_info_get_file_type (info) != G_FILE_TYPE_SYMBOLIC_LINK)) {
 		/* only count files */
 		stats->num_sym ++;
 	}
@@ -760,7 +760,7 @@
 	node->is_loading = FALSE;
 	node->is_imported = FALSE;
 	node->is_reloading = FALSE;
-	node->is_symlink = (g_file_info_get_is_symlink (info));
+	node->is_symlink = (g_file_info_get_file_type (info) == G_FILE_TYPE_SYMBOLIC_LINK);
 
 	if (node->is_file) {
 		guint sectors;