openblackhole/openblackhole-enigma2.git
9 years agoAdd 96x64 skin file (not used yet)
Mike Looijmans [Wed, 24 Nov 2010 20:00:48 +0000 (21:00 +0100)]
Add 96x64 skin file (not used yet)

Though you could manually copy skin_display96.xml to skin_display.xml

9 years agofont.cpp: Support 16bpp rendering (dm800se)
Mike Looijmans [Wed, 24 Nov 2010 18:43:51 +0000 (19:43 +0100)]
font.cpp: Support 16bpp rendering (dm800se)

With this change, the 800se displays some readable text.

9 years agoMerge remote branch 'dream/master'
Mike Looijmans [Mon, 22 Nov 2010 19:08:39 +0000 (20:08 +0100)]
Merge remote branch 'dream/master'

9 years agoMerge branch 'bug_617_default_favlist_handling_fix'
ghost [Mon, 22 Nov 2010 16:24:01 +0000 (17:24 +0100)]
Merge branch 'bug_617_default_favlist_handling_fix'

9 years agolib/python/Components/config.py: more robust code
ghost [Mon, 22 Nov 2010 11:43:30 +0000 (12:43 +0100)]
lib/python/Components/config.py: more robust code
#refs #617

9 years agoMovieSelection: Rename e2settings.pkl to .e2settings.pkl
Mike Looijmans [Sun, 21 Nov 2010 13:38:03 +0000 (14:38 +0100)]
MovieSelection: Rename e2settings.pkl to .e2settings.pkl

Makes the files hidden on most systems, see
http://www.pli-images.org/forum/viewthread.php?forum_id=64&thread_id=15746&pid=167924#post_167924

9 years agoDon't assert on missing style id
Mike Looijmans [Sat, 20 Nov 2010 18:08:28 +0000 (19:08 +0100)]
Don't assert on missing style id

See commit:
afbe9cb01976b8e246ceebe299566700f3c55b0c

Rather useless assert

9 years agoservicemp3: implement winding/trickmode
pieterg [Sat, 20 Nov 2010 14:52:12 +0000 (15:52 +0100)]
servicemp3: implement winding/trickmode

And fix a potential subtitle race

9 years agoIpkg: Really support opkg, possibly fix config update question
Mike Looijmans [Fri, 19 Nov 2010 18:41:36 +0000 (19:41 +0100)]
Ipkg: Really support opkg, possibly fix config update question

9 years agoFix plugin crashes in config.py
Mike Looijmans [Wed, 17 Nov 2010 18:57:40 +0000 (19:57 +0100)]
Fix plugin crashes in config.py

Make config.py backward compatible instead by defaulting to old
behaviour.

Broken since 95e2b1d28f81fbeb01e558286806887c556d7a98

9 years agoMerge remote branch 'dream/master'
Mike Looijmans [Tue, 16 Nov 2010 18:10:42 +0000 (19:10 +0100)]
Merge remote branch 'dream/master'

Conflicts:
data/skin_default.xml (ours)
lib/python/Components/Harddisk.py (ours)

9 years agoMerge branch 'bug_599_picload_fd_leak'
ghost [Tue, 16 Nov 2010 10:13:54 +0000 (11:13 +0100)]
Merge branch 'bug_599_picload_fd_leak'

9 years agoRevert "lib/gdi/picload.cpp: add missing fclose (this fixes a ePicload fd leak when...
ghost [Tue, 16 Nov 2010 10:12:20 +0000 (11:12 +0100)]
Revert "lib/gdi/picload.cpp: add missing fclose (this fixes a ePicload fd leak when thumbnailis used)"

This reverts commit a7db0579fc84bfa07c977638325b54c28d7644ce.

... i think i need eyeglasses

9 years agoMerge branch 'bug_619_ask_for_scan_when_no_default_servicelists_are_avail'
ghost [Mon, 15 Nov 2010 22:56:17 +0000 (23:56 +0100)]
Merge branch 'bug_619_ask_for_scan_when_no_default_servicelists_are_avail'

