Mercurial > pidgin.yaz
comparison src/protocols/gg/gg.c @ 10412:ecf4f88430cc
[gaim-migrate @ 11661]
I think this is the correct fix for this C99ism/bug/patch-slip-up?
committer: Tailor Script <tailor@pidgin.im>
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Fri, 24 Dec 2004 14:45:30 +0000 |
parents | 3fcfab5f0cc6 |
children | 781a0582d35f |
comparison
equal
deleted
inserted
replaced
10411:151fcda069bc | 10412:ecf4f88430cc |
---|---|
1 /* | 1 /* |
2 * gaim - Gadu-Gadu Protocol Plugin | 2 * gaim - Gadu-Gadu Protocol Plugin |
3 * $Id: gg.c 11653 2004-12-24 01:47:59Z thekingant $ | 3 * $Id: gg.c 11661 2004-12-24 14:45:30Z nosnilmot $ |
4 * | 4 * |
5 * Copyright (C) 2001 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL> | 5 * Copyright (C) 2001 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL> |
6 * | 6 * |
7 * This program is free software; you can redistribute it and/or modify | 7 * This program is free software; you can redistribute it and/or modify |
8 * it under the terms of the GNU General Public License as published by | 8 * it under the terms of the GNU General Public License as published by |
79 }; | 79 }; |
80 | 80 |
81 | 81 |
82 static gchar *charset_convert(const gchar *locstr, const char *encsrc, const char *encdst) | 82 static gchar *charset_convert(const gchar *locstr, const char *encsrc, const char *encdst) |
83 { | 83 { |
84 return (g_convert (locstr, strlen (locstr), encdst, encsrc, NULL, NULL, NULL)); | |
85 | |
86 gchar *msg; | 84 gchar *msg; |
87 GError *err = NULL; | 85 GError *err = NULL; |
88 | 86 |
89 msg = g_convert_with_fallback(locstr, strlen(locstr), encdst, encsrc, "?", NULL, NULL, &err); | 87 msg = g_convert_with_fallback(locstr, strlen(locstr), encdst, encsrc, "?", NULL, NULL, &err); |
90 if (err != NULL) { | 88 if (err != NULL) { |