X-Git-Url: https://jfr.im/git/irc/weechat/qweechat.git/blobdiff_plain/ca67c3a7dca0e3cc5c708ed0e28fef66586f44ad..4b44d000eebc6d61745b3ddd09548815c30be2d2:/src/qweechat/network.py

diff --git a/src/qweechat/network.py b/src/qweechat/network.py
index 2f97fff..636afcf 100644
--- a/src/qweechat/network.py
+++ b/src/qweechat/network.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2011 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2011-2012 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of QWeeChat, a Qt remote GUI for WeeChat.
 #
@@ -28,8 +28,8 @@ import qt_compat
 QtCore = qt_compat.import_module('QtCore')
 QtNetwork = qt_compat.import_module('QtNetwork')
 
-_PROTO_INIT_CMDS = ['init password=%(password)s,compression=gzip',
-                    '(listbuffers) hdata buffer:gui_buffers(*) number,full_name,short_name,nicklist,title',
+_PROTO_INIT_CMD  = ['init password=%(password)s,compression=gzip']
+_PROTO_SYNC_CMDS = ['(listbuffers) hdata buffer:gui_buffers(*) number,full_name,short_name,type,nicklist,title,local_variables',
                     '(listlines) hdata buffer:gui_buffers(*)/own_lines/first_line(*)/data date,displayed,prefix,message',
                     '(nicklist) nicklist',
                     'sync',
@@ -43,7 +43,7 @@ class Network(QtCore.QObject):
     messageFromWeechat = qt_compat.Signal(QtCore.QByteArray)
 
     def __init__(self, *args):
-        apply(QtCore.QObject.__init__, (self,) + args)
+        QtCore.QObject.__init__(*(self,) + args)
         self.status_disconnected = 'disconnected'
         self.status_connecting = 'connecting...'
         self.status_connected = 'connected'
@@ -61,7 +61,7 @@ class Network(QtCore.QObject):
         """Slot: socket connected."""
         self.statusChanged.emit(self.status_connected, None)
         if self._password:
-            self._socket.write('\n'.join(_PROTO_INIT_CMDS) % {'password': str(self._password)})
+            self._socket.write('\n'.join(_PROTO_INIT_CMD + _PROTO_SYNC_CMDS) % {'password': str(self._password)})
 
     def _socket_error(self, error):
         """Slot: socket error."""
@@ -114,13 +114,22 @@ class Network(QtCore.QObject):
 
     def disconnect_weechat(self):
         if self._socket.state() != QtNetwork.QAbstractSocket.UnconnectedState:
-            if self._socket.state() != QtNetwork.QAbstractSocket.ConnectedState:
+            if self._socket.state() == QtNetwork.QAbstractSocket.ConnectedState:
+                self._socket.write('quit\n')
+                self._socket.waitForBytesWritten(1000)
+            else:
                 self.statusChanged.emit(self.status_disconnected, None)
             self._socket.abort()
 
     def send_to_weechat(self, message):
         self._socket.write(str(message))
 
+    def desync_weechat(self):
+        self._socket.write('desync\n')
+
+    def sync_weechat(self):
+        self._socket.write('\n'.join(_PROTO_SYNC_CMDS))
+
     def status_icon(self, status):
         icon = {self.status_disconnected: 'dialog-close.png',
                 self.status_connecting: 'dialog-close.png',