rpms/audacious/F-11 audacious-1.5.1-playlist-length.patch, NONE, 1.1 audacious-1.5.1-playlist-play-clicked.patch, NONE, 1.1

[Ralf Ertzinger]

Author: ertzing

Update of /cvs/extras/rpms/audacious/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10515

Added Files:
	audacious-1.5.1-playlist-length.patch 
	audacious-1.5.1-playlist-play-clicked.patch 
Log Message:

- Add missing patches to CVS

audacious-1.5.1-playlist-length.patch:

--- NEW FILE audacious-1.5.1-playlist-length.patch ---
diff -uNr audacious-1.5.1-orig/src/audacious/playlist.c audacious-1.5.1/src/audacious/playlist.c
--- audacious-1.5.1-orig/src/audacious/playlist.c	2008-05-24 00:00:34.000000000 +0200
+++ audacious-1.5.1/src/audacious/playlist.c	2009-05-01 19:29:17.663254934 +0200
@@ -1531,6 +1531,9 @@
 gint
 playlist_get_length(Playlist *playlist)
 {
+
+    g_return_val_if_fail(playlist != NULL, 0);
+
     return g_list_length(playlist->entries);
 }
 

audacious-1.5.1-playlist-play-clicked.patch:

--- NEW FILE audacious-1.5.1-playlist-play-clicked.patch ---
--- a/src/audacious/main.c	Sun May 25 15:12:17 2008 +0200
+++ b/src/audacious/main.c	Thu May 29 01:03:13 2008 +0300
@@ -315,7 +315,7 @@ parse_cmd_line_options(gint *argc, gchar
 }
 
 static void
-handle_cmd_line_options()
+handle_cmd_line_options(gboolean skip)
 {
     gchar **filenames = options.filenames;
 #ifdef USE_DBUS
@@ -430,7 +430,7 @@ handle_cmd_line_options()
     } /* is_running */
     else
 #endif
-    { /* !is_running */
+    if (!skip) { /* !is_running */
         if (filenames != NULL)
         {
             gint pos = 0;
@@ -715,7 +715,7 @@ main(gint argc, gchar ** argv)
 
     signal_handlers_init();
 
-    handle_cmd_line_options();
+    handle_cmd_line_options(TRUE);
 
     if (options.headless == FALSE)
     {
@@ -734,6 +734,8 @@ main(gint argc, gchar ** argv)
 
     plugin_system_init();
     playlist_system_init();
+
+    handle_cmd_line_options(FALSE);
 
 #ifdef USE_DBUS
     init_dbus();