[Pkg-owncloud-commits] [owncloud-client] 47/115: Nautilus Overlays: Use port 34001 by default.

[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 b4941817647ba1f4d7378d870a1f84599c62738d
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Fri Aug 15 17:00:44 2014 +0200

    Nautilus Overlays: Use port 34001 by default.
---
 shell_integration/nautilus/ownCloud.py | 5 ++++-
 src/mirall/socketapi.cpp               | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/shell_integration/nautilus/ownCloud.py b/shell_integration/nautilus/ownCloud.py
index 9c5dc1f..801c6c2 100755
--- a/shell_integration/nautilus/ownCloud.py
+++ b/shell_integration/nautilus/ownCloud.py
@@ -20,11 +20,14 @@ class ownCloudExtension(GObject.GObject, Nautilus.ColumnProvider, Nautilus.InfoP
           # try again in 5 seconds - attention, logic inverted!
           GObject.timeout_add(5000, self.connectToOwnCloud)
 
+    def port(self):
+	return 34001 # Fixme, read from config file.
+
     def connectToOwnCloud(self):
 	try:
           self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 
-          self.sock.connect(("localhost", 33001))
+          self.sock.connect(("localhost", self.port()))
           self.sock.settimeout(5)
           self.connected = True
           self.watch_id = GObject.io_add_watch(self.sock, GObject.IO_IN, self.handle_notify)
diff --git a/src/mirall/socketapi.cpp b/src/mirall/socketapi.cpp
index 1f5f02a..18a22b1 100644
--- a/src/mirall/socketapi.cpp
+++ b/src/mirall/socketapi.cpp
@@ -48,7 +48,7 @@ CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype);
 }
 
 namespace {
-    const int PORT = 33001;
+    const int PORT = 34001;
 }
 
 namespace Mirall {

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