# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1043126410 0
# Node ID 2c985a9e994c3ee4adee619ba93e0584e44dd16e
# Parent  90eaa3486949cf4cffaaa71f3545dd89900d0c27
[gaim-migrate @ 4642]
The conversations list is no longer public, and shouldn't have been in
aim.c. This should fix some crashes that may have resulted in the notify
and timestamp plugins.

committer: Tailor Script <tailor@pidgin.im>

diff -r 90eaa3486949 -r 2c985a9e994c plugins/notify.c
--- a/plugins/notify.c	Tue Jan 21 05:12:53 2003 +0000
+++ b/plugins/notify.c	Tue Jan 21 05:20:10 2003 +0000
@@ -508,7 +508,7 @@
 }
 
 void apply_options(GtkWidget *widget, gpointer data) {
-	GList *cnv = conversations;
+	GList *cnv = gaim_get_conversations();
 
 	while (cnv) {
 		guint notification;
diff -r 90eaa3486949 -r 2c985a9e994c plugins/timestamp.c
--- a/plugins/timestamp.c	Tue Jan 21 05:12:53 2003 +0000
+++ b/plugins/timestamp.c	Tue Jan 21 05:20:10 2003 +0000
@@ -26,7 +26,7 @@
 	char mdate[6];
 	time_t tim = time(NULL);
 	
-	if (!g_list_find(conversations, c))
+	if (!g_list_find(gaim_get_conversations(), c))
 		return FALSE;
 
 	strftime(mdate, sizeof(mdate), "%H:%M", localtime(&tim));
@@ -99,7 +99,7 @@
 
 
 char *gaim_plugin_init(GModule *h) {
-	GList *cnvs = conversations;
+	GList *cnvs = gaim_get_conversations();
 	struct gaim_conversation *c;
 	handle = h;
 
diff -r 90eaa3486949 -r 2c985a9e994c src/aim.c
--- a/src/aim.c	Tue Jan 21 05:12:53 2003 +0000
+++ b/src/aim.c	Tue Jan 21 05:20:10 2003 +0000
@@ -65,7 +65,6 @@
 GList *log_conversations = NULL;
 GList *buddy_pounces = NULL;
 GSList *away_messages = NULL;
-GList *conversations = NULL;
 GSList *message_queue = NULL;
 GSList *unread_message_queue = NULL;
 GSList *away_time_queue = NULL;
diff -r 90eaa3486949 -r 2c985a9e994c src/gaim.h
--- a/src/gaim.h	Tue Jan 21 05:12:53 2003 +0000
+++ b/src/gaim.h	Tue Jan 21 05:20:10 2003 +0000
@@ -200,7 +200,6 @@
 
 /* Globals in aim.c */
 extern GList *buddy_pounces;
-extern GList *conversations;
 extern int opt_away;
 extern char *opt_away_arg;
 extern char *opt_rcfile_arg;