brasero r1230 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Sun Aug 31 19:48:10 2008
New Revision: 1230
URL: http://svn.gnome.org/viewvc/brasero?rev=1230&view=rev

Log:
	Fixed two problems:
	- brasero was using the wrong order when loading file list passed on the
	  command line
	- brasero crashed when passed arguments on the command line (the problem 
	  was introduced by recent changes)

	* src/main.c (brasero_app_parse_options):


Modified:
   trunk/ChangeLog
   trunk/src/main.c

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Sun Aug 31 19:48:10 2008
@@ -142,6 +142,8 @@
 		g_object_unref (file);						\
 		list = g_slist_prepend (list, uri);				\
 	}									\
+	/* reverse to keep the order of files */				\
+	list = g_slist_reverse (list);						\
 	function (BRASERO_PROJECT_MANAGER (manager_MACRO), list);		\
 	g_slist_foreach (list, (GFunc) g_free, NULL);				\
 	g_slist_free (list);							\
@@ -215,25 +217,25 @@
 		brasero_project_manager_copy (BRASERO_PROJECT_MANAGER (manager), device);
 	}
 	else if (iso_uri) {
-		BRASERO_PROJECT_OPEN_URI (app, brasero_project_manager_iso, iso_uri);
+		BRASERO_PROJECT_OPEN_URI (manager, brasero_project_manager_iso, iso_uri);
 	}
 	else if (project_uri) {
-		BRASERO_PROJECT_OPEN_URI (app, brasero_project_manager_open_project, project_uri);
+		BRASERO_PROJECT_OPEN_URI (manager, brasero_project_manager_open_project, project_uri);
 	}
 
 #ifdef BUILD_PLAYLIST
 
 	else if (playlist_uri) {
-		BRASERO_PROJECT_OPEN_URI (app, brasero_project_manager_open_playlist, playlist_uri);
+		BRASERO_PROJECT_OPEN_URI (manager, brasero_project_manager_open_playlist, playlist_uri);
 	}
 
 #endif
 
 	else if (audio_project) {
-		BRASERO_PROJECT_OPEN_LIST (app, brasero_project_manager_audio, files);
+		BRASERO_PROJECT_OPEN_LIST (manager, brasero_project_manager_audio, files);
 	}
 	else if (data_project) {
-		BRASERO_PROJECT_OPEN_LIST (app, brasero_project_manager_data, files);
+		BRASERO_PROJECT_OPEN_LIST (manager, brasero_project_manager_data, files);
 	}
 	else if (disc_blank) {
 		brasero_app_blank (app);
@@ -256,6 +258,8 @@
 			list = g_slist_prepend (list, file);
 		}
 
+		/* reverse to keep the order of files */
+		list = g_slist_reverse (list);
 		brasero_project_manager_data (BRASERO_PROJECT_MANAGER (manager), list);
 		g_slist_free (list);
 	}