You can now apply the current settings for hiding events like join or

[quassel.git] / src / client / messagefilter.cpp

diff --git a/src/client/messagefilter.cpp b/src/client/messagefilter.cpp
index cc2ec8b..d5f44c2 100644 (file)
--- a/src/client/messagefilter.cpp
+++ b/src/client/messagefilter.cpp
@@ -46,9 +46,6 @@ MessageFilter::MessageFilter(MessageModel *source, const QList<BufferId> &buffer
 void MessageFilter::init() {
   setDynamicSortFilter(true);
 
 void MessageFilter::init() {
   setDynamicSortFilter(true);
 

-  BufferSettings defaultSettings;
-  _messageTypeFilter = defaultSettings.messageFilter();
-  defaultSettings.notify("MessageTypeFilter", this, SLOT(messageTypeFilterChanged()));

   defaultSettings.notify("UserNoticesInDefaultBuffer", this, SLOT(messageRedirectionChanged()));
   defaultSettings.notify("UserNoticesInStatusBuffer", this, SLOT(messageRedirectionChanged()));
   defaultSettings.notify("UserNoticesInCurrentBuffer", this, SLOT(messageRedirectionChanged()));
   defaultSettings.notify("UserNoticesInDefaultBuffer", this, SLOT(messageRedirectionChanged()));
   defaultSettings.notify("UserNoticesInStatusBuffer", this, SLOT(messageRedirectionChanged()));
   defaultSettings.notify("UserNoticesInCurrentBuffer", this, SLOT(messageRedirectionChanged()));


@@ -62,10 +59,15 @@ void MessageFilter::init() {
   defaultSettings.notify("ErrorMsgsInCurrentBuffer", this, SLOT(messageRedirectionChanged()));
   messageRedirectionChanged();
 
   defaultSettings.notify("ErrorMsgsInCurrentBuffer", this, SLOT(messageRedirectionChanged()));
   messageRedirectionChanged();
 

+  BufferSettings defaultSettings;
+  _messageTypeFilter = defaultSettings.messageFilter();
+  defaultSettings.notify("MessageTypeFilter", this, SLOT(messageTypeFilterChanged()));
+

   BufferSettings mySettings(idString());
   if(mySettings.hasFilter())
     _messageTypeFilter = mySettings.messageFilter();
   mySettings.notify("MessageTypeFilter", this, SLOT(messageTypeFilterChanged()));
   BufferSettings mySettings(idString());
   if(mySettings.hasFilter())
     _messageTypeFilter = mySettings.messageFilter();
   mySettings.notify("MessageTypeFilter", this, SLOT(messageTypeFilterChanged()));

+  mySettings.notify("hasMessageTypeFilter", this, SLOT(messageTypeFilterChanged()));

 }
 
 void MessageFilter::messageTypeFilterChanged() {
 }
 
 void MessageFilter::messageTypeFilterChanged() {