Mercurial > pidgin

diff src/protocols/oscar/oscar.c @ 7475:08ce2a94d9c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 8088] I made Gaim compile with -ansi in my CFLAGS... I don't really know why. I had to set HAVE_GETADDRINFO and HAVE_SIGNAL_H to 0 committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Tue, 11 Nov 2003 07:08:13 +0000
parents 2bdacd38528c
children 3c21f3084ff0
line wrap: on
line diff
--- a/src/protocols/oscar/oscar.c	Tue Nov 11 05:57:24 2003 +0000
+++ b/src/protocols/oscar/oscar.c	Tue Nov 11 07:08:13 2003 +0000
@@ -1846,7 +1846,7 @@
 			while (cur && aim_sncmp((char *)cur->data, info->sn))
 				cur = cur->next;
 			if (!cur) {
-				od->requesticon = g_slist_append(od->requesticon, strdup(gaim_normalize(gc->account, info->sn)));
+				od->requesticon = g_slist_append(od->requesticon, g_strdup(gaim_normalize(gc->account, info->sn)));
 				if (od->icontimer)
 					g_source_remove(od->icontimer);
 				od->icontimer = g_timeout_add(500, gaim_icon_timerfunc, gc);
@@ -2161,7 +2161,7 @@
 static int incomingim_chan1(aim_session_t *sess, aim_conn_t *conn, aim_userinfo_t *userinfo, struct aim_incomingim_ch1_args *args) {
 	GaimConnection *gc = sess->aux_data;
 	OscarData *od = gc->proto_data;
-	char *tmp;
+	gchar *tmp;
 	GaimConvImFlags flags = 0;
 	gsize convlen;
 	GError *err = NULL;
@@ -2238,7 +2238,7 @@
 		if (err) {
 			gaim_debug(GAIM_DEBUG_INFO, "oscar",
 					   "Unicode IM conversion: %s\n", err->message);
-			tmp = strdup(_("(There was an error receiving this message)"));
+			tmp = g_strdup(_("(There was an error receiving this message)"));
 			g_error_free(err);
 		}
 	} else {
@@ -2260,7 +2260,7 @@
 		if (err) {
 			gaim_debug(GAIM_DEBUG_INFO, "oscar",
 					   "ISO-8859-1 IM conversion: %s\n", err->message);
-			tmp = strdup(_("(There was an error receiving this message)"));
+			tmp = g_strdup(_("(There was an error receiving this message)"));
 			g_error_free(err);
 		}
 	}