forked from blue/squawk
Fixing build without omemo, release preparation, unnecessary inheritance removed, info widget fix
This commit is contained in:
parent
829777935f
commit
acd60eaba2
13 changed files with 92 additions and 40 deletions
|
@ -56,8 +56,11 @@ public slots:
|
|||
signals:
|
||||
void requestVCard(const QString& jid);
|
||||
void requestOwnVCard();
|
||||
|
||||
#ifdef WITH_OMEMO
|
||||
void requestBundles(const QString& jid);
|
||||
void requestOwnBundles();
|
||||
#endif
|
||||
|
||||
void gotVCard(const QString& jid, const Shared::VCard& info);
|
||||
void gotOwnVCard(const Shared::VCard& info);
|
||||
|
@ -68,8 +71,11 @@ public slots:
|
|||
void disconnected();
|
||||
void receivedOwnVCard(const Shared::VCard& card);
|
||||
void receivedVCard(const QString& jid, const Shared::VCard& card);
|
||||
|
||||
#ifdef WITH_OMEMO
|
||||
void receivedBundles(const QString& jid, const std::list<Shared::KeyInfo>& keys);
|
||||
void receivedOwnBundles(const std::list<Shared::KeyInfo>& keys);
|
||||
#endif
|
||||
|
||||
private:
|
||||
void preScheduleJob(Job* job);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue