Merge branch 'obi/master'

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 376a4fd..4826706 100755 (executable)
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -1307,15 +1307,15 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
        </screen>
        <!-- LCD screen (setup) -->
        <screen name="SetupSummary" position="0,0" size="132,64" id="1">
-               <widget source="SetupTitle" render="Label" position="6,0" size="120,16" font="Display;12" />
-               <widget source="SetupEntry" render="Label" position="6,16" size="120,32" font="Display;12" />
-               <widget source="SetupValue" render="Label" position="6,48" size="120,16" font="Display;12" />
+               <widget source="SetupTitle" render="Label" position="6,0" size="120,24" halign="left" font="Display;12" />
+               <widget source="SetupEntry" render="Label" position="6,24" size="120,24" halign="center" font="Display;12" />
+               <widget source="SetupValue" render="Label" position="6,48" size="120,16" halign="right" font="Display;12" />
        </screen>
        <!-- Color OLED screen (setup) -->
        <screen name="SetupSummary" position="0,0" size="96,64" id="2">
-               <widget source="SetupTitle" render="Label" position="0,0" size="96,16" font="Display;10" />
-               <widget source="SetupEntry" render="Label" position="0,16" size="96,32" font="Display;10" />
-               <widget source="SetupValue" render="Label" position="0,48" size="96,16" font="Display;10" />
+               <widget source="SetupTitle" render="Label" position="0,0" size="96,24" halign="left" font="Display;10" />
+               <widget source="SetupEntry" render="Label" position="0,24" size="96,24" halign="center" font="Display;10" />
+               <widget source="SetupValue" render="Label" position="0,48" size="96,16" halign="right" font="Display;10" />
        </screen>
        <!-- LCD screen (misc) -->
        <screen name="SimpleSummary" position="0,0" size="132,64" id="1">

diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp
index 8ac0c71..ed31903 100644 (file)
--- a/lib/dvb/epgcache.cpp
+++ b/lib/dvb/epgcache.cpp
@@ -258,7 +258,7 @@ void eEPGCache::timeUpdated()
                        {
                                if (it->second->state == -1) {
                                        it->second->state=0;
-                                       messages.send(Message(Message::startChannel, it->second));
+                                       messages.send(Message(Message::startChannel, it->first));
                                }
                        }
                } else

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 6a464af..3e58091 100644 (file)
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -905,7 +905,7 @@ RESULT eServiceFactoryDVB::lookupService(ePtr<eDVBService> &service, const eServ
                /* we are sure to have a ..DVB reference as the info() call was forwarded here according to it's ID. */
                if ((err = db->getService((eServiceReferenceDVB&)ref, service)) != 0)
                {
-                       eDebug("getService failed!");
+//                     eDebug("getService failed!");
                        return err;
                }
        }