# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1098160376 0
# Node ID b4efa002dad841905ec2175797f8f7139741b029
# Parent  1369e3ae9c9d4277cb014a6b7df4666e66d15e56
[gaim-migrate @ 11161]
warnings -= 3;

committer: Tailor Script <tailor@pidgin.im>

diff -r 1369e3ae9c9d -r b4efa002dad8 plugins/gaim-remote/remote.c
--- a/plugins/gaim-remote/remote.c	Tue Oct 19 03:59:00 2004 +0000
+++ b/plugins/gaim-remote/remote.c	Tue Oct 19 04:32:56 2004 +0000
@@ -474,12 +474,12 @@
 gaim_recv(GIOChannel *source, gchar *buf, gint len)
 {
 	gint total = 0;
-	guint cur;
+	gsize cur;
 
 	GError *error = NULL;
 
 	while (total < len) {
-		if (g_io_channel_read_chars(source, buf + total, len - total, (gsize *) &cur, &error) != G_IO_STATUS_NORMAL) {
+		if (g_io_channel_read_chars(source, buf + total, len - total, &cur, &error) != G_IO_STATUS_NORMAL) {
 			if (error)
 				g_error_free(error);
 			return -1;
diff -r 1369e3ae9c9d -r b4efa002dad8 src/gtkprefs.c
--- a/src/gtkprefs.c	Tue Oct 19 03:59:00 2004 +0000
+++ b/src/gtkprefs.c	Tue Oct 19 04:32:56 2004 +0000
@@ -2218,14 +2218,14 @@
 {
 	struct away_message *amt;
 	GtkTreeIter iter;
-	GtkListStore *ls = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(tv)));
+	GtkTreeModel *ls = gtk_tree_view_get_model(GTK_TREE_VIEW(tv));
 	GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv));
 	GValue val = { 0, };
 
 	/* Get the pointer to the away message and pass that */
-	if (! gtk_tree_selection_get_selected (sel, (GtkTreeModel**)&ls, &iter))
+	if (! gtk_tree_selection_get_selected (sel, &ls, &iter))
 		return;
-	gtk_tree_model_get_value (GTK_TREE_MODEL(ls), &iter, 1, &val);
+	gtk_tree_model_get_value (ls, &iter, 1, &val);
 	amt = g_value_get_pointer (&val);
 /* XXX CORE/UI
 	create_away_mess(NULL, amt);
diff -r 1369e3ae9c9d -r b4efa002dad8 src/plugin.c
--- a/src/plugin.c	Tue Oct 19 03:59:00 2004 +0000
+++ b/src/plugin.c	Tue Oct 19 04:32:56 2004 +0000
@@ -177,6 +177,7 @@
 #ifdef GAIM_PLUGINS
 	GaimPlugin *plugin = NULL;
 	GaimPlugin *loader;
+	gpointer unpunned;
 	gboolean (*gaim_init_plugin)(GaimPlugin *);
 
 	gaim_debug_misc("plugins", "probing %s\n", filename);
@@ -207,7 +208,7 @@
 		}
 
 		if (!g_module_symbol(plugin->handle, "gaim_init_plugin",
-							 (gpointer *)&gaim_init_plugin)) {
+							 &unpunned)) {
 			g_module_close(plugin->handle);
 			plugin->handle = NULL;
 
@@ -219,6 +220,7 @@
 
 			return NULL;
 		}
+		gaim_init_plugin = unpunned;
 	}
 	else {
 		loader = find_loader_for_plugin(plugin);