From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sat, 2 Feb 2008 00:48:40 +0000 (+0000)
Subject: Trying to workaroundinate a weird bug with connection states not always being sent
X-Git-Tag: 0.2.0-alpha1~145
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=c85f07cd06593a778046d30809480c9db49c4802

Trying to workaroundinate a weird bug with connection states not always being sent
to the client... :/
---

diff --git a/src/common/global.cpp b/src/common/global.cpp
index 26abdf95..edf795e3 100644
--- a/src/common/global.cpp
+++ b/src/common/global.cpp
@@ -81,7 +81,7 @@ void Global::registerMetaTypes() {
   qRegisterMetaTypeStreamOperators<BufferInfo>("BufferInfo");
   qRegisterMetaTypeStreamOperators<NetworkInfo>("NetworkInfo");
   qRegisterMetaTypeStreamOperators<Identity>("Identity");
-  qRegisterMetaTypeStreamOperators<int>("Network::ConnectionState");
+  qRegisterMetaTypeStreamOperators<qint8>("Network::ConnectionState");
 
   qRegisterMetaType<IdentityId>("IdentityId");
   qRegisterMetaType<BufferId>("BufferId");
diff --git a/src/common/network.cpp b/src/common/network.cpp
index da1be33a..d3ecab56 100644
--- a/src/common/network.cpp
+++ b/src/common/network.cpp
@@ -95,7 +95,8 @@ bool Network::isConnected() const {
   return _connected;
 }
 
-Network::ConnectionState Network::connectionState() const {
+//Network::ConnectionState Network::connectionState() const {
+int Network::connectionState() const {
   return _connectionState;
 }
 
@@ -369,8 +370,11 @@ void Network::setConnected(bool connected) {
   emit connectedSet(connected);
 }
 
-void Network::setConnectionState(ConnectionState state) {
+//void Network::setConnectionState(ConnectionState state) {
+void Network::setConnectionState(int state) {
   _connectionState = (ConnectionState)state;
+  //qDebug() << "netstate" << networkId() << networkName() << state;
+  emit connectionStateSet(state);
   emit connectionStateSet(_connectionState);
 }
 
diff --git a/src/common/network.h b/src/common/network.h
index 4c04ceb0..25b02bc7 100644
--- a/src/common/network.h
+++ b/src/common/network.h
@@ -53,7 +53,8 @@ class Network : public SyncableObject {
   Q_PROPERTY(QByteArray codecForDecoding READ codecForDecoding WRITE setCodecForDecoding STORED false)
   Q_PROPERTY(IdentityId identityId READ identity WRITE setIdentity STORED false)
   Q_PROPERTY(bool isConnected READ isConnected WRITE setConnected STORED false)
-  Q_PROPERTY(Network::ConnectionState connectionState READ connectionState WRITE setConnectionState STORED false)
+  //Q_PROPERTY(Network::ConnectionState connectionState READ connectionState WRITE setConnectionState STORED false)
+  Q_PROPERTY(int connectionState READ connectionState WRITE setConnectionState STORED false)
 
 public:
   enum ConnectionState { Disconnected, Connecting, Initializing, Initialized, Disconnecting };
@@ -72,7 +73,8 @@ public:
   bool isChannelName(const QString &channelname) const;
 
   bool isConnected() const;
-  Network::ConnectionState connectionState() const;
+  //Network::ConnectionState connectionState() const;
+  int connectionState() const;
 
   QString prefixToMode(const QString &prefix);
   QString prefixToMode(const QCharRef &prefix);
@@ -122,7 +124,8 @@ public slots:
   void setNetworkName(const QString &networkName);
   void setCurrentServer(const QString &currentServer);
   void setConnected(bool isConnected);
-  void setConnectionState(Network::ConnectionState state);
+  //void setConnectionState(Network::ConnectionState state);
+  void setConnectionState(int state);
   void setMyNick(const QString &mynick);
   void setIdentity(IdentityId);
 
@@ -172,6 +175,7 @@ signals:
   void currentServerSet(const QString &currentServer);
   void connectedSet(bool isConnected);
   void connectionStateSet(Network::ConnectionState);
+  void connectionStateSet(int);
   void connectionError(const QString &errorMsg);
   void myNickSet(const QString &mynick);
   void identitySet(IdentityId);
diff --git a/src/qtui/ui/topicwidget.ui b/src/qtui/ui/topicwidget.ui
index 03c87f00..5307a836 100644
--- a/src/qtui/ui/topicwidget.ui
+++ b/src/qtui/ui/topicwidget.ui
@@ -55,7 +55,7 @@
       <string>...</string>
      </property>
      <property name="icon" >
-      <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/configure.png</iconset>
+      <iconset resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/configure.png</iconset>
      </property>
      <property name="iconSize" >
       <size>
diff --git a/version.inc b/version.inc
index 833ddf35..0d5ba337 100644
--- a/version.inc
+++ b/version.inc
@@ -5,14 +5,14 @@
 
   quasselVersion = "0.2.0-pre";
   quasselDate = "2008-02-01";
-  quasselBuild = 433;
+  quasselBuild = 435;
 
   //! Minimum client build number the core needs
-  clientBuildNeeded = 428;
+  clientBuildNeeded = 435;
   clientVersionNeeded = quasselVersion;
 
   //! Minimum core build number the client needs
-  coreBuildNeeded = 428;
+  coreBuildNeeded = 435;
   coreVersionNeeded = quasselVersion;
 
 }