← Back to branch summary

~ubuntu-branches/ubuntu/saucy/irssi/saucy-proposed

« back to all changes in this revision

Viewing changes to debian/patches/14mode-display-fix

  • Committer: Bazaar Package Importer
  • Author(s): Pedro Fragoso
  • Date: 2009-02-04 21:46:19 UTC
  • mfrom: (2.1.2 lenny)
  • Revision ID: james.westby@ubuntu.com-20090204214619-zwmivkza3d0nczab
Tags: 0.8.12-6ubuntu1
https://launchpad.net/bugs/326002
* Merge from Debian unstable (LP: #326002), Ubuntu remaining changes:
  - Added debian/patches/90irc-ubuntu-com.dpatch
  - 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.
      New with this merge: We now also apply this patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/14mode-display-fix
 
1
Author: jilles  vim:ft=diff:
 
2
Description: Fix mode display in whois with unreal (379 numeric).
 
3
  (upstream svn r4637, bug #479)
 
4
 
 
5
Index: irssi-0.8.12/src/fe-common/irc/fe-whois.c
 
6
===================================================================
 
7
--- irssi-0.8.12.orig/src/fe-common/irc/fe-whois.c
 
8
+++ irssi-0.8.12/src/fe-common/irc/fe-whois.c
 
9
@@ -113,8 +113,10 @@ static void event_whois_modes(IRC_SERVER
 
10
 
 
11
        g_return_if_fail(data != NULL);
 
12
 
 
13
-       params = event_get_params(data, 6, NULL, &nick,
 
14
-                                 NULL, NULL, NULL, &modes);
 
15
+       params = event_get_params(data, 3 | PARAM_FLAG_GETREST,
 
16
+                       NULL, &nick, &modes);
 
17
+       if (!strncmp(modes, "is using modes ", 15))
 
18
+               modes += 15;
 
19
        printformat(server, nick, MSGLEVEL_CRAP,
 
20
                    IRCTXT_WHOIS_MODES, nick, modes);
 
21
        g_free(params);