From 0b4fd7477e6d153e12b58a090dbdd47e825aac4a Mon Sep 17 00:00:00 2001
From: Stefan Persson <stefan.persson@telldus.se>
Date: Tue, 14 Dec 2010 13:07:39 +0000
Subject: [PATCH] Bug with duplicate "Activate Telldus Live!" menu options on
 TC server reconnect fixed.

---
 .../script/com/telldus/live/__init__.js       | 162 +++++++++---------
 1 file changed, 82 insertions(+), 80 deletions(-)

diff --git a/telldus-gui/TelldusCenter/Plugins/script/com/telldus/live/__init__.js b/telldus-gui/TelldusCenter/Plugins/script/com/telldus/live/__init__.js
index e0048173..a0115385 100644
--- a/telldus-gui/TelldusCenter/Plugins/script/com/telldus/live/__init__.js
+++ b/telldus-gui/TelldusCenter/Plugins/script/com/telldus/live/__init__.js
@@ -3,89 +3,91 @@ __setupPackage__( __extension__ );
 com.telldus.live = function() {
     var socket = null;
     var menuId = 0;
+    var separatorId = 0;
     var isRegistered = false;
     var supportedMethods = 0;
-	
-	function init() {
-		socket = new LiveSocket();
-		socket.notRegistered.connect(notRegistered);
-		socket.registered.connect(registered);
-		socket.messageReceived.connect(messageReceived);
-		socket.connectToServer();
-   		//com.telldus.core.deviceEvent.connect(deviceEvent);
-   		com.telldus.core.deviceChange.connect(sendDevicesReport);
-	}
-	
-	function notRegistered() {
-	    isRegistered = false;
-   		if (com.telldus.systray) {
-   		    com.telldus.systray.addSeparator();
-			menuId = com.telldus.systray.addMenuItem( "Activate Telldus Live!" );
-			com.telldus.systray.menuItem(menuId).triggered.connect(socket.activate);
-		    com.telldus.systray.addSeparator();
-		}
-	}
-	
-	function deviceEvent(deviceId, method, data) {
-	    msg = new LiveMessage("DeviceEvent");
-	    msg.append(deviceId);
-	    msg.append(method);
-	    msg.append(data);
-	    socket.sendMessage(msg);
-	}
-	
-	function deviceChangeEvent() {
-	}
-	
-	function messageReceived(msg) {
-		if (msg.name() == "turnon") {
-			com.telldus.core.turnOn( msg.argument(0).intVal() );
-		} else if (msg.name() == "turnoff") {
-			com.telldus.core.turnOff( msg.argument(0).intVal() );
-		} else if (msg.name() == "dim") {
-			com.telldus.core.dim( msg.argument(0).intVal(), msg.argument(1).intVal() );
-		} else if (msg.name() == "bell") {
-			com.telldus.core.bell( msg.argument(0).intVal() );
-		}
-		print("Received: " + msg.name());
-	}
-	
-	function registered(msg) {
-	    if (menuId > 0) {
-	        com.telldus.systray.removeMenuItem(menuId);
-	        menuId = 0;
-	    }
-	    supportedMethods = msg.getInt('supportedMethods');
-	    isRegistered = true;
+
+    function init() {
+        socket = new LiveSocket();
+        socket.notRegistered.connect(notRegistered);
+        socket.registered.connect(registered);
+        socket.messageReceived.connect(messageReceived);
+        socket.connectToServer();
+        //com.telldus.core.deviceEvent.connect(deviceEvent);
+        com.telldus.core.deviceChange.connect(sendDevicesReport);
+    }
+
+    function notRegistered() {
+        isRegistered = false;
+        if (com.telldus.systray && !menuId) {
+            separatorId = com.telldus.systray.addSeparator();
+            menuId = com.telldus.systray.addMenuItem("Activate Telldus Live!");
+            com.telldus.systray.menuItem(menuId).triggered.connect(socket.activate);
+        }
+    }
+
+    function deviceEvent(deviceId, method, data) {
+        msg = new LiveMessage("DeviceEvent");
+        msg.append(deviceId);
+        msg.append(method);
+        msg.append(data);
+        socket.sendMessage(msg);
+    }
+
+    function deviceChangeEvent() {
+    }
+
+    function messageReceived(msg) {
+        if (msg.name() == "turnon") {
+            com.telldus.core.turnOn(msg.argument(0).intVal());
+        } else if (msg.name() == "turnoff") {
+            com.telldus.core.turnOff(msg.argument(0).intVal());
+        } else if (msg.name() == "dim") {
+            com.telldus.core.dim(msg.argument(0).intVal(), msg.argument(1).intVal());
+        } else if (msg.name() == "bell") {
+            com.telldus.core.bell(msg.argument(0).intVal());
+        }
+        print("Received: " + msg.name());
+    }
+
+    function registered(msg) {
+        if (menuId > 0) {
+            com.telldus.systray.removeMenuItem(menuId);
+            com.telldus.systray.removeMenuItem(separatorId);
+            menuId = 0;
+            separatorId = 0;
+        }
+        supportedMethods = msg.getInt('supportedMethods');
+        isRegistered = true;
         sendDevicesReport();
-	}
-	
-	function sendDevicesReport() {
-	    if (!isRegistered) {
-	        return;
-	    }
-	    msg = new LiveMessage("DevicesReport");
-	    var count = com.telldus.core.getNumberOfDevices();
-	    
-	    list = new LiveMessageToken();
-	    for(var i = 0; i < count; ++i) {
-		    var id = com.telldus.core.getDeviceId(i);
-		    device = new LiveMessageToken();
-		    device.set('id', id);
-		    device.set('name', com.telldus.core.getName(id));
-		    device.set('methods', com.telldus.core.methods(id, supportedMethods) );
-		    device.set('state', com.telldus.core.lastSentCommand(id, supportedMethods) );
-		    device.set('stateValue', com.telldus.core.lastSentValue(id, supportedMethods) );
-		    list.add(device);
-		}
-		msg.appendToken(list);
-		socket.sendMessage(msg);
-	}
-	
-	return { //Public functions
-		init:init
-	}
-}();
+    }
+
+    function sendDevicesReport() {
+        if (!isRegistered) {
+            return;
+        }
+        msg = new LiveMessage("DevicesReport");
+        var count = com.telldus.core.getNumberOfDevices();
+
+        list = new LiveMessageToken();
+        for (var i = 0; i < count; ++i) {
+            var id = com.telldus.core.getDeviceId(i);
+            device = new LiveMessageToken();
+            device.set('id', id);
+            device.set('name', com.telldus.core.getName(id));
+            device.set('methods', com.telldus.core.methods(id, supportedMethods));
+            device.set('state', com.telldus.core.lastSentCommand(id, supportedMethods));
+            device.set('stateValue', com.telldus.core.lastSentValue(id, supportedMethods));
+            list.add(device);
+        }
+        msg.appendToken(list);
+        socket.sendMessage(msg);
+    }
+
+    return { //Public functions
+        init: init
+    }
+} ();
 
 __postInit__ = function() {
 	application.allDoneLoading.connect( com.telldus.live.init );