9 years agodata/defaultlists.xml: additionally ask to do a servicescan when no defaultservicelis...
ghost [Mon, 15 Nov 2010 22:55:08 +0000 (23:55 +0100)]
data/defaultlists.xml: additionally ask to do a servicescan when no defaultservicelist was choosed
refs bug #619

9 years agoMerge branch 'bug_617_default_favlist_handling_fix'
ghost [Mon, 15 Nov 2010 21:09:09 +0000 (22:09 +0100)]
Merge branch 'bug_617_default_favlist_handling_fix'

9 years agotemporary disable not working prerequisites
ghost [Mon, 15 Nov 2010 21:08:44 +0000 (22:08 +0100)]
temporary disable not working prerequisites
refs bug #617

9 years agoComponents/Harddisc.py: fix handling for old devfs 7025 kernel
ghost [Mon, 15 Nov 2010 20:06:49 +0000 (21:06 +0100)]
Components/Harddisc.py: fix handling for old devfs 7025 kernel
i.e. this fixes broken free space displaying in aboutbox
refs bug#598

9 years agoMerge branch 'bug_619_ask_for_scan_when_no_default_servicelists_are_avail'
ghost [Mon, 15 Nov 2010 18:20:09 +0000 (19:20 +0100)]
Merge branch 'bug_619_ask_for_scan_when_no_default_servicelists_are_avail'

9 years agoMerge branch 'bug_618_fix_display_recording_indication'
ghost [Mon, 15 Nov 2010 18:20:05 +0000 (19:20 +0100)]
Merge branch 'bug_618_fix_display_recording_indication'

9 years agodefaultsatlists.xml: ask to scan when no default servicelists are avail
ghost [Mon, 15 Nov 2010 18:15:43 +0000 (19:15 +0100)]
defaultsatlists.xml: ask to scan when no default servicelists are avail
refs #619

9 years agoshow all services list on first start, when the favourite list is empty (DVB-C/DVB-T)
ghost [Mon, 15 Nov 2010 17:56:11 +0000 (18:56 +0100)]
show all services list on first start, when the favourite list is empty (DVB-C/DVB-T)
refs #617

9 years agofix record blink widget pos and size
ghost [Mon, 15 Nov 2010 17:55:33 +0000 (18:55 +0100)]
fix record blink widget pos and size
refs #618

9 years agoconfig.py: update configEntrys on additional loadFromFile
ghost [Mon, 15 Nov 2010 17:50:23 +0000 (18:50 +0100)]
config.py: update configEntrys on additional loadFromFile
refs bug #617

9 years agodont install default favourite list when no DVB-S(2) is available
ghost [Mon, 15 Nov 2010 15:30:09 +0000 (16:30 +0100)]
dont install default favourite list when no DVB-S(2) is available

9 years agoMerge remote branch 'remotes/origin/pootle-import'
ghost [Mon, 15 Nov 2010 12:20:36 +0000 (13:20 +0100)]
Merge remote branch 'remotes/origin/pootle-import'

9 years agoMerge remote branch 'remotes/origin/bug_609_packetmanager_fixes'
ghost [Mon, 15 Nov 2010 12:19:58 +0000 (13:19 +0100)]
Merge remote branch 'remotes/origin/bug_609_packetmanager_fixes'

9 years agoAutomatic message catalog update
enigma2-translation-bot [Mon, 15 Nov 2010 12:03:06 +0000 (12:03 +0000)]
Automatic message catalog update

E2 branches: master experimental
Plugins    : ac3lipsync autoresolution autotimer cdinfo genuinedreambox mytube networkbrowser webinterface
Plugins-Meta: description and shortdescription

9 years agoPluginBrowser: Support opkg
Mike Looijmans [Sun, 14 Nov 2010 12:31:58 +0000 (13:31 +0100)]
PluginBrowser: Support opkg

Quick fix to support both ipkg/opkg. Install/remove commands vary
slightly, with this change OpenPLi 2.0 can install from feed.

9 years agoNew Slovenian translations - thanks Taykun345
Littlesat [Fri, 12 Nov 2010 17:58:18 +0000 (18:58 +0100)]
New Slovenian translations - thanks Taykun345

9 years agolib/gdi/picload.cpp: add missing fclose (this fixes a ePicload fd leak when thumbnail...
ghost [Fri, 12 Nov 2010 16:54:51 +0000 (17:54 +0100)]
lib/gdi/picload.cpp: add missing fclose (this fixes a ePicload fd leak when thumbnailis used)
fixes bug #599

9 years agoepgcache: Fix hangup at shutdown
Mike Looijmans [Thu, 11 Nov 2010 18:17:38 +0000 (19:17 +0100)]
epgcache: Fix hangup at shutdown

Merge oversight, on my VU this caused the box to hang when
attempting to shut down. Might be responsible for more hangs
as well.

9 years agoMerge branch 'bug_539_add_multicontent_pixmap_progress'
ghost [Thu, 11 Nov 2010 09:24:49 +0000 (10:24 +0100)]
Merge branch 'bug_539_add_multicontent_pixmap_progress'

9 years agoadd template handling to pixmap progress listboxmulticontent
ghost [Thu, 11 Nov 2010 09:24:34 +0000 (10:24 +0100)]
add template handling to pixmap progress listboxmulticontent
refs #539

9 years agosubtitle.cpp: Compiler warnings
Mike Looijmans [Wed, 10 Nov 2010 17:55:20 +0000 (18:55 +0100)]
subtitle.cpp: Compiler warnings

appeared to be obsolete logging

9 years agoMerge remote branch 'dream/master'
Mike Looijmans [Tue, 9 Nov 2010 18:22:02 +0000 (19:22 +0100)]
Merge remote branch 'dream/master'

Conflicts:
data/skin_default.xml
lib/dvb/demux.cpp
lib/dvb/epgcache.cpp
lib/dvb/epgcache.h
lib/dvb/pmt.cpp
lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
lib/python/Screens/ScanSetup.py
mytest.py

9 years agoRevert "add virtual baseclass for data sources (iDataSource)"
ghost [Wed, 10 Nov 2010 16:20:56 +0000 (17:20 +0100)]
Revert "add virtual baseclass for data sources (iDataSource)"

This reverts commit 81b7cc6b1815ec6f0f0c42d6a826d56c8b35033b.

9 years agoadd virtual baseclass for data sources (iDataSource)
ghost [Tue, 9 Nov 2010 22:21:28 +0000 (23:21 +0100)]
add virtual baseclass for data sources (iDataSource)
let eRawFile inherit from iDataSource

9 years agoScanSetup.py: remove dvb_shutdown_timeout workaround
ghost [Mon, 8 Nov 2010 18:14:46 +0000 (19:14 +0100)]
ScanSetup.py: remove dvb_shutdown_timeout workaround

9 years agomore robust code
ghost [Mon, 8 Nov 2010 15:31:30 +0000 (16:31 +0100)]
more robust code

9 years agoMovieList: Allow skin to set item heights
Mike Looijmans [Mon, 8 Nov 2010 14:50:22 +0000 (15:50 +0100)]
MovieList: Allow skin to set item heights

attribute can be set like: itemHeights="75,37,25"
Together with the font overrides, this allows the skin to use
larger fonts.

9 years agoScanSetup.py: fix abort in transpondersearch when the external transponder tool is...
ghost [Mon, 8 Nov 2010 14:45:29 +0000 (15:45 +0100)]
ScanSetup.py: fix abort in transpondersearch when the external transponder tool is running

9 years agoScanSetup.py: immediate close frontend before execute blindscan util
ghost [Mon, 8 Nov 2010 13:00:43 +0000 (14:00 +0100)]
ScanSetup.py: immediate close frontend before execute blindscan util

9 years agouse a notifier to immediate apply changed epg data file/path (it is then use on e2...
ghost [Sun, 7 Nov 2010 09:36:59 +0000 (10:36 +0100)]
use a notifier to immediate apply changed epg data file/path (it is then use on e2 shutdown to store the epg at the new position)

9 years agoplugin_videoenhancement.xml: re-add dm500hd
ghost [Fri, 5 Nov 2010 19:50:38 +0000 (20:50 +0100)]
plugin_videoenhancement.xml: re-add dm500hd

9 years agoadd more 7020hd changes
ghost [Fri, 5 Nov 2010 19:50:15 +0000 (20:50 +0100)]
add more 7020hd changes

9 years agoadd support for dm7020hd
ghost [Fri, 5 Nov 2010 18:42:09 +0000 (19:42 +0100)]
add support for dm7020hd

9 years agoepgache: move epg cache file name to main enigma2 settings file (config.misc.epgache_...
ghost [Thu, 4 Nov 2010 23:16:16 +0000 (00:16 +0100)]
epgache: move epg cache file name to main enigma2 settings file (config.misc.epgache_filename)

9 years agoepgcache: add possibility to change the default epg cache read/write path
ghost [Thu, 4 Nov 2010 16:23:01 +0000 (17:23 +0100)]
epgcache: add possibility to change the default epg cache read/write path
the path is read from /etc/enigma2/epg.dat.src .. fallback to /hdd/epg.dat when the file not exists

9 years agoMerge branch 'bug_607_parental_control_fix'
ghost [Wed, 3 Nov 2010 16:40:44 +0000 (17:40 +0100)]
Merge branch 'bug_607_parental_control_fix'

9 years agofix more (no more allowed) global imports of parentalControl instance
ghost [Wed, 3 Nov 2010 16:40:34 +0000 (17:40 +0100)]
fix more (no more allowed) global imports of parentalControl instance
refs bug #607

9 years agoMerge branch 'bug_607_parental_control_fix'
ghost [Tue, 2 Nov 2010 19:57:09 +0000 (20:57 +0100)]
Merge branch 'bug_607_parental_control_fix'

9 years agoChannelSelection.py: more parental control fixes
ghost [Tue, 2 Nov 2010 19:56:51 +0000 (20:56 +0100)]
ChannelSelection.py: more parental control fixes
refs bug #607

9 years agofix frequently not working timeshift/record stop
ghost [Tue, 2 Nov 2010 15:58:09 +0000 (16:58 +0100)]
fix frequently not working timeshift/record stop
this fixes bug #612

9 years agoMerge branch 'bug_530_add_dm800se_support'
ghost [Tue, 2 Nov 2010 11:28:46 +0000 (12:28 +0100)]
Merge branch 'bug_530_add_dm800se_support'

9 years agomove windowstyle definitions for LCD/OLED and Color Oled Display to skin_default.xml
ghost [Tue, 2 Nov 2010 11:20:00 +0000 (12:20 +0100)]
move windowstyle definitions for LCD/OLED and Color Oled Display to skin_default.xml

9 years agoadd assertion for missing windowstyle
ghost [Tue, 2 Nov 2010 11:22:43 +0000 (12:22 +0100)]
add assertion for missing windowstyle

9 years agoOnly show subtitle selection menu when subtitles do exist
Littlesat [Mon, 1 Nov 2010 19:26:54 +0000 (20:26 +0100)]
Only show subtitle selection menu when subtitles do exist

9 years agoAutomatic message catalog update
enigma2-translation-bot [Mon, 1 Nov 2010 14:22:24 +0000 (14:22 +0000)]
Automatic message catalog update

E2 branches: master experimental
Plugins    : ac3lipsync autoresolution autotimer cdinfo genuinedreambox mytube networkbrowser webinterface
Plugins-Meta: description and shortdescription

9 years agoAutomatic message catalog update
enigma2-translation-bot [Mon, 1 Nov 2010 13:37:28 +0000 (13:37 +0000)]
Automatic message catalog update

E2 branches: master experimental
Plugins    : ac3lipsync autoresolution autotimer cdinfo genuinedreambox mytube networkbrowser webinterface
Plugins-Meta: description and shortdescription

9 years agofix crash with enabled parentalcontrol in some conditions (i.e. when try to add a...
ghost [Mon, 1 Nov 2010 09:22:21 +0000 (10:22 +0100)]
fix crash with enabled parentalcontrol in some conditions (i.e. when try to add a channel to bouquet/favourites)
refs bug #607

9 years agoSoftwareManager/plugin.py: don't display upgradeable packages also as installed packa...
acid-burn [Sun, 31 Oct 2010 13:25:59 +0000 (14:25 +0100)]
SoftwareManager/plugin.py: don't display upgradeable packages also as installed packages inside PacketManager.
This fixes #609

9 years agoinitalize parental control after bouquet load
ghost [Sat, 30 Oct 2010 14:24:15 +0000 (16:24 +0200)]
initalize parental control after bouquet load
fixes bug #607

9 years agostop PAT parsing after first valid entry for the given SID
ghost [Sat, 30 Oct 2010 11:14:17 +0000 (13:14 +0200)]
stop PAT parsing after first valid entry for the given SID

9 years agoHarddisk.py, MountTask: give udev (or in our case mdev) some time to mount
pieterg [Mon, 25 Oct 2010 20:23:45 +0000 (22:23 +0200)]
Harddisk.py, MountTask: give udev (or in our case mdev) some time to mount

createMovieFolder would run before the newly created partition was mounted

9 years agoShow some progress when formatting harddisk
Mike Looijmans [Sun, 24 Oct 2010 15:26:59 +0000 (17:26 +0200)]
Show some progress when formatting harddisk

Parse the mkfs output a bit to provide progress feedback.
Adjust weighting of tasks since mkfs takes way longer than the others.
Also return to the harddisk menu after hitting OK.

9 years agoTask.py: Fix PythonTask
Mike Looijmans [Sun, 24 Oct 2010 14:23:37 +0000 (16:23 +0200)]
Task.py: Fix PythonTask

broken since 19ed9ee4c17df5b2823efd88c77f17aa30dccc22

9 years agoHarddisk: create movie folder after initializing hdd
pieterg [Sat, 23 Oct 2010 17:40:20 +0000 (19:40 +0200)]
Harddisk: create movie folder after initializing hdd

TODO: PythonTasks do not seem to work, so initializing fails

9 years agoHarddisk: indentation fixes
pieterg [Sat, 23 Oct 2010 17:09:17 +0000 (19:09 +0200)]
Harddisk: indentation fixes

Probably just cosmetic, but with python you cannot be too sure

9 years agoFix DVB-C scan
Mike Looijmans [Sat, 23 Oct 2010 17:30:55 +0000 (19:30 +0200)]
Fix DVB-C scan

Fallback on old method if new API is not available.

broken since: 33b514d049ce8f2e576c613f704c02559b32a905
see: http://www.pli-images.org/forum/viewthread.php?forum_id=64&thread_id=15370&pid=163351#post_163351

9 years agoHarddisk: blacklist 'romblock' devices
pieterg [Sat, 23 Oct 2010 17:00:20 +0000 (19:00 +0200)]
Harddisk: blacklist 'romblock' devices

9 years agoUse Iso 639 language codes for auto language selection
Littlesat [Sat, 23 Oct 2010 16:50:16 +0000 (18:50 +0200)]
Use Iso 639 language codes for auto language selection

9 years agoMerge remote branch 'dream/master'
Mike Looijmans [Fri, 22 Oct 2010 17:35:06 +0000 (19:35 +0200)]
Merge remote branch 'dream/master'

Conflicts:
lib/dvb/demux.cpp

9 years agoUpgrade auto language selection for Slovenian - thanks Taykun345
Littlesat [Thu, 21 Oct 2010 17:59:33 +0000 (19:59 +0200)]
Upgrade auto language selection for Slovenian - thanks Taykun345

9 years agoUpgrade slovanian translations - thanks Taykun345
Littlesat [Thu, 21 Oct 2010 17:56:55 +0000 (19:56 +0200)]
Upgrade slovanian translations - thanks Taykun345

9 years agoIpkg: Don't ever crash E2 on parsing errors
Mike Looijmans [Thu, 21 Oct 2010 16:52:52 +0000 (18:52 +0200)]
Ipkg: Don't ever crash E2 on parsing errors

9 years agoFix online update and optimize Ipkg.py
Mike Looijmans [Thu, 21 Oct 2010 16:14:29 +0000 (18:14 +0200)]
Fix online update and optimize Ipkg.py

'startswith' is a lot cheaper than 'find()==0', and the splits aren't
as difficult as suggested by the code.

9 years agopmt.cpp: use the first matching PMT pid in the PAT
pieterg [Thu, 21 Oct 2010 08:08:30 +0000 (10:08 +0200)]
pmt.cpp: use the first matching PMT pid in the PAT

We used to continue parsing all PAT sections, so when there
were duplicates, we would use the latest match.
Instead, stop looking when we find the first match.

9 years agoadd possibility to set demux buffer size for PES Reader, Section Reader and TS Recorder
ghost [Wed, 20 Oct 2010 22:24:44 +0000 (00:24 +0200)]
add possibility to set demux buffer size for PES Reader, Section Reader and TS Recorder

9 years agoMore languages fixes for autolanguage selection
Littlesat [Wed, 20 Oct 2010 19:58:29 +0000 (21:58 +0200)]
More languages fixes for autolanguage selection

Please note that your settings will be remembered, but when
going to te config you can see None as the selections per
language are different now.

9 years agoFix for autoselection on Polsat "N" provider
Littlesat [Wed, 20 Oct 2010 18:56:47 +0000 (20:56 +0200)]
Fix for autoselection on Polsat "N" provider

E.g. Romanian selection is fixed

9 years agolib/python/Components/config.py: revert previous change because of side effects
ghost [Wed, 20 Oct 2010 18:18:14 +0000 (20:18 +0200)]
lib/python/Components/config.py: revert previous change because of side effects

9 years agoWait for the new drivers
Mike Looijmans [Wed, 20 Oct 2010 16:14:19 +0000 (18:14 +0200)]
Wait for the new drivers

This reverts commit cdcde571a30af6e4856e220f43c82d50c85467a2.
Once we have new drivers, revert the reverts between this commit
and the one mentioned above.

9 years agoRevert "fixes bug #587"
Mike Looijmans [Wed, 20 Oct 2010 16:12:20 +0000 (18:12 +0200)]
Revert "fixes bug #587"

This reverts commit 970cdaf1f5137645fad5f1404d29fdd90127f5fb.

Conflicts:

lib/python/Components/NimManager.py

9 years agoRevert "refs bug #587"
Mike Looijmans [Wed, 20 Oct 2010 16:10:41 +0000 (18:10 +0200)]
Revert "refs bug #587"

This reverts commit 006e3497641164df7a413c8730d9b8914d67e2d8.

Conflicts:

lib/python/Components/NimManager.py

9 years agoRevert "fix slotinfo assignment for new "unsupported tuner" handling"
Mike Looijmans [Wed, 20 Oct 2010 16:09:36 +0000 (18:09 +0200)]
Revert "fix slotinfo assignment for new "unsupported tuner" handling"

This reverts commit 4cf4560a3dfc1a18f4bc894e153dc501965f4b0f.

9 years agoRevert "refs bug #587"
Mike Looijmans [Wed, 20 Oct 2010 16:09:10 +0000 (18:09 +0200)]
Revert "refs bug #587"

This reverts commit d21824019fe93603f1c05c7263ef7570aa60e135.

Conflicts:

lib/python/Components/NimManager.py

9 years agoPrevent a build tonight
Mike Looijmans [Tue, 19 Oct 2010 18:42:14 +0000 (20:42 +0200)]
Prevent a build tonight

frontend and others are too broken now. Added a line to prevent
the build from actually succeeding without fixing it.

9 years agoFix merge typo in NimManager.py
Mike Looijmans [Tue, 19 Oct 2010 17:12:05 +0000 (19:12 +0200)]
Fix merge typo in NimManager.py

9 years agoMerge remote branch 'dream/master' into megamerge
Mike Looijmans [Tue, 19 Oct 2010 16:51:51 +0000 (18:51 +0200)]
Merge remote branch 'dream/master' into megamerge

Conflicts:
lib/python/Components/NimManager.py
lib/python/Plugins/Extensions/MediaPlayer/plugin.py
lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
lib/service/servicemp3.cpp

9 years agoPer accident used Teletekst wich should be teletext in English
Littlesat [Mon, 18 Oct 2010 18:10:30 +0000 (20:10 +0200)]
Per accident used Teletekst wich should be teletext in English

9 years agoBetter description for teletext subtitle delay
Littlesat [Mon, 18 Oct 2010 18:06:48 +0000 (20:06 +0200)]
Better description for teletext subtitle delay

First we had a complicated description as in fact this only
happens when a teletext subtitle has no PTS when a recording
is played or a timeshift. This description is less complica-
ted as it shortens the hole descriptio by "timing info lacks"

9 years agoMerge commit '211a0c7020f0e69de917cb8ce8808799b1268c8f'
Mike Looijmans [Mon, 18 Oct 2010 17:36:54 +0000 (19:36 +0200)]
Merge commit '211a0c7020f0e69de917cb8ce8808799b1268c8f'

9 years agoMerge commit '5f60d706ff61b12a54b4ca0cd94d0cd9cb131404'
Mike Looijmans [Mon, 18 Oct 2010 17:36:05 +0000 (19:36 +0200)]
Merge commit '5f60d706ff61b12a54b4ca0cd94d0cd9cb131404'

9 years agoskin.py: workaround for DVDPlayer crash
Mike Looijmans [Mon, 18 Oct 2010 17:32:43 +0000 (19:32 +0200)]
skin.py: workaround for DVDPlayer crash

Permanent fix will arrive when we support the 800se

9 years agoMerge commit '88e31943f018bc4ba2d7b63bafb8f9129114877a'
Mike Looijmans [Mon, 18 Oct 2010 17:09:01 +0000 (19:09 +0200)]
Merge commit '88e31943f018bc4ba2d7b63bafb8f9129114877a'

9 years agoMerge commit '910c0d916209bb6607b0def237b6c38e27906426'
Mike Looijmans [Mon, 18 Oct 2010 17:08:28 +0000 (19:08 +0200)]
Merge commit '910c0d916209bb6607b0def237b6c38e27906426'

9 years agoMerge commit '714ad2ad3ad21cebe0fe57400d462e4dcce8bb92'
Mike Looijmans [Mon, 18 Oct 2010 17:07:01 +0000 (19:07 +0200)]
Merge commit '714ad2ad3ad21cebe0fe57400d462e4dcce8bb92'

9 years agoMerge commit '6032ae6e6305ddb3c2d60581d0acb73793af0fc3'
Mike Looijmans [Mon, 18 Oct 2010 17:06:29 +0000 (19:06 +0200)]
Merge commit '6032ae6e6305ddb3c2d60581d0acb73793af0fc3'

Conflicts:
lib/python/Components/Ipkg.py

9 years agoMerge commit '8916a028519e706f6b7764839e1adc1d25eddac1'
Mike Looijmans [Mon, 18 Oct 2010 17:05:00 +0000 (19:05 +0200)]
Merge commit '8916a028519e706f6b7764839e1adc1d25eddac1'