# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 959940078 0
# Node ID f6406aeb26912f674cf18d3a9f501d678114a5c0
# Parent  3069be4c291e937226906d841ba2915089db2592
[gaim-migrate @ 323]
I'm tired.

committer: Tailor Script <tailor@pidgin.im>

diff -r 3069be4c291e -r f6406aeb2691 src/gaim.h
--- a/src/gaim.h	Fri Jun 02 09:11:48 2000 +0000
+++ b/src/gaim.h	Fri Jun 02 10:01:18 2000 +0000
@@ -213,12 +213,14 @@
         int exchange;
 };
 
+#ifdef USE_OSCAR
 struct chat_connection {
 	char *name;
 	int fd; /* this is redundant since we have the conn below */
 	struct aim_conn_t *conn;
 	int inpa;
 };
+#endif
 
 struct debug_window {
 	GtkWidget *window;
@@ -348,7 +350,7 @@
 #define TYPE_SIGNOFF   4
 #define TYPE_KEEPALIVE 5
 
-#define REVISION "gaim:$Revision: 322 $"
+#define REVISION "gaim:$Revision: 323 $"
 #define FLAPON "FLAPON\r\n\r\n"
 
 #define ROAST "Tic/Toc"
@@ -571,9 +573,11 @@
 extern int connect_address(unsigned int, unsigned short);
 
 /* Functions in oscar.c */
+#ifdef USE_OSCAR
 extern int oscar_login(char *, char *);
 extern void oscar_close();
 extern struct chat_connection *find_oscar_chat(char *name);
+#endif /* not #else because we still use some toc functions */
 
 /* Functions in toc.c */
 extern void toc_close();
diff -r 3069be4c291e -r f6406aeb2691 src/server.c
--- a/src/server.c	Fri Jun 02 09:11:48 2000 +0000
+++ b/src/server.c	Fri Jun 02 10:01:18 2000 +0000
@@ -842,6 +842,7 @@
 #else
 	char *i = (char *)gtk_object_get_user_data(GTK_OBJECT(w2));
 	serv_join_chat(0, i); /* for oscar, it doesn't use the id anyway */
+	g_free(i);
 	gtk_widget_destroy(w2);
 #endif
 }
@@ -883,7 +884,7 @@
 #ifndef USE_OSCAR
         gtk_object_set_user_data(GTK_OBJECT(d), (void *)id);
 #else
-	gtk_object_set_user_data(GTK_OBJECT(d), (void *)name);
+	gtk_object_set_user_data(GTK_OBJECT(d), (void *)g_strdup(name));
 #endif