[Pkg-owncloud-commits] [owncloud-client] 63/211: Nautilus overlay: minor cleanups

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 8371e34d8757384b693fd88552cfbada655d3aa3
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Mon Oct 13 14:59:23 2014 +0200

    Nautilus overlay: minor cleanups
---
 shell_integration/nautilus/syncstate.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/shell_integration/nautilus/syncstate.py b/shell_integration/nautilus/syncstate.py
index 1a62550..91cb782 100755
--- a/shell_integration/nautilus/syncstate.py
+++ b/shell_integration/nautilus/syncstate.py
@@ -29,11 +29,13 @@ class syncStateExtension(GObject.GObject, Nautilus.ColumnProvider, Nautilus.Info
 
     def __init__(self):
         self.connectToSocketServer
+        print "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
         if not self.connected:
             # try again in 5 seconds - attention, logic inverted!
             GObject.timeout_add(5000, self.connectToSocketServer)
 
     def connectToSocketServer(self):
+        do_reconnect = True
         try:
             self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
             postfix = "/"+self.appname+"/socket"
@@ -44,15 +46,18 @@ class syncStateExtension(GObject.GObject, Nautilus.ColumnProvider, Nautilus.Info
 		    print("Socket File: "+sock_file)
 		    self.sock.connect(sock_file)
 		    self.connected = True
+		    print("Setting connected to %r" % self.connected )
 		    self.watch_id = GObject.io_add_watch(self.sock, GObject.IO_IN, self.handle_notify)
-		except:
-		    print("Could not connect to unix socket.")
+		    do_reconnect = False
+		except Exception, e:
+		    print("Could not connect to unix socket." + str(e))
 	    else:
 		 print("Sock-File not valid: "+sock_file)
-        except:
-            print("Connect could not be established, try again later!")
+        except Exception, e:
+            print("Connect could not be established, try again later " + str(e))
             self.sock.close()
-        return not self.connected
+        # print("Returning %r" % do_reconnect)
+        return do_reconnect
 
     def sendCommand(self, cmd):
         if self.connected:
@@ -122,7 +127,7 @@ class syncStateExtension(GObject.GObject, Nautilus.ColumnProvider, Nautilus.Info
 			if( not itemStore['state'] or newState != itemStore['state'] ):
 			    item = itemStore['item']
 			    item.add_emblem(emblem)
-			    # print "Setting emblem on " + parts[2]
+			    # print "Setting emblem on " + parts[2]+ "<>"+emblem+"<>"
 			    self.nautilusVFSFile_table[parts[2]] = {'item': item, 'state':newState}
 
             elif action == 'UPDATE_VIEW':

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git