From: Toni Gundogdu <legatvs@gmail.com>
Date: Mon, 14 Oct 2013 13:08:32 +0000 (+0300)
Subject: m_unescape_url: Remove completely
X-Git-Tag: v0.9.4~4^2~10
X-Git-Url: https://repo.or.cz/w/libquvi.git/commitdiff_plain/741d967a9f2fe40845de34f3ec2cc2e130cfd9e5

m_unescape_url: Remove completely

This function will be replaced by m_url_(un)escaped_form.

Signed-off-by: Toni Gundogdu <legatvs@gmail.com>
---

diff --git a/src/misc/Makefile.am b/src/misc/Makefile.am
index 990dffe..89b123f 100644
--- a/src/misc/Makefile.am
+++ b/src/misc/Makefile.am
@@ -15,8 +15,7 @@ src=\
   subtitle.c\
   subtitle_export.c\
   to_utf8.c\
-  trim.c\
-  unescape.c
+  trim.c
 
 hdr=\
   match_media_script.h\
@@ -31,8 +30,7 @@ hdr=\
   script_free.h\
   slst.h\
   subtitle_export.h\
-  subtitle.h\
-  unescape.h
+  subtitle.h
 
 noinst_LTLIBRARIES=libconvenience_misc.la
 libconvenience_misc_la_SOURCES=$(src) $(hdr)
diff --git a/src/misc/media.c b/src/misc/media.c
index fc0960f..ba4ed35 100644
--- a/src/misc/media.c
+++ b/src/misc/media.c
@@ -27,7 +27,6 @@
 #include "_quvi_s.h"
 #include "_quvi_media_s.h"
 /* -- */
-#include "misc/unescape.h"
 #include "misc/media.h"
 #include "misc/slst.h"
 
@@ -38,7 +37,6 @@ gpointer m_media_new(_quvi_t q, const gchar *url)
   qm->url.redirect_to = g_string_new(NULL);
   qm->url.thumbnail = g_string_new(NULL);
   qm->url.input = g_string_new(url);
-  m_unescape_url(qm->url.input);
   /* Handle */
   qm->handle.quvi = q;
   /* Other */
diff --git a/src/misc/playlist.c b/src/misc/playlist.c
index 45ad7ca..a338603 100644
--- a/src/misc/playlist.c
+++ b/src/misc/playlist.c
@@ -27,7 +27,6 @@
 #include "_quvi_s.h"
 #include "_quvi_playlist_s.h"
 /* -- */
-#include "misc/unescape.h"
 #include "misc/playlist.h"
 #include "misc/slst.h"
 
@@ -37,7 +36,6 @@ gpointer m_playlist_new(_quvi_t q, const gchar *url)
   /* URL */
   qp->url.thumbnail = g_string_new(NULL);
   qp->url.input = g_string_new(url);
-  m_unescape_url(qp->url.input);
   /* ID */
   qp->id.playlist = g_string_new(NULL);
   /* Handle */
diff --git a/src/misc/subtitle.c b/src/misc/subtitle.c
index 905dd7e..ca7052c 100644
--- a/src/misc/subtitle.c
+++ b/src/misc/subtitle.c
@@ -27,7 +27,6 @@
 #include "_quvi_s.h"
 #include "_quvi_subtitle_s.h"
 /* -- */
-#include "misc/unescape.h"
 #include "misc/subtitle.h"
 #include "misc/slst.h"
 
@@ -36,7 +35,6 @@ gpointer m_subtitle_new(_quvi_t q, const gchar *url)
   _quvi_subtitle_t qsub = g_new0(struct _quvi_subtitle_s, 1);
   /* URL */
   qsub->url.input = g_string_new(url);
-  m_unescape_url(qsub->url.input);
   /* Handle */
   qsub->handle.quvi = q;
   return (qsub);
diff --git a/src/misc/unescape.c b/src/misc/unescape.c
deleted file mode 100644
index 4bb7d7e..0000000
--- a/src/misc/unescape.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* libquvi
- * Copyright (C) 2012  Toni Gundogdu <legatvs@gmail.com>
- *
- * This file is part of libquvi <http://quvi.sourceforge.net/>.
- *
- * This library is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public
- * License as published by the Free Software Foundation, either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General
- * Public License along with this library.  If not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include <glib.h>
-/* -- */
-#include "misc/unescape.h"
-
-void m_unescape_url(GString *dst)
-{
-  gchar *r = g_uri_unescape_string(dst->str, NULL);
-  if (r != NULL)
-    {
-      g_string_assign(dst, r);
-      g_free(r);
-      r = NULL;
-    }
-}
-
-/* vim: set ts=2 sw=2 tw=72 expandtab: */
diff --git a/src/misc/unescape.h b/src/misc/unescape.h
deleted file mode 100644
index 010abcb..0000000
--- a/src/misc/unescape.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* libquvi
- * Copyright (C) 2012  Toni Gundogdu <legatvs@gmail.com>
- *
- * This file is part of libquvi <http://quvi.sourceforge.net/>.
- *
- * This library is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public
- * License as published by the Free Software Foundation, either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General
- * Public License along with this library.  If not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-#ifndef m_unescape_h
-#define m_unescape_h
-
-void m_unescape_url(GString*);
-
-#endif /* m_unescape_h */