Merge Irssi 0.8.16-rc1

[silc.git] / apps / irssi / src / fe-common / core / fe-ignore-messages.c

diff --git a/apps/irssi/src/fe-common/core/fe-ignore-messages.c b/apps/irssi/src/fe-common/core/fe-ignore-messages.c
index 770f4a4e2848c1ea41003cb0856e76a46bb907b3..32e632604b378e63023346cbfa8882008e4bc255 100644 (file)
--- a/apps/irssi/src/fe-common/core/fe-ignore-messages.c
+++ b/apps/irssi/src/fe-common/core/fe-ignore-messages.c
@@ -13,15 +13,16 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "module.h"
 #include "signals.h"
 #include "levels.h"
 #include "ignore.h"
+#include "servers.h"
 
 static void sig_message_public(SERVER_REC *server, const char *msg,
                               const char *nick, const char *address,
@@ -64,7 +65,9 @@ static void sig_message_kick(SERVER_REC *server, const char *channel,
                             const char *nick, const char *kicker,
                             const char *address, const char *reason)
 {
-       if (ignore_check(server, kicker, address,
+        /* never ignore if you were kicked */
+       if (g_strcasecmp(nick, server->nick) != 0 &&
+           ignore_check(server, kicker, address,
                         channel, reason, MSGLEVEL_KICKS))
                signal_stop();
 }