Mercurial > audlegacy
changeset 2976:6131bf51ee63 trunk
Remove urldecode.c, urldecode.h, fix references accordingly.
| author | William Pitcock <nenolod@atheme-project.org> |
|---|---|
| date | Tue, 03 Jul 2007 19:44:41 -0500 |
| parents | 1ec423a12756 |
| children | 54081d5cbd76 |
| files | src/audacious/Makefile src/audacious/playback.c src/audacious/playlist.c src/audacious/ui_fileinfo.c src/audacious/ui_jumptotrack.c src/audacious/ui_main.c src/audacious/ui_preferences.c src/audacious/urldecode.c src/audacious/urldecode.h src/audacious/vfs.c |
| diffstat | 10 files changed, 0 insertions(+), 104 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/Makefile Tue Jul 03 19:41:53 2007 -0500 +++ b/src/audacious/Makefile Tue Jul 03 19:44:41 2007 -0500 @@ -108,7 +108,6 @@ ui_skinned_textbox.c \ ui_skinselector.c \ ui_urlopener.c \ - urldecode.c \ util.c \ vfs.c \ vfs_buffer.c \
--- a/src/audacious/playback.c Tue Jul 03 19:41:53 2007 -0500 +++ b/src/audacious/playback.c Tue Jul 03 19:44:41 2007 -0500 @@ -48,7 +48,6 @@ #include "ui_main.h" #include "ui_playlist.h" #include "ui_skinselector.h" -#include "urldecode.h" #include "util.h" #include "playback.h"
--- a/src/audacious/playlist.c Tue Jul 03 19:41:53 2007 -0500 +++ b/src/audacious/playlist.c Tue Jul 03 19:44:41 2007 -0500 @@ -56,7 +56,6 @@ #include "util.h" #include "configdb.h" #include "vfs.h" -#include "urldecode.h" #include "ui_equalizer.h" #include "playback.h" #include "playlist.h"
--- a/src/audacious/ui_fileinfo.c Tue Jul 03 19:41:53 2007 -0500 +++ b/src/audacious/ui_fileinfo.c Tue Jul 03 19:44:41 2007 -0500 @@ -48,7 +48,6 @@ #include "visualization.h" #include "main.h" -#include "urldecode.h" #include "util.h" #include "dnd.h" #include "titlestring.h"
--- a/src/audacious/ui_jumptotrack.c Tue Jul 03 19:41:53 2007 -0500 +++ b/src/audacious/ui_jumptotrack.c Tue Jul 03 19:44:41 2007 -0500 @@ -64,7 +64,6 @@ #include "genevent.h" #include "hints.h" #include "input.h" -#include "urldecode.h" #include "playback.h" #include "playlist.h" #include "pluginenum.h"
--- a/src/audacious/ui_main.c Tue Jul 03 19:41:53 2007 -0500 +++ b/src/audacious/ui_main.c Tue Jul 03 19:44:41 2007 -0500 @@ -64,7 +64,6 @@ #include "genevent.h" #include "hints.h" #include "input.h" -#include "urldecode.h" #include "playback.h" #include "playlist.h" #include "pluginenum.h"
--- a/src/audacious/ui_preferences.c Tue Jul 03 19:41:53 2007 -0500 +++ b/src/audacious/ui_preferences.c Tue Jul 03 19:44:41 2007 -0500 @@ -49,7 +49,6 @@ #include "main.h" #include "widgets/widgetcore.h" #include "ui_skinned_textbox.h" -#include "urldecode.h" #include "strings.h" #include "util.h" #include "dnd.h"
--- a/src/audacious/urldecode.c Tue Jul 03 19:41:53 2007 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,68 +0,0 @@ -/* Audacious - Cross-platform multimedia player - * Copyright (C) 2005-2007 Audacious development team - * - * Based on BMP: - * Copyright (C) 2003-2004 BMP development team. - * - * Based on XMMS: - * Copyright (C) 1998-2003 XMMS development team. - * - * 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 - * the Free Software Foundation; under version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include "urldecode.h" - -#include <glib.h> -#include <stdio.h> -#include <string.h> - -#include "util.h" - -gchar * -xmms_urldecode_plain(const gchar * encoded_path) -{ - const gchar *cur, *ext; - gchar *path, *tmp; - gint realchar; - - if (!encoded_path) - return NULL; - - cur = encoded_path; - if (*cur == '/') - while (cur[1] == '/') - cur++; - - tmp = g_malloc0(strlen(cur) + 1); - - while ((ext = strchr(cur, '%')) != NULL) { - strncat(tmp, cur, ext - cur); - ext++; - cur = ext + 2; - if (!sscanf(ext, "%2x", &realchar)) { - /* - * Assume it is a literal '%'. Several file - * managers send unencoded file: urls on on - * drag and drop. - */ - realchar = '%'; - cur -= 2; - } - tmp[strlen(tmp)] = realchar; - } - - path = g_strconcat(tmp, cur, NULL); - g_free(tmp); - return path; -}
--- a/src/audacious/urldecode.h Tue Jul 03 19:41:53 2007 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -/* Audacious - Cross-platform multimedia player - * Copyright (C) 2005-2007 Audacious development team - * - * Based on BMP: - * Copyright (C) 2003-2004 BMP development team. - * - * Based on XMMS: - * Copyright (C) 1998-2003 XMMS development team. - * - * 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 - * the Free Software Foundation; under version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include <glib.h> - -gchar *xmms_urldecode_path(const gchar *); -gchar *xmms_urldecode_plain(const gchar *);