# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 973248418 0
# Node ID d50d3abb9eb70934f41ea5f555ba6facb5090e27
# Parent  bde34730789c65bee9794f6cfcf4c05799e5a605
[gaim-migrate @ 1067]
attempting to pass -Wall (at least for app)

committer: Tailor Script <tailor@pidgin.im>

diff -r bde34730789c -r d50d3abb9eb7 src/buddy.c
--- a/src/buddy.c	Fri Nov 03 10:31:56 2000 +0000
+++ b/src/buddy.c	Fri Nov 03 10:46:58 2000 +0000
@@ -822,7 +822,6 @@
 	GList *c;
 	struct gaim_plugin *p;
 	void (*gaim_plugin_remove)();
-	char *error;
 
 	/* first we tell those who have requested it we're quitting */
 	plugin_event(event_quit, 0, 0, 0, 0);
diff -r bde34730789c -r d50d3abb9eb7 src/dialogs.c
--- a/src/dialogs.c	Fri Nov 03 10:31:56 2000 +0000
+++ b/src/dialogs.c	Fri Nov 03 10:46:58 2000 +0000
@@ -46,7 +46,6 @@
 #include "pixmaps/ok.xpm"
 #include "pixmaps/add.xpm"
 #include "pixmaps/warn.xpm"
-#include "pixmaps/gnome_remove.xpm"
 
 #include "pixmaps/angel.xpm"
 #include "pixmaps/bigsmile.xpm"
@@ -3244,7 +3243,7 @@
 	GtkWidget *vbox;
 	GtkWidget *bbox;
 	GtkWidget *cancel;
-	GtkWidget *add;
+	static GtkWidget *add = NULL;
 	GtkWidget *label;
         GtkWidget *topbox;
 	static int a, c;
diff -r bde34730789c -r d50d3abb9eb7 src/gaimrc.c
--- a/src/gaimrc.c	Fri Nov 03 10:31:56 2000 +0000
+++ b/src/gaimrc.c	Fri Nov 03 10:46:58 2000 +0000
@@ -707,7 +707,7 @@
 
                 p = parse_line(buf);
                 
-		sscanf(p->option, "sound%c", &i);
+		sscanf(p->option, "sound%c", (char *)&i);
 		i -= 'A';
 		
 		if (p->value[0][0])
diff -r bde34730789c -r d50d3abb9eb7 src/gtkhtml.c
--- a/src/gtkhtml.c	Fri Nov 03 10:31:56 2000 +0000
+++ b/src/gtkhtml.c	Fri Nov 03 10:46:58 2000 +0000
@@ -1839,7 +1839,6 @@
 	GtkWidget *widget = GTK_WIDGET(html);
 	GdkRectangle area;
 	GList *hbits;
-	GtkHtmlBit *hbit;
 	
 	if (html->frozen > 0)
 		return;
@@ -4393,7 +4392,7 @@
 
 static int get_line_height(GtkHtml *html, GtkHtmlBit *start)
 {
-	int height, max_height = 0;
+	int height = 1, max_height = 0;
 	GList *hbits = html->html_bits;
 	GtkHtmlBit *hbit = start; /* default this in case hbits is NULL */
 
diff -r bde34730789c -r d50d3abb9eb7 src/plugins.c
--- a/src/plugins.c	Fri Nov 03 10:31:56 2000 +0000
+++ b/src/plugins.c	Fri Nov 03 10:46:58 2000 +0000
@@ -475,7 +475,6 @@
 	gchar *temp;
 	guint text_len;
 	void (*gaim_plugin_config)();
-	char *error;
 
 	if (confighandle != 0)
 		gtk_signal_disconnect(GTK_OBJECT(config), confighandle);
diff -r bde34730789c -r d50d3abb9eb7 src/proxy.c
--- a/src/proxy.c	Fri Nov 03 10:31:56 2000 +0000
+++ b/src/proxy.c	Fri Nov 03 10:46:58 2000 +0000
@@ -33,6 +33,7 @@
 #include <sys/socket.h>
 #include <netdb.h>
 #include <netinet/in.h>
+#include <unistd.h>
 #include <gtk/gtk.h>
 #include "gaim.h"
 #include "proxy.h"
diff -r bde34730789c -r d50d3abb9eb7 src/prpl.c
--- a/src/prpl.c	Fri Nov 03 10:31:56 2000 +0000
+++ b/src/prpl.c	Fri Nov 03 10:46:58 2000 +0000
@@ -50,9 +50,8 @@
 {
 	struct prpl *p = g_new0(struct prpl, 1);
 	struct prpl *old;
-	GSList *n = protocols;
 	pi(p);
-	if (old = find_prpl(p->protocol))
+	if ((old = find_prpl(p->protocol)) == NULL)
 		unload_protocol(old);
 	protocols = g_slist_insert_sorted(protocols, p, (GCompareFunc)proto_compare);
 }
diff -r bde34730789c -r d50d3abb9eb7 src/server.c
--- a/src/server.c	Fri Nov 03 10:31:56 2000 +0000
+++ b/src/server.c	Fri Nov 03 10:46:58 2000 +0000
@@ -24,6 +24,7 @@
 #endif
 #include <time.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff -r bde34730789c -r d50d3abb9eb7 src/sound.c
--- a/src/sound.c	Fri Nov 03 10:31:56 2000 +0000
+++ b/src/sound.c	Fri Nov 03 10:46:58 2000 +0000
@@ -23,6 +23,7 @@
 #include "../config.h"
 #endif
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
 #include <unistd.h>