X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fchannellistdlg.cpp;h=2eab404019d133f845da9253d9df047fc9aaed7e;hb=71d7e1a6931b5edfa3fd15de5ad82bbca25d1426;hp=093ec2238751ec8715691d331e26c8679caf7710;hpb=02455427bfd88584a81f94b1b234fe21ad3e09cd;p=quassel.git

diff --git a/src/qtui/channellistdlg.cpp b/src/qtui/channellistdlg.cpp
index 093ec223..2eab4040 100644
--- a/src/qtui/channellistdlg.cpp
+++ b/src/qtui/channellistdlg.cpp
@@ -86,8 +86,9 @@ void ChannelListDlg::requestSearch() {
 }
 
 void ChannelListDlg::receiveChannelList(const NetworkId &netId, const QStringList &channelFilters, const QList<IrcListHelper::ChannelDescription> &channelList) {
-  Q_UNUSED(netId)
   Q_UNUSED(channelFilters)
+  if(netId != _netId)
+    return;
 
   showFilterLine(!channelList.isEmpty());
   _ircListModel.setChannelList(channelList);
@@ -107,6 +108,9 @@ void ChannelListDlg::enableQuery(bool enable) {
 
 void ChannelListDlg::setAdvancedMode(bool advanced) {
   _advancedMode = advanced;
+
+#if QT_VERSION >=  0x040400
+  // FIXME: remove if macro when we depend on Qt 4.4
   if(advanced) {
     if(_simpleModeSpacer) {
       ui.searchLayout->removeItem(_simpleModeSpacer);
@@ -121,6 +125,8 @@ void ChannelListDlg::setAdvancedMode(bool advanced) {
     }
     ui.advancedModeLabel->setPixmap(QPixmap(QString::fromUtf8(":/22x22/actions/oxygen/22x22/actions/edit-clear.png")));
   }
+#endif
+  
   ui.channelNameLineEdit->clear();
   ui.channelNameLineEdit->setVisible(advanced);
   ui.searchPatternLabel->setVisible(advanced);