From: Chang.H.S <jhs@dev3>
Date: Wed, 12 Dec 2012 05:37:18 +0000 (+0900)
Subject: Merge branch 'vuplus_experimental' of code.vuplus.com:/opt/repository/dvbapp into... 
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=8c714bd3d208e4b555f53e08f7626b40390a0d23;hp=bda92297ae6dc9c68b0279c77c2093cae160f428

Merge branch 'vuplus_experimental' of code.vuplus.com:/opt/repository/dvbapp into vuplus_experimental
---

diff --git a/lib/python/Plugins/Extensions/DLNAServer/dlnaserver b/lib/python/Plugins/Extensions/DLNAServer/dlnaserver
index 10b2e1a..db13d83 100644
Binary files a/lib/python/Plugins/Extensions/DLNAServer/dlnaserver and b/lib/python/Plugins/Extensions/DLNAServer/dlnaserver differ
diff --git a/lib/python/Plugins/Extensions/HbbTV/plugin.py b/lib/python/Plugins/Extensions/HbbTV/plugin.py
index ab36038..56db6d8 100644
--- a/lib/python/Plugins/Extensions/HbbTV/plugin.py
+++ b/lib/python/Plugins/Extensions/HbbTV/plugin.py
@@ -350,9 +350,12 @@ class StreamServer:
 class ServerFactory:
 	def doListenUnixTCP(self, name, handler):
 		def destroy(name):
-			if os.path.exists(name):
-				os.unlink(name)
-				print "Removed ", name
+			import os
+			try:
+				if os.path.exists(name):
+					os.unlink(name)
+					print "Removed ", name
+			except: pass
 		destroy(name)
 
 		params = SocketParams()
diff --git a/lib/python/Plugins/SystemPlugins/3GModemManager/3gcommand b/lib/python/Plugins/SystemPlugins/3GModemManager/3gcommand
index 2a6a1db..7e4f33b 100644
Binary files a/lib/python/Plugins/SystemPlugins/3GModemManager/3gcommand and b/lib/python/Plugins/SystemPlugins/3GModemManager/3gcommand differ