Mercurial > audlegacy

changeset 3843:c5705f30b141

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with ssh://hg.atheme.org//hg/audacious
author William Pitcock <nenolod@atheme.org>
date Fri, 26 Oct 2007 14:00:58 -0500
parents cc5426d6d39c (current diff) f5b8463b18a2 (diff)
children b6e38afaeaa6
files
diffstat 26 files changed, 26 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- 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 {
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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);