diff options
| author | Christian Wieninger <cwieninger@gmx.de> | 2013-03-25 23:00:21 +0100 |
|---|---|---|
| committer | Christian Wieninger <cwieninger@gmx.de> | 2013-03-25 23:00:21 +0100 |
| commit | d8aa3e6a03b04d052165a048f6aa4bd1ce9dfc0e (patch) | |
| tree | 255973550b950af0594ed91bed8f10680842a582 | |
| parent | dd02e353512db5897ea329f12cf9e151f7ac6c86 (diff) | |
| parent | a1ecb8915815959f76d9360dafc1733edca78567 (diff) | |
| download | vdr-plugin-epgsearch-d8aa3e6a03b04d052165a048f6aa4bd1ce9dfc0e.tar.gz vdr-plugin-epgsearch-d8aa3e6a03b04d052165a048f6aa4bd1ce9dfc0e.tar.bz2 | |
Merge branch 'master' of git+ssh://gandalf/srv/git/epgsearch
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | menu_conflictcheck.c | 8 | ||||
| -rw-r--r-- | menu_dirselect.c | 4 |
3 files changed, 7 insertions, 7 deletions
@@ -58,7 +58,7 @@ PLUGIN4 = quickepgsearch ### The version number of this plugin (taken from the main source file): -VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g') +VERSION = $(shell grep 'static const char VERSION\[\] *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g') ### The directory environment: diff --git a/menu_conflictcheck.c b/menu_conflictcheck.c index 05ec315..562842e 100644 --- a/menu_conflictcheck.c +++ b/menu_conflictcheck.c @@ -62,8 +62,8 @@ cMenuConflictCheckItem::cMenuConflictCheckItem(cConflictCheckTime* Ct, cConflict cMenuConflictCheck::cMenuConflictCheck() :cOsdMenu("", 4, 12, 4, 5, 30) { -#if VDRVERSNUM >= 10728 - SetMenuCategory(mcSchedule); +#if VDRVERSNUM >= 10734 + SetMenuCategory(mcTimerEdit); #endif showAll = false; lastSel = -1; @@ -197,8 +197,8 @@ bool cMenuConflictCheckDetailsItem::Update(bool Force) cMenuConflictCheckDetails::cMenuConflictCheckDetails(cConflictCheckTimerObj* TimerObj, cConflictCheck* ConflictCheck) :cOsdMenu(tr("Timer conflicts"), 2, 4, 13, 3, 2) { -#if VDRVERSNUM >= 10728 - SetMenuCategory(mcSchedule); +#if VDRVERSNUM >= 10734 + SetMenuCategory(mcTimerEdit); #endif timerObj = TimerObj; checktime = timerObj->conflCheckTime; diff --git a/menu_dirselect.c b/menu_dirselect.c index 2dd9556..2fc24a8 100644 --- a/menu_dirselect.c +++ b/menu_dirselect.c @@ -64,8 +64,8 @@ int cMenuDirItem::Compare(const cListObject &ListObject) const cMenuDirSelect::cMenuDirSelect(char* szDirectory) :cOsdMenu(tr("Select directory")) { -#if VDRVERSNUM >= 10728 - SetMenuCategory(mcTimer); +#if VDRVERSNUM >= 10733 + SetMenuCategory(mcTimerEdit); #endif Directory = szDirectory; |