Merge remote-tracking branch 'origin/bug_689_projectx_subs'

diff --git a/lib/driver/rcconsole.cpp b/lib/driver/rcconsole.cpp
index 97a6e7c7c22354fcc9c0ac308541b0954caf67bc..77f432273551f7e7c7ecd68dce6f999615da519e 100644 (file)
--- a/lib/driver/rcconsole.cpp
+++ b/lib/driver/rcconsole.cpp
@@ -103,7 +103,7 @@ class eRCConsoleInit
        eRCConsoleDriver driver;
        eRCConsole device;
 public:
-       eRCConsoleInit(): driver("/dev/vc/0"), device(&driver)
+       eRCConsoleInit(): driver("/dev/tty0"), device(&driver)
        {
        }
 };

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index ea9e73854e38d51deb14c519e389fb906102ee77..b5de46c9d30d6a5f1df939d612a5a1bc7dac50c2 100644 (file)
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -1860,11 +1860,11 @@ int eDVBFrontend::tuneLoopInt()  // called by m_tuneTimer
                                                int slotid = sec_fe->m_slotid;
                                                // FIXMEEEEEE hardcoded i2c devices for dm7025 and dm8000
                                                if (slotid < 2)
-                                                       sprintf(dev, "/dev/i2c/%d", slotid);
+                                                       sprintf(dev, "/dev/i2c-%d", slotid);
                                                else if (slotid == 2)
-                                                       sprintf(dev, "/dev/i2c/2"); // first nim socket on DM8000 use /dev/i2c/2
+                                                       sprintf(dev, "/dev/i2c-2"); // first nim socket on DM8000 use /dev/i2c-2
                                                else if (slotid == 3)
-                                                       sprintf(dev, "/dev/i2c/4"); // second nim socket on DM8000 use /dev/i2c/4
+                                                       sprintf(dev, "/dev/i2c-4"); // second nim socket on DM8000 use /dev/i2c-4
                                                int fd = ::open(dev, O_RDWR);
 
                                                unsigned char data[2];

diff --git a/lib/gdi/bcm.cpp b/lib/gdi/bcm.cpp
index 12b5f22a2353298dc2927f6a0822cfdc7fc2ad11..ccf16f41ef09b56d01f51a99c4f48a3d93a7ea04 100644 (file)
--- a/lib/gdi/bcm.cpp
+++ b/lib/gdi/bcm.cpp
@@ -23,10 +23,10 @@ static int exec_list(void);
 
 int bcm_accel_init(void)
 {
-       fb_fd = open("/dev/fb/0", O_RDWR);
+       fb_fd = open("/dev/fb0", O_RDWR);
        if (fb_fd < 0)
        {
-               perror("/dev/fb/0");
+               perror("/dev/fb0");
                return 1;
        }
        if (exec_list())

diff --git a/lib/gdi/fb.cpp b/lib/gdi/fb.cpp
index cde3e3572f382cc589f3207f9a743cbcba850abf..7ee555c1f266391aefc9dfba2b18d0acb7469df5 100644 (file)
--- a/lib/gdi/fb.cpp
+++ b/lib/gdi/fb.cpp
@@ -83,12 +83,12 @@ nolfb:
 
 int fbClass::showConsole(int state)
 {
-       int fd=open("/dev/vc/0", O_RDWR);
+       int fd=open("/dev/tty0", O_RDWR);
        if(fd>=0)
        {
                if(ioctl(fd, KDSETMODE, state?KD_TEXT:KD_GRAPHICS)<0)
                {
-                       eDebug("setting /dev/vc/0 status failed.");
+                       eDebug("setting /dev/tty0 status failed.");
                }
                close(fd);
        }

diff --git a/lib/gdi/fb.h b/lib/gdi/fb.h
index 54473805256b893103fc05733d3db52e82e35d56..fcb5ff275ef9b4826d32f980d9a0cf623a4075b1 100644 (file)
--- a/lib/gdi/fb.h
+++ b/lib/gdi/fb.h
@@ -19,7 +19,7 @@ class fbClass
        int m_number_of_pages;
        int m_phys_mem;
 #ifdef SWIG
-       fbClass(const char *fb="/dev/fb/0");
+       fbClass(const char *fb="/dev/fb0");
        ~fbClass();
 public:
 #else
@@ -41,7 +41,7 @@ public:
        unsigned int Stride() { return stride; }
        fb_cmap *CMAP() { return &cmap; }
 
-       fbClass(const char *fb="/dev/fb/0");
+       fbClass(const char *fb="/dev/fb0");
        ~fbClass();
        
                        // low level gfx stuff

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
index 93b089001630cf5d4841e29cf21c9447b6a885e0..c6ad584f328f778c05d2ebaba77539695f69c4c9 100755 (executable)
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -122,8 +122,8 @@ class PluginComponent:
 
                for x in where:
                        res.extend(self.plugins.get(x, [ ]))
-
-               return  res
+               res.sort(key=lambda x:x.weight)
+               return res
 
        def getPluginsForMenu(self, menuid):
                res = [ ]

diff --git a/lib/python/Plugins/Plugin.py b/lib/python/Plugins/Plugin.py
index e26174a1c56f7d244cfbf36e2bf868ae5a6b0fbc..d87e6e96a524e2180e25d8ac0fb45af076d1f8ec 100755 (executable)
--- a/lib/python/Plugins/Plugin.py
+++ b/lib/python/Plugins/Plugin.py
@@ -61,7 +61,7 @@ class PluginDescriptor:
        WHERE_SOFTWAREMANAGER = 14
 
 
-       def __init__(self, name = "Plugin", where = [ ], description = "", icon = None, fnc = None, wakeupfnc = None, needsRestart = None, internal = False):
+       def __init__(self, name = "Plugin", where = [ ], description = "", icon = None, fnc = None, wakeupfnc = None, needsRestart = None, internal = False, weight = 0):
                self.name = name
                self.internal = internal
                self.needsRestart = needsRestart
@@ -78,6 +78,8 @@ class PluginDescriptor:
                else:
                        self.icon = icon
 
+               self.weight = weight
+
                self.wakeupfnc = wakeupfnc
 
                self.__call__ = fnc

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index 54354987003c47fbc59626ba30c88467b2f5029d..bf60496fbe5399652e89ecc1b03c01521c9b81b5 100644 (file)
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -176,7 +176,7 @@ class TimerEditList(Screen):
                del list[:]
                list.extend([(timer, False) for timer in self.session.nav.RecordTimer.timer_list])
                list.extend([(timer, True) for timer in self.session.nav.RecordTimer.processed_timers])
-               list.sort(cmp = lambda x, y: x[0].begin < y[0].begin)
+               list.sort(key = lambda x: x[0].begin)
 
        def showLog(self):
                cur=self["timerlist"].getCurrent()

diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
index 518db49d31501b80d92930ceda42bde23d236be6..8e4d0044fc6043d4ef00f17e6ba15828cabd21f4 100755 (executable)
--- a/lib/python/Tools/Directories.py
+++ b/lib/python/Tools/Directories.py
@@ -57,7 +57,7 @@ defaultPaths = {
                SCOPE_USERETC: ("", PATH_DONTCREATE), # user home directory
                
                SCOPE_DEFAULTDIR: (eEnv.resolve("${datadir}/enigma2/defaults/"), PATH_CREATE),
-               SCOPE_DEFAULTPARTITION: ("/dev/mtdblock/6", PATH_DONTCREATE),
+               SCOPE_DEFAULTPARTITION: ("/dev/mtdblock6", PATH_DONTCREATE),
                SCOPE_DEFAULTPARTITIONMOUNTDIR: (eEnv.resolve("${datadir}/enigma2/dealer"), PATH_CREATE),
                SCOPE_METADIR: (eEnv.resolve("${datadir}/meta"), PATH_CREATE),
        }

diff --git a/tools/enigma2.sh.in b/tools/enigma2.sh.in
index 5914c3f87036e7cffceb8153332c4977427bec0a..2f9292a444126644e1bedde84717c0a0d6178e8f 100755 (executable)
--- a/tools/enigma2.sh.in
+++ b/tools/enigma2.sh.in
@@ -2,9 +2,10 @@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
+datarootdir=@datarootdir@
 
-if [ -x @bindir@/showiframe -a -f /boot/backdrop.mvi ]; then
-       @bindir@/showiframe /boot/backdrop.mvi
+if [ -x @bindir@/showiframe -a -f @datadir@/backdrop.mvi ]; then
+       @bindir@/showiframe @datadir@/backdrop.mvi
 fi
 
 # hook to execute scripts always before enigma2 start