← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/irssi/oneiric

« back to all changes in this revision

Viewing changes to src/fe-common/core/window-activity.c

  • Committer: Bazaar Package Importer
  • Author(s): Andres Rodriguez
  • Date: 2009-05-05 15:50:50 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090505155050-aoqlnpes7che9rtd
Tags: 0.8.13-1ubuntu1
https://launchpad.net/bugs/372411
* Merge from debian unstable (LP: #372411), remaining changes:
  - debian/patches: 03firsttimer_text
    + Adapt it so it tells you about connecting to irc.ubuntu.com and
      joining #ubuntu instead of irc.debian.org and #debian.
  - debian/patches: 90irc-ubuntu-com
* Fixed debian/patches/90irc-ubuntu-com for new irssi.conf.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/fe-common/core/window-activity.c
31
31
#include "nicklist.h"
32
32
#include "hilight-text.h"
33
33
#include "formats.h"
 
34
#include "fe-common-core.h"
34
35
 
35
36
static char **hide_targets;
36
37
static int hide_level, msg_level, hilight_level;
86
87
 
87
88
        if (hide_targets != NULL && (dest->level & MSGLEVEL_HILIGHT) == 0 && dest->target != NULL) {
88
89
                /* check for both target and tag/target */
89
 
                if (strarray_find(hide_targets, dest->target) != -1)
 
90
                if (strarray_find_dest(hide_targets, dest))
90
91
                        return;
91
 
 
92
 
                if (dest->server_tag != NULL) {
93
 
                        char *tagtarget = g_strdup_printf("%s/%s", dest->server_tag, dest->target);
94
 
                        int ret = strarray_find(hide_targets, tagtarget);
95
 
                        g_free(tagtarget);
96
 
                        if (ret != -1)
97
 
                                return;
98
 
                }
99
92
        }
100
93
 
101
94
        if (dest->target != NULL) {