# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1054320243 0
# Node ID cc9ddec20010f877e0742117dbdcc067613dcd29
# Parent  9896e9068bc4ea6d340836d80e43dba6c6c43c33
[gaim-migrate @ 5969]
More fixing.

committer: Tailor Script <tailor@pidgin.im>

diff -r 9896e9068bc4 -r cc9ddec20010 src/gtkaccount.c
--- a/src/gtkaccount.c	Fri May 30 18:31:15 2003 +0000
+++ b/src/gtkaccount.c	Fri May 30 18:44:03 2003 +0000
@@ -98,9 +98,11 @@
 	gtk_widget_show(vbox);
 
 	/* Setup the scrolled window that will contain the list of accounts. */
+#if 0
 	sw = __create_accounts_list();
 	gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
 	gtk_widget_show(sw);
+#endif
 
 	/* Separator... */
 	sep = gtk_hseparator_new();
diff -r 9896e9068bc4 -r cc9ddec20010 src/gtkprefs.c
--- a/src/gtkprefs.c	Fri May 30 18:31:15 2003 +0000
+++ b/src/gtkprefs.c	Fri May 30 18:44:03 2003 +0000
@@ -869,13 +869,14 @@
 	GtkWidget *vbox;
 	GtkWidget *button, *warn_checkbox, *idle_checkbox;
 	GList *l= NULL;
-	GSList *sl = gaim_gtk_blist_sort_methods;
+	GSList *sl;
 	ret = gtk_vbox_new(FALSE, 18);
 	gtk_container_set_border_width (GTK_CONTAINER (ret), 12);
 	
 	
 	vbox = gaim_gtk_make_frame (ret, _("Buddy List Sorting"));
-	while (sl) {
+
+	for (sl = gaim_gtk_blist_sort_methods; sl != NULL; sl = sl->next) {
 		char *name = ((struct gaim_gtk_blist_sort_method*)sl->data)->name;
 
 		l = g_list_append(l, name);
@@ -2673,6 +2674,8 @@
 	gaim_prefs_add_bool("/plugins/gtk/docklet/queue_messages", FALSE);
 
 	/* Accounts Dialog */
+	gaim_prefs_add_none("/gaim/gtk/accounts");
+	gaim_prefs_add_none("/gaim/gtk/accounts/dialog");
 	gaim_prefs_add_int("/gaim/gtk/accounts/dialog/width",  550);
 	gaim_prefs_add_int("/gaim/gtk/accounts/dialog/height", 250);
 
diff -r 9896e9068bc4 -r cc9ddec20010 src/protocols/msn/msn.c
--- a/src/protocols/msn/msn.c	Fri May 30 18:31:15 2003 +0000
+++ b/src/protocols/msn/msn.c	Fri May 30 18:44:03 2003 +0000
@@ -30,9 +30,6 @@
 
 static GaimPlugin *my_protocol = NULL;
 
-/* for win32 compatability */
-G_MODULE_IMPORT GSList *connections;
-
 static char *msn_normalize(const char *str);
 
 typedef struct
diff -r 9896e9068bc4 -r cc9ddec20010 src/protocols/msn/notification.c
--- a/src/protocols/msn/notification.c	Fri May 30 18:31:15 2003 +0000
+++ b/src/protocols/msn/notification.c	Fri May 30 18:44:03 2003 +0000
@@ -34,7 +34,6 @@
 
 static GHashTable *notification_commands  = NULL;
 static GHashTable *notification_msg_types = NULL;
-G_MODULE_IMPORT GSList *connections;
 
 /**************************************************************************
  * Utility functions
@@ -115,7 +114,7 @@
 static void
 msn_accept_add_cb(MsnPermitAdd *pa)
 {
-	if (g_slist_find(connections, pa->gc) != NULL) {
+	if (g_list_find(gaim_connections_get_all(), pa->gc) != NULL) {
 		MsnSession *session = pa->gc->proto_data;
 		char outparams[MSN_BUF_LEN];
 
@@ -144,7 +143,7 @@
 static void
 msn_cancel_add_cb(MsnPermitAdd *pa)
 {
-	if (g_slist_find(connections, pa->gc) != NULL) {
+	if (g_list_find(gaim_connections_get_all(), pa->gc) != NULL) {
 		MsnSession *session = pa->gc->proto_data;
 		char outparams[MSN_BUF_LEN];