[vdr-plugin-rssreader] 02/06: Imported Upstream version 2.0.0
Tobias Grimm
tiber-guest at moszumanska.debian.org
Mon Feb 9 21:23:26 UTC 2015
This is an automated email from the git hooks/post-receive script.
tiber-guest pushed a commit to branch master
in repository vdr-plugin-rssreader.
commit 8208ba237f6d173e1a977f5c64834962d8d2b1bf
Author: etobi <git at e-tobi.net>
Date: Mon Apr 22 22:10:19 2013 +0200
Imported Upstream version 2.0.0
---
HISTORY | 20 ++++++++++-
Makefile | 9 +++--
README | 8 +----
menu.c | 4 +--
parser.c | 6 ++--
po/de_DE.po | 8 ++---
po/et_EE.po | 8 ++---
po/fi_FI.po | 8 ++---
po/fr_FR.po | 8 ++---
po/it_IT.po | 8 ++---
po/uk_UA.po | 92 ++++++++++++++++++++++++++++++++++++++++++++++++
rssreader.c | 9 ++---
rssreader/rssreader.conf | 5 +--
tools.c | 1 +
14 files changed, 153 insertions(+), 41 deletions(-)
diff --git a/HISTORY b/HISTORY
index 9fa64a5..e189f3a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,5 +1,6 @@
+=======================================
VDR Plugin 'rssreader' Revision History
----------------------------------
+=======================================
2005-12-18: Version 0.0.1
@@ -142,6 +143,11 @@ VDR Plugin 'rssreader' Revision History
- Updated Italian translation (Thanks to Diego Pierotto).
- Fixed a crash bug in the SVDRP help.
+
+=======================================
+VDR Plugin 'rssreader' Revision History
+=======================================
+
2010-03-05: Version 1.7.0
- Updated for vdr-1.7.13.
@@ -166,3 +172,15 @@ VDR Plugin 'rssreader' Revision History
2013-02-10: Version 1.7.3
- Updated for vdr-1.7.37.
+
+
+=======================================
+VDR Plugin 'rssreader' Revision History
+=======================================
+
+2013-04-01: Version 2.0.0
+
+- Updated for vdr-2.0.0.
+- Added Ukrainian translation (Thanks to Yarema aka Knedlyk).
+- Updated "example/rssreader.conf".
+- Updated the character conversion table.
diff --git a/Makefile b/Makefile
index 3271396..48577b7 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,7 @@ PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(s
LIBDIR = $(call PKGCFG,libdir)
LOCDIR = $(call PKGCFG,locdir)
PLGCFG = $(call PKGCFG,plgcfg)
+CFGDIR = $(call PKGCFG,configdir)
#
TMPDIR ?= /tmp
@@ -133,7 +134,11 @@ endif
install-lib: $(SOFILE)
install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
-install: install-lib install-i18n
+install-conf:
+ @mkdir -p $(DESTDIR)$(CFGDIR)/plugins/$(PLUGIN)
+ @cp -pn $(PLUGIN)/* $(DESTDIR)$(CFGDIR)/plugins/$(PLUGIN)/
+
+install: install-lib install-i18n install-conf
dist: $(I18Npo) clean
@-rm -rf $(TMPDIR)/$(ARCHIVE)
@@ -149,4 +154,4 @@ clean:
.PHONY: cppcheck
cppcheck:
- @cppcheck --enable=all -v -f $(OBJS:%.o=%.c)
+ @cppcheck --language=c++ --enable=all -v -f $(OBJS:%.o=%.c)
diff --git a/README b/README
index cce725a..27c3fe7 100644
--- a/README
+++ b/README
@@ -25,14 +25,8 @@ for reading user-defined RSS streams.
Installation:
-cd /put/your/path/here/VDR/PLUGINS/src
tar -xzf /put/your/path/here/vdr-rssreader-X.Y.Z.tgz
-ln -s rssreader-X.Y.Z rssreader
-cd /put/your/path/here/VDR
-cp -R PLUGINS/src/rssreader/rssreader /path/to/vdrconf/plugins/
-make
-make plugins
-./vdr -P rssreader
+make -C rssreader-X.Y.Z install
Configuration:
diff --git a/menu.c b/menu.c
index 7d01160..4ca24ca 100644
--- a/menu.c
+++ b/menu.c
@@ -185,7 +185,7 @@ eOSState cRssItemsMenu::ProcessKey(eKeys Key)
eOSState cRssItemsMenu::ShowDetails(void)
{
- cItem *rssItem = (cItem *)Parser.Items.Get(Current());
+ cItem *rssItem = reinterpret_cast<cItem *>(Parser.Items.Get(Current()));
if (rssItem) {
return AddSubMenu(new cRssMenuItem(*stream, rssItem->GetDate(), rssItem->GetTitle(), rssItem->GetLink(), rssItem->GetDescription()));
}
@@ -221,7 +221,7 @@ void cRssStreamsMenu::Setup(void)
eOSState cRssStreamsMenu::Select(void)
{
- cRssItem *rssItem = (cRssItem *)RssItems.Get(Current());
+ cRssItem *rssItem = reinterpret_cast<cRssItem *>(RssItems.Get(Current()));
if (rssItem) {
debug("cRssStreamsMenu::Select(): downloading and parsing '%s'", rssItem->Title());
// the following message generates an annoying slowdown
diff --git a/parser.c b/parser.c
index 6beb125..666823c 100644
--- a/parser.c
+++ b/parser.c
@@ -233,10 +233,10 @@ static void XMLCALL StartHandler(void *data, const char *el, const char **attr)
static void XMLCALL EndHandler(void *data, const char *el)
{
- char parent[SHORT_TEXT_LEN];
-
nodestack.pop();
- if (nodestack.size() > 0) {
+ if (!nodestack.empty()) {
+ char parent[SHORT_TEXT_LEN];
+
strn0cpy(parent, (nodestack.top()).nodename, sizeof((nodestack.top()).nodename));
// No need to free the node
if (IsItemTag(el) && item && *item->GetTitle())
diff --git a/po/de_DE.po b/po/de_DE.po
index 8db0c17..aeb3884 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -1,15 +1,15 @@
# VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2013 Rolf Ahrenberg
# This file is distributed under the same license as the rssreader package.
# Siegfried D�ngler
# Walter Koch
#
msgid ""
msgstr ""
-"Project-Id-Version: vdr-rssreader 1.7.3\n"
+"Project-Id-Version: vdr-rssreader 2.0.0\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-12-27 12:27+0200\n"
-"PO-Revision-Date: 2010-12-27 12:27+0200\n"
+"POT-Creation-Date: 2013-04-01 04:01+0200\n"
+"PO-Revision-Date: 2013-04-01 04:01+0200\n"
"Last-Translator: Walter Koch\n"
"Language-Team: German <vdr at linuxtv.org>\n"
"Language: de\n"
diff --git a/po/et_EE.po b/po/et_EE.po
index 9c0db66..8b74da3 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -1,14 +1,14 @@
# VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2013 Rolf Ahrenberg
# This file is distributed under the same license as the rssreader package.
# Arthur Konovalov
#
msgid ""
msgstr ""
-"Project-Id-Version: vdr-rssreader 1.7.3\n"
+"Project-Id-Version: vdr-rssreader 2.0.0\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-12-27 12:27+0200\n"
-"PO-Revision-Date: 2010-12-27 12:27+0200\n"
+"POT-Creation-Date: 2013-04-01 04:01+0200\n"
+"PO-Revision-Date: 2013-04-01 04:01+0200\n"
"Last-Translator: Arthur Konovalov\n"
"Language-Team: Estonian <vdr at linuxtv.org>\n"
"Language: et\n"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 2776164..4b08ae7 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -1,14 +1,14 @@
# VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2013 Rolf Ahrenberg
# This file is distributed under the same license as the rssreader package.
# Rolf Ahrenberg
#
msgid ""
msgstr ""
-"Project-Id-Version: vdr-rssreader 1.7.3\n"
+"Project-Id-Version: vdr-rssreader 2.0.0\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-12-27 12:27+0200\n"
-"PO-Revision-Date: 2010-12-27 12:27+0200\n"
+"POT-Creation-Date: 2013-04-01 04:01+0200\n"
+"PO-Revision-Date: 2013-04-01 04:01+0200\n"
"Last-Translator: Rolf Ahrenberg\n"
"Language-Team: Finnish <vdr at linuxtv.org>\n"
"Language: fi\n"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index c145a32..d6b965f 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -1,14 +1,14 @@
# VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2013 Rolf Ahrenberg
# This file is distributed under the same license as the rssreader package.
# Patrice Staudt
#
msgid ""
msgstr ""
-"Project-Id-Version: vdr-rssreader 1.7.3\n"
+"Project-Id-Version: vdr-rssreader 2.0.0\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-12-27 12:27+0200\n"
-"PO-Revision-Date: 2010-12-27 12:27+0200\n"
+"POT-Creation-Date: 2013-04-01 04:01+0200\n"
+"PO-Revision-Date: 2013-04-01 04:01+0200\n"
"Last-Translator: NIVAL Micha�l <mnival at club-internet.fr>\n"
"Language-Team: French <vdr at linuxtv.org>\n"
"Language: fr\n"
diff --git a/po/it_IT.po b/po/it_IT.po
index 50e602d..3f191b5 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -1,14 +1,14 @@
# VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2013 Rolf Ahrenberg
# This file is distributed under the same license as the rssreader package.
# Diego Pierotto <vdr-italian at tiscali.it>, 2007
#
msgid ""
msgstr ""
-"Project-Id-Version: vdr-rssreader 1.7.3\n"
+"Project-Id-Version: vdr-rssreader 2.0.0\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-12-27 12:27+0200\n"
-"PO-Revision-Date: 2010-12-27 12:27+0200\n"
+"POT-Creation-Date: 2013-04-01 04:01+0200\n"
+"PO-Revision-Date: 2013-04-01 04:01+0200\n"
"Last-Translator: Diego Pierotto <vdr-italian at tiscali.it>\n"
"Language-Team: Italian <vdr at linuxtv.org>\n"
"Language: it\n"
diff --git a/po/uk_UA.po b/po/uk_UA.po
new file mode 100644
index 0000000..69359a4
--- /dev/null
+++ b/po/uk_UA.po
@@ -0,0 +1,92 @@
+# VDR plugin language source file.
+# Copyright (C) 2007-2013 Rolf Ahrenberg
+# This file is distributed under the same license as the rssreader package.
+# Yarema aka Knedlyk
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr-rssreader 2.0.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2013-04-01 04:01+0200\n"
+"PO-Revision-Date: 2013-04-01 04:01+0200\n"
+"Last-Translator: Yarema aka Knedlyk <yupadmin at gmail.com>\n"
+"Language-Team: Ukrainian <vdr at linuxtv.org>\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "RSS item"
+msgstr "Потік RSS"
+
+msgid "<no date available>"
+msgstr "<немає доступних даних>"
+
+msgid "<no title available>"
+msgstr "<немає доступних заголовків>"
+
+msgid "<no description available>"
+msgstr "<немає доступного опису>"
+
+msgid "<no link available>"
+msgstr "<немає доступного посилання>"
+
+msgid "Select RSS item"
+msgstr "Вибрати пункт RSS"
+
+msgid "Select RSS stream"
+msgstr "Вибрати потік RSS"
+
+msgid "Button$Load"
+msgstr "Завантаження"
+
+msgid "Can't parse RSS stream!"
+msgstr "Не можливо обробити потік RSS!"
+
+msgid "Can't download RSS stream!"
+msgstr "Неможливо звантажити потік RSS!"
+
+msgid "Unknown error!"
+msgstr "Невідома помилка!"
+
+msgid "Loading configuration file..."
+msgstr "Завантаження файлу налаштування..."
+
+msgid "RSS Reader for OSD"
+msgstr "Читалка RSS на екрані"
+
+msgid "RSS Reader"
+msgstr "Читалка RSS"
+
+msgid "Hide main menu entry"
+msgstr "Сховати в головному меню"
+
+msgid "Define whether the main manu entry is hidden."
+msgstr "Вказати, чи ховати додаток в головному меню."
+
+msgid "Hide non-existent elements"
+msgstr "Приховати неіснуючі елементи"
+
+msgid "Define whether all non-existent RSS stream elements are hidden."
+msgstr "Вказати, чи ховати всі неіснуючі елементи потоку RSS."
+
+msgid "Use HTTP proxy server"
+msgstr "Використати HTTP проксі-сервер"
+
+msgid "Define whether a HTTP proxy server is used."
+msgstr "Вказати, чи використовувати HTTP проксі-сервер."
+
+msgid "HTTP proxy server"
+msgstr "HTTP проксі-сервер"
+
+msgid ""
+"Define an address and port of the HTTP proxy server:\n"
+"\n"
+"\"proxy.domain.com:8000\""
+msgstr ""
+"Вказати адрес і порт HTTP проксі-сервера:\n"
+"\n"
+"\"proxy.domain.com:8000\""
+
+msgid "Help"
+msgstr "Допомога"
diff --git a/rssreader.c b/rssreader.c
index 78ba4b5..4a2cd66 100644
--- a/rssreader.c
+++ b/rssreader.c
@@ -12,15 +12,15 @@
#include "config.h"
#include "common.h"
-#if defined(APIVERSNUM) && APIVERSNUM < 10737
-#error "VDR-1.7.37 API version or greater is required!"
+#if defined(APIVERSNUM) && APIVERSNUM < 20000
+#error "VDR-2.0.0 API version or greater is required!"
#endif
#ifndef GITVERSION
#define GITVERSION ""
#endif
-static const char VERSION[] = "1.7.3" GITVERSION;
+static const char VERSION[] = "2.0.0" GITVERSION;
static const char DESCRIPTION[] = trNOOP("RSS Reader for OSD");
static const char MAINMENUENTRY[] = trNOOP("RSS Reader");
@@ -164,8 +164,9 @@ cString cPluginRssReader::SVDRPCommand(const char *Command, const char *Option,
}
cPluginRssReaderSetup::cPluginRssReaderSetup(void)
+: data(RssConfig)
{
- data = RssConfig;
+ SetMenuCategory(mcSetupPlugins);
Setup();
SetHelp(tr("Button$Load"), NULL, NULL, NULL);
}
diff --git a/rssreader/rssreader.conf b/rssreader/rssreader.conf
index 06067ad..e7fd59c 100644
--- a/rssreader/rssreader.conf
+++ b/rssreader/rssreader.conf
@@ -15,7 +15,7 @@ Savon Sanomat : http://www.savonsanomat.fi/?service=rss
Kauppalehti : http://www.kauppalehti.fi/5/i/talous/uutiset/etusivu/rss.jsp
Muropaketti : http://plaza.fi/muropaketti/feed
Digitoday : http://www.digitoday.fi/feeds/Digitoday.xml
-Verkkouutiset : http://www.verkkouutiset.fi/index.php?option=com_content&view=section&layout=blog&id=5&Itemid=7&format=feed&type=rss
+Verkkouutiset : http://www.verkkouutiset.fi/index.php/kotimaa?format=feed&type=rss
Tietokone : http://www.tietokone.fi/feed/rss/uutiset
Tietoviikko : http://www.tietoviikko.fi/rss.xml
Helsingin kaupunki : http://www.hel.fi/feeds/uutiset.xml
@@ -52,7 +52,7 @@ ScienceBlogs : http://feeds.feedburner.com/ScienceBlogs/Global
Golem : http://rss.golem.de/rss.php?feed=RSS2.0
ZDNet : http://www.zdnet.de/feeds/news/xml/rss_h20.xml.htm
Zeit : http://newsfeed.zeit.de/
-Stern : http://www.stern.de/standard/rss.php?channel=all
+Stern : http://www.stern.de/feed/standard/all/
Spiegel : http://www.spiegel.de/schlagzeilen/index.rss
Bild.de : http://feeds2.feedburner.com/bild.xml
Heise : http://www.heise.de/newsticker/heise.rdf
@@ -78,6 +78,7 @@ LKML Ingo Molnar : http://lkml.org/groupie.php?author=Ingo+Molnar
-- Gentoo : # Label
Gentoo : http://www.gentoo.org/rdf/en/gentoo-news.rdf
VDR Project Overlay : http://overlays.gentoo.org/proj/vdr/timeline?changeset=on&wiki=on&max=50&daysback=90&format=rss
+Gentoo Portage News : http://gentoo-portage.com/RSS/News
Gentoo Portage Ebuilds : http://gentoo-portage.com/RSS/Newest
Gentoo Portage GLSA : http://gentoo-portage.com/RSS/GLSA
Gentoo Portage Overlays : http://gpo.zugaina.org/RSS/News
diff --git a/tools.c b/tools.c
index bb97af5..0020f32 100644
--- a/tools.c
+++ b/tools.c
@@ -33,6 +33,7 @@ static struct conv_table post_conv_table[] =
{"&", "\x26"},
{"&", "\x26"},
{"&", "\x26"},
+ {"'", "\x27"},
{"'", "\x27"},
{"(", "\x28"},
{")", "\x29"},
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-rssreader.git
More information about the pkg-vdr-dvb-changes
mailing list