# HG changeset patch # User William Pitcock # Date 1193425258 18000 # Node ID c5705f30b1416356be176ce57c0eab8b5496fd7d # Parent cc5426d6d39c353e3d44c0036e80d5f17bcd39c2# Parent f5b8463b18a2da0803825f4ce305f282e5fece6b Automated merge with ssh://hg.atheme.org//hg/audacious diff -r cc5426d6d39c -r c5705f30b141 src/audacious/playlist.h --- a/src/audacious/playlist.h Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/playlist.h Fri Oct 26 14:00:58 2007 -0500 @@ -77,7 +77,7 @@ typedef enum { PLAYLIST_PLAIN = 0, PLAYLIST_STATIC = 1, - PLAYLIST_USE_RELATIVE = 1 << 1, + PLAYLIST_USE_RELATIVE = 1 << 1 } PlaylistAttribute; struct _Playlist { diff -r cc5426d6d39c -r c5705f30b141 src/audacious/tuple_compiler.c --- a/src/audacious/tuple_compiler.c Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/tuple_compiler.c Fri Oct 26 14:00:58 2007 -0500 @@ -1,6 +1,6 @@ /* * Audacious - Tuplez compiler - * Copyright (c) 2007 Matti 'ccr' Hämäläinen + * Copyright (c) 2007 Matti 'ccr' Hämäläinen * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r cc5426d6d39c -r c5705f30b141 src/audacious/tuple_compiler.h --- a/src/audacious/tuple_compiler.h Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/tuple_compiler.h Fri Oct 26 14:00:58 2007 -0500 @@ -1,6 +1,6 @@ /* * Audacious - Tuplez compiler - * Copyright (c) 2007 Matti 'ccr' Hämäläinen + * Copyright (c) 2007 Matti 'ccr' Hämäläinen * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r cc5426d6d39c -r c5705f30b141 src/audacious/ui_skinned_button.c --- a/src/audacious/ui_skinned_button.c Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/ui_skinned_button.c Fri Oct 26 14:00:58 2007 -0500 @@ -1,6 +1,6 @@ /* * Audacious - a cross-platform multimedia player - * Copyright (c) 2007 Audacious development team. + * Copyright (c) 2007 Tomasz MoÅ„ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r cc5426d6d39c -r c5705f30b141 src/audacious/ui_skinned_button.h --- a/src/audacious/ui_skinned_button.h Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/ui_skinned_button.h Fri Oct 26 14:00:58 2007 -0500 @@ -1,6 +1,6 @@ /* * Audacious - a cross-platform multimedia player - * Copyright (c) 2007 Audacious development team. + * Copyright (c) 2007 Tomasz MoÅ„ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r cc5426d6d39c -r c5705f30b141 src/audacious/ui_skinned_equalizer_graph.c --- a/src/audacious/ui_skinned_equalizer_graph.c Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/ui_skinned_equalizer_graph.c Fri Oct 26 14:00:58 2007 -0500 @@ -1,6 +1,6 @@ /* * Audacious - a cross-platform multimedia player - * Copyright (c) 2007 Audacious development team. + * Copyright (c) 2007 Tomasz MoÅ„ * * Based on: * BMP - Cross-platform multimedia player diff -r cc5426d6d39c -r c5705f30b141 src/audacious/ui_skinned_equalizer_graph.h --- a/src/audacious/ui_skinned_equalizer_graph.h Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/ui_skinned_equalizer_graph.h Fri Oct 26 14:00:58 2007 -0500 @@ -1,6 +1,6 @@ /* * Audacious - a cross-platform multimedia player - * Copyright (c) 2007 Audacious development team. + * Copyright (c) 2007 Tomasz MoÅ„ * * Based on: * BMP - Cross-platform multimedia player diff -r cc5426d6d39c -r c5705f30b141 src/audacious/ui_skinned_equalizer_slider.c --- a/src/audacious/ui_skinned_equalizer_slider.c Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/ui_skinned_equalizer_slider.c Fri Oct 26 14:00:58 2007 -0500 @@ -1,6 +1,6 @@ /* * Audacious - a cross-platform multimedia player - * Copyright (c) 2007 Audacious development team. + * Copyright (c) 2007 Tomasz MoÅ„ * * Based on: * BMP - Cross-platform multimedia player diff -r cc5426d6d39c -r c5705f30b141 src/audacious/ui_skinned_equalizer_slider.h --- a/src/audacious/ui_skinned_equalizer_slider.h Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/ui_skinned_equalizer_slider.h Fri Oct 26 14:00:58 2007 -0500 @@ -1,6 +1,6 @@ /* * Audacious - a cross-platform multimedia player - * Copyright (c) 2007 Audacious development team. + * Copyright (c) 2007 Tomasz MoÅ„ * * Based on: * BMP - Cross-platform multimedia player diff -r cc5426d6d39c -r c5705f30b141 src/audacious/ui_skinned_horizontal_slider.c --- a/src/audacious/ui_skinned_horizontal_slider.c Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/ui_skinned_horizontal_slider.c Fri Oct 26 14:00:58 2007 -0500 @@ -1,6 +1,6 @@ /* * Audacious - a cross-platform multimedia player - * Copyright (c) 2007 Audacious development team. + * Copyright (c) 2007 Tomasz MoÅ„ * * Based on: * BMP - Cross-platform multimedia player diff -r cc5426d6d39c -r c5705f30b141 src/audacious/ui_skinned_horizontal_slider.h --- a/src/audacious/ui_skinned_horizontal_slider.h Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/ui_skinned_horizontal_slider.h Fri Oct 26 14:00:58 2007 -0500 @@ -1,6 +1,6 @@ /* * Audacious - a cross-platform multimedia player - * Copyright (c) 2007 Audacious development team. + * Copyright (c) 2007 Tomasz MoÅ„ * * Based on: * BMP - Cross-platform multimedia player diff -r cc5426d6d39c -r c5705f30b141 src/audacious/ui_skinned_menurow.c --- a/src/audacious/ui_skinned_menurow.c Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/ui_skinned_menurow.c Fri Oct 26 14:00:58 2007 -0500 @@ -1,6 +1,6 @@ /* * Audacious - a cross-platform multimedia player - * Copyright (c) 2007 Audacious development team. + * Copyright (c) 2007 Tomasz MoÅ„ * * Based on: * BMP - Cross-platform multimedia player diff -r cc5426d6d39c -r c5705f30b141 src/audacious/ui_skinned_menurow.h --- a/src/audacious/ui_skinned_menurow.h Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/ui_skinned_menurow.h Fri Oct 26 14:00:58 2007 -0500 @@ -1,6 +1,6 @@ /* * Audacious - a cross-platform multimedia player - * Copyright (c) 2007 Audacious development team. + * Copyright (c) 2007 Tomasz MoÅ„ * * Based on: * BMP - Cross-platform multimedia player diff -r cc5426d6d39c -r c5705f30b141 src/audacious/ui_skinned_monostereo.c --- a/src/audacious/ui_skinned_monostereo.c Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/ui_skinned_monostereo.c Fri Oct 26 14:00:58 2007 -0500 @@ -1,6 +1,6 @@ /* * Audacious - a cross-platform multimedia player - * Copyright (c) 2007 Audacious development team. + * Copyright (c) 2007 Tomasz MoÅ„ * * Based on: * BMP - Cross-platform multimedia player diff -r cc5426d6d39c -r c5705f30b141 src/audacious/ui_skinned_monostereo.h --- a/src/audacious/ui_skinned_monostereo.h Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/ui_skinned_monostereo.h Fri Oct 26 14:00:58 2007 -0500 @@ -1,6 +1,6 @@ /* * Audacious - a cross-platform multimedia player - * Copyright (c) 2007 Audacious development team. + * Copyright (c) 2007 Tomasz MoÅ„ * * Based on: * BMP - Cross-platform multimedia player diff -r cc5426d6d39c -r c5705f30b141 src/audacious/ui_skinned_number.c --- a/src/audacious/ui_skinned_number.c Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/ui_skinned_number.c Fri Oct 26 14:00:58 2007 -0500 @@ -1,6 +1,6 @@ /* * Audacious - a cross-platform multimedia player - * Copyright (c) 2007 Audacious development team. + * Copyright (c) 2007 Tomasz MoÅ„ * * Based on: * BMP - Cross-platform multimedia player diff -r cc5426d6d39c -r c5705f30b141 src/audacious/ui_skinned_number.h --- a/src/audacious/ui_skinned_number.h Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/ui_skinned_number.h Fri Oct 26 14:00:58 2007 -0500 @@ -1,6 +1,6 @@ /* * Audacious - a cross-platform multimedia player - * Copyright (c) 2007 Audacious development team. + * Copyright (c) 2007 Tomasz MoÅ„ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r cc5426d6d39c -r c5705f30b141 src/audacious/ui_skinned_playlist.c --- a/src/audacious/ui_skinned_playlist.c Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/ui_skinned_playlist.c Fri Oct 26 14:00:58 2007 -0500 @@ -1,6 +1,6 @@ /* * Audacious - a cross-platform multimedia player - * Copyright (c) 2007 Audacious development team. + * Copyright (c) 2007 Tomasz MoÅ„ * * Based on: * BMP - Cross-platform multimedia player diff -r cc5426d6d39c -r c5705f30b141 src/audacious/ui_skinned_playlist.h --- a/src/audacious/ui_skinned_playlist.h Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/ui_skinned_playlist.h Fri Oct 26 14:00:58 2007 -0500 @@ -1,6 +1,6 @@ /* * Audacious - a cross-platform multimedia player - * Copyright (c) 2007 Audacious development team. + * Copyright (c) 2007 Tomasz MoÅ„ * * Based on: * BMP - Cross-platform multimedia player diff -r cc5426d6d39c -r c5705f30b141 src/audacious/ui_skinned_playlist_slider.c --- a/src/audacious/ui_skinned_playlist_slider.c Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/ui_skinned_playlist_slider.c Fri Oct 26 14:00:58 2007 -0500 @@ -1,6 +1,6 @@ /* * Audacious - a cross-platform multimedia player - * Copyright (c) 2007 Audacious development team. + * Copyright (c) 2007 Tomasz MoÅ„ * * Based on: * BMP - Cross-platform multimedia player diff -r cc5426d6d39c -r c5705f30b141 src/audacious/ui_skinned_playlist_slider.h --- a/src/audacious/ui_skinned_playlist_slider.h Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/ui_skinned_playlist_slider.h Fri Oct 26 14:00:58 2007 -0500 @@ -1,6 +1,6 @@ /* * Audacious - a cross-platform multimedia player - * Copyright (c) 2007 Audacious development team. + * Copyright (c) 2007 Tomasz MoÅ„ * * Based on: * BMP - Cross-platform multimedia player diff -r cc5426d6d39c -r c5705f30b141 src/audacious/ui_skinned_playstatus.c --- a/src/audacious/ui_skinned_playstatus.c Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/ui_skinned_playstatus.c Fri Oct 26 14:00:58 2007 -0500 @@ -1,6 +1,6 @@ /* * Audacious - a cross-platform multimedia player - * Copyright (c) 2007 Audacious development team. + * Copyright (c) 2007 Tomasz MoÅ„ * * Based on: * BMP - Cross-platform multimedia player diff -r cc5426d6d39c -r c5705f30b141 src/audacious/ui_skinned_playstatus.h --- a/src/audacious/ui_skinned_playstatus.h Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/ui_skinned_playstatus.h Fri Oct 26 14:00:58 2007 -0500 @@ -1,6 +1,6 @@ /* * Audacious - a cross-platform multimedia player - * Copyright (c) 2007 Audacious development team. + * Copyright (c) 2007 Tomasz MoÅ„ * * Based on: * BMP - Cross-platform multimedia player diff -r cc5426d6d39c -r c5705f30b141 src/audacious/ui_skinned_textbox.c --- a/src/audacious/ui_skinned_textbox.c Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/ui_skinned_textbox.c Fri Oct 26 14:00:58 2007 -0500 @@ -1,6 +1,6 @@ /* * Audacious - a cross-platform multimedia player - * Copyright (c) 2007 Audacious development team. + * Copyright (c) 2007 Tomasz MoÅ„ * * Based on: * BMP - Cross-platform multimedia player diff -r cc5426d6d39c -r c5705f30b141 src/audacious/ui_skinned_textbox.h --- a/src/audacious/ui_skinned_textbox.h Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/ui_skinned_textbox.h Fri Oct 26 14:00:58 2007 -0500 @@ -1,6 +1,6 @@ /* * Audacious - a cross-platform multimedia player - * Copyright (c) 2007 Audacious development team. + * Copyright (c) 2007 Tomasz MoÅ„ * * Based on: * BMP - Cross-platform multimedia player diff -r cc5426d6d39c -r c5705f30b141 src/audacious/vfs_buffered_file.c --- a/src/audacious/vfs_buffered_file.c Fri Oct 26 14:00:17 2007 -0500 +++ b/src/audacious/vfs_buffered_file.c Fri Oct 26 14:00:58 2007 -0500 @@ -238,6 +238,7 @@ if (!sz) { + vfs_fclose(fd->fd); g_free(fd->mem); g_free(fd); g_free(handle);