fixes #484 - issues with ssl status indicator

[quassel.git] / src / client / client.h

diff --git a/src/client/client.h b/src/client/client.h
index a67f2ba..ea30bcd 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -90,7 +90,7 @@ public:
    */
   static void removeIdentity(IdentityId id);
 
    */
   static void removeIdentity(IdentityId id);
 

-  static void createNetwork(const NetworkInfo &info);
+  static void createNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList());

   static void updateNetwork(const NetworkInfo &info);
   static void removeNetwork(NetworkId id);
 
   static void updateNetwork(const NetworkInfo &info);
   static void removeNetwork(NetworkId id);
 


@@ -129,7 +129,6 @@ signals:
   void showConfigWizard(const QVariantMap &coredata);
 
   void connected();
   void showConfigWizard(const QVariantMap &coredata);
 
   void connected();

-  void securedConnection();

   void disconnected();
   void coreConnectionStateChanged(bool);
 
   void disconnected();
   void coreConnectionStateChanged(bool);
 


@@ -154,7 +153,7 @@ signals:
   void networkCreated(NetworkId id);
   void networkRemoved(NetworkId id);
 
   void networkCreated(NetworkId id);
   void networkRemoved(NetworkId id);
 

-  void requestCreateNetwork(const NetworkInfo &info);
+  void requestCreateNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList());

   void requestRemoveNetwork(NetworkId);
 
   void newClientSyncer(ClientSyncer *);
   void requestRemoveNetwork(NetworkId);
 
   void newClientSyncer(ClientSyncer *);


@@ -185,10 +184,9 @@ private slots:
   void setConnectedToCore(AccountId id, QIODevice *socket = 0);
   void setSyncedToCore();
   void requestInitialBacklog();
   void setConnectedToCore(AccountId id, QIODevice *socket = 0);
   void setSyncedToCore();
   void requestInitialBacklog();

-  void createDefautBufferView();
+  void createDefaultBufferView();

   void createDefaultIdentity();
   void createDefaultIdentity();

-  void setSecuredConnection();
-
+  void createDefaultNetworks();

 
 private:
   Client(QObject *parent = 0);
 
 private:
   Client(QObject *parent = 0);