Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Hacker <dd0t@users.sourceforge.net>2013-09-01 04:02:44 +0400
committerStefan Hacker <dd0t@users.sourceforge.net>2013-09-19 02:23:47 +0400
commit8f30d0c26b7b4b97eed288b74facac60d383e55e (patch)
treedc03cb4e6514ea2111baaae1fd82f311fe841c1b /src/mumble/Database.h
parentb422e0a90566c2512858641e52abb9aec35a09cd (diff)
First set of fixes for filter patch
Compare to review comments on https://github.com/mumble-voip/mumble/commit/304bf438daecad36285b8647b9bc72b685cf31ca - No longer use channel name for identifying filtered channels. Switched to using server certificate digest combined with Channel id which works between servers and with duplicate channel names. The digest should be replaced by proper server identification soon. Ideally the client should keep a list which identifies servers by their address or - if a strong certificate is available - by certificate email. This can be re-used for tokens and other server dependent configuration. - Changed naming from 'hidden' to 'filtered' - Removed tray menu entry - Removed global shortcut for channel hiding/showing
Diffstat (limited to 'src/mumble/Database.h')
-rw-r--r--src/mumble/Database.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mumble/Database.h b/src/mumble/Database.h
index 6c1caf0b6..c10ccd50c 100644
--- a/src/mumble/Database.h
+++ b/src/mumble/Database.h
@@ -60,8 +60,8 @@ class Database : public QObject {
static bool isLocalMuted(const QString &hash);
static void setLocalMuted(const QString &hash, bool muted);
- static bool isLocalHidden(const QString &hash);
- static void setLocalHidden(const QString &hash, bool hidden);
+ static bool isChannelFiltered(const QByteArray &server_cert_digest, const int channel_id);
+ static void setChannelFiltered(const QByteArray &server_cert_digest, const int channel_id, bool hidden);
static QMap<QPair<QString, unsigned short>, unsigned int> getPingCache();
static void setPingCache(const QMap<QPair<QString, unsigned short>, unsigned int> &cache);