diff options
| author | Richard Maudsley <richard.maudsley@isode.com> | 2014-06-30 10:42:05 (GMT) | 
|---|---|---|
| committer | Swift Review <review@swift.im> | 2014-07-09 12:53:37 (GMT) | 
| commit | 1edfc36235cc67d303ceb2bcf0630affc509f2f7 (patch) | |
| tree | 0ca86a9e5e0dbcd3876ce91b4bf4feec5321c9c9 /Swift/QtUI/UserSearch/QtContactListWidget.h | |
| parent | 05d9e618e4c756e50b633448f0546614a645a13d (diff) | |
| download | swift-contrib-1edfc36235cc67d303ceb2bcf0630affc509f2f7.zip swift-contrib-1edfc36235cc67d303ceb2bcf0630affc509f2f7.tar.bz2 | |
Fix attempting to start impromptu chat when impromptu not supported.
Test-Information:
Connect to a server where impromptu is NOT supported. Confirm that adding multiple users by dragging or typing into the JID box is not allowed.
Connect to a server where impromptu is supported. Confirm that it is still possible to drag multiple users and add multiple users by typing into the JID box.
Change-Id: Ibb4c1f7d6a5820f7ccf3629c1e0d30a441d9d159
Diffstat (limited to 'Swift/QtUI/UserSearch/QtContactListWidget.h')
| -rw-r--r-- | Swift/QtUI/UserSearch/QtContactListWidget.h | 1 | 
1 files changed, 1 insertions, 0 deletions
| diff --git a/Swift/QtUI/UserSearch/QtContactListWidget.h b/Swift/QtUI/UserSearch/QtContactListWidget.h index 601d320..112f3ee 100644 --- a/Swift/QtUI/UserSearch/QtContactListWidget.h +++ b/Swift/QtUI/UserSearch/QtContactListWidget.h @@ -8,55 +8,56 @@   * Copyright (c) 2014 Kevin Smith and Remko Tronçon   * Licensed under the GNU General Public License v3.   * See Documentation/Licenses/GPLv3.txt for more information.   */  #pragma once  #include <vector>  #include <QTreeView>  #include <Swift/Controllers/Contact.h>  #include <Swiften/Base/Log.h>  #include <QDragEnterEvent>  #include <QDragMoveEvent>  #include <QDropEvent>  namespace Swift {  class ContactListDelegate;  class ContactListModel;  class SettingsProvider;  class QtRemovableItemDelegate;  class QtContactListWidget : public QTreeView {  	Q_OBJECT  public:  	QtContactListWidget(QWidget* parent, SettingsProvider* settings);  	virtual ~QtContactListWidget();  	void setList(const std::vector<Contact::ref>& list);  	std::vector<Contact::ref> getList() const;  	Contact::ref getContact(const size_t i);  	void setMaximumNoOfContactsToOne(bool limited); +	bool isFull() const;  public slots:  	void updateContacts(const std::vector<Contact::ref>& contactUpdates);  signals:  	void onListChanged(std::vector<Contact::ref> list);  	void onJIDsAdded(const std::vector<JID>& jids);  private:  	void handleSettingsChanged(const std::string&);  private:  	SettingsProvider* settings_;  	ContactListModel* contactListModel_;  	ContactListDelegate* contactListDelegate_;  	QtRemovableItemDelegate* removableItemDelegate_;  	bool limited_;  };  } | 
 Swift
 Swift