← Back to branch summary

~ubuntu-branches/ubuntu/trusty/irssi-plugin-xmpp/trusty

« back to all changes in this revision

Viewing changes to src/fe-common/xmpp-completion.c

  • Committer: Package Import Robot
  • Author(s): Florian Schlichting
  • Date: 2012-04-08 15:34:43 UTC
  • mfrom: (2.2.5 sid)
  • Revision ID: package-import@ubuntu.com-20120408153443-86n5vxw5ur1zungb
Tags: 0.52-1
http://bugs.debian.org/667987
http://bugs.debian.org/661302
http://bugs.debian.org/609530
* New Maintainer (closes: #667987).
* Imported Upstream version 0.52 (closes: #661302).
  + fixing MUC invites to be compliant (closes: #609530).
* Bumped debhelper compatibility to level 9.
* Refreshed debian/copyright, switching to copyright-format 1.0.
* Bumped Standards-Version to 3.9.3 (no further changes).
* Renamed docs to irssi-plugin-xmpp.docs, include all of docs/, TODO.
* Switched to short debian/rules.
* Added a watch file.
* Added pkg-config to build-dependencies.
* Added Homepage field to source package control paragraph.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/fe-common/xmpp-completion.c
1
1
/*
2
 
 * $Id: xmpp-completion.c,v 1.25 2010/05/14 15:14:23 cdidier Exp $
 
2
 * $Id: xmpp-completion.c,v 1.27 2010/10/24 16:16:25 cdidier Exp $
3
3
 *
4
4
 * Copyright (C) 2007 Colin DIDIER
5
5
 *
37
37
{
38
38
        if (res != NULL)
39
39
                return g_utf8_strchr(res, -1, ' ') == NULL ?
40
 
                    g_strconcat(name, "/", res, NULL) :
41
 
                    g_strconcat("\"", name, "/", res, "\"", NULL);
 
40
                    g_strconcat(name, "/", res, (void *)NULL) :
 
41
                    g_strconcat("\"", name, "/", res, "\"", (void *)NULL);
42
42
        else
43
43
                return g_utf8_strchr(name, -1, ' ') == NULL ?
44
 
                    g_strdup(name) : g_strconcat("\"", name, "\"", NULL);
 
44
                    g_strdup(name) : g_strconcat("\"", name, "\"", (void *)NULL);
45
45
}
46
46
 
47
47
static GList *
67
67
                    || g_strncasecmp(resource->name, resource_name, len) == 0)
68
68
                        list = g_list_append(list, quoted ?
69
69
                            quoted_if_space(nick, resource->name) :
70
 
                            g_strconcat(nick, "/", resource->name, NULL));
 
70
                            g_strconcat(nick, "/", resource->name, (void *)NULL));
71
71
        }
72
72
        return list;
73
73
}
88
88
                        user = (XMPP_ROSTER_USER_REC *)ul->data;
89
89
                        if (strncmp(user->jid, jid, len) == 0) {
90
90
                                if (user->resources != NULL)
91
 
                                        list = g_list_append(list, user->jid);
 
91
                                        list = g_list_append(list,
 
92
                                            g_strdup(user->jid));
92
93
                                else 
93
94
                                        offlist = g_list_append(offlist,
94
 
                                            user->jid);
 
95
                                            g_strdup(user->jid));
95
96
                        } else if (g_strncasecmp(user->jid, jid, len) == 0) {
96
97
                                if (user->resources != NULL)
97
98
                                        list_case = g_list_append(list_case,
98
 
                                            user->jid);
 
99
                                             g_strdup(user->jid));
99
100
                                else
100
101
                                        offlist_case = g_list_append(offlist_case,
101
 
                                            user->jid);
 
102
                                             g_strdup(user->jid));
102
103
                        }
103
104
                }
104
105
        }