--- ./src/prpl.c	Fri May 30 19:08:45 2003
+++ ../gaim-0.64/./src/prpl.c	Mon Jun 23 10:20:10 2003
@@ -344,9 +344,14 @@
 
 void *get_icon_data(struct gaim_connection *gc, const char *who, int *len)
 {
-	struct icon_data tmp = { gc, normalize(who), NULL, 0 };
-	GList *l = g_list_find_custom(icons, &tmp, find_icon_data);
-	struct icon_data *id = l ? l->data : NULL;
+	struct icon_data tmp = { NULL /* gc */, NULL /* normalize(who) */, NULL, 0 };
+	GList *l;
+	struct icon_data *id;
+
+	tmp.gc = gc;
+	tmp.who = normalize(who);
+	l = g_list_find_custom(icons, &tmp, find_icon_data);
+	id = l ? l->data : NULL;
 
 	if (id) {
 		*len = id->len;
--- ./src/protocols/gg/libgg.c	Sat Jan 11 14:59:27 2003
+++ ../gaim-0.64/./src/protocols/gg/libgg.c	Mon Jun 23 10:20:10 2003
@@ -748,7 +748,7 @@
 		return -1;
 	}
 
-	p = (void*) h + sizeof(struct gg_header);
+	p = (h + 1);
 	
 	if (h->type == GG_RECV_MSG) {
 		struct gg_recv_msg *r = p;
@@ -1129,7 +1129,7 @@
 				break;
 			}
 	
-			w = (void*) h + sizeof(struct gg_header);
+			w = (struct gg_welcome *) (h + 1);
 			w->key = fix32(w->key);
 
 			for (hash = 1; *password; password++)
--- ./src/protocols/oscar/rxhandlers.c	Thu Feb 27 23:26:37 2003
+++ ../gaim-0.64/./src/protocols/oscar/rxhandlers.c	Mon Jun 23 10:20:10 2003
@@ -66,7 +66,7 @@
 	}
 
 	mod->next = (aim_module_t *)sess->modlistv;
-	(aim_module_t *)sess->modlistv = mod;
+	sess->modlistv = mod;
 
 	faimdprintf(sess, 1, "registered module %s (family 0x%04x, version = 0x%04x, tool 0x%04x, tool version 0x%04x)\n", mod->name, mod->family, mod->version, mod->toolid, mod->toolversion);
 
--- ./src/gtkft.c	Thu May 22 22:42:50 2003
+++ ../gaim-0.64/./src/gtkft.c	Mon Jun 23 10:20:10 2003
@@ -491,16 +491,31 @@
 		GtkWidget **desc_label;
 		GtkWidget **val_label;
 		const char *desc;
+	} labels[6];
 
-	} labels[] =
-	{
-		{ &dialog->user_desc_label, &dialog->user_label, NULL },
-		{ &label, &dialog->filename_label,       _("Filename:") },
-		{ &label, &dialog->status_label,         _("Status:") },
-		{ &label, &dialog->speed_label,          _("Speed:") },
-		{ &label, &dialog->time_elapsed_label,   _("Time Elapsed:") },
-		{ &label, &dialog->time_remaining_label, _("Time Remaining:") }
-	};
+	labels[0].desc_label = &dialog->user_desc_label;
+	labels[0].val_label = &dialog->user_label;
+	labels[0].desc = NULL;
+
+	labels[1].desc_label = &label;
+	labels[1].val_label = &dialog->filename_label;
+	labels[1].desc = _("Filename:");
+
+	labels[2].desc_label = &label;
+	labels[2].val_label = &dialog->status_label;
+	labels[2].desc = _("Status:");
+
+	labels[3].desc_label = &label;
+	labels[3].val_label = &dialog->speed_label;
+	labels[3].desc = _("Speed:");
+
+	labels[4].desc_label = &label;
+	labels[4].val_label = &dialog->time_elapsed_label;
+	labels[4].desc = _("Time Elapsed:");
+
+	labels[5].desc_label = &label;
+	labels[5].val_label = &dialog->time_remaining_label;
+	labels[5].desc = _("Time Remaining:");
 
 	/* Setup the initial table */
 	dialog->table = table = gtk_table_new(8, 2, FALSE);
--- ./plugins/perl/perl.c	Wed May 21 11:59:30 2003
+++ ../gaim-0.64/./plugins/perl/perl.c	Mon Jun 23 10:20:10 2003
@@ -370,11 +370,13 @@
 static int
 perl_load_file(char *script_name, GaimPlugin *plugin)
 {
-	char *atmp[2] = { script_name, NULL };
+	char *atmp[2] = { NULL /* script_name */, NULL };
 	GList *s;
 	struct perlscript *scp;
 	int ret;
 
+	atmp[0] = script_name;
+
 	if (my_perl == NULL)
 		perl_init();
 
@@ -1264,9 +1266,11 @@
 
 	GaimPluginInfo *info;
 	PerlInterpreter *prober = perl_alloc();
-	char *argv[] = {"", plugin->path };
+	char *argv[] = {"", NULL /* plugin->path */ };
 	int count;
 	gboolean status = TRUE;
+
+	argv[1] = plugin->path;
 
 	perl_construct(prober);
 	perl_parse(prober, NULL, 2, argv, NULL);