allow gaim to compile with gcc2

From: gaim CVS repo via Marc Matteo and Chris Kuethe

net/gaim/patches/patch-src_gtkimhtml_c

@@ -0,0 +1,18 @@
+$OpenBSD: patch-src_gtkimhtml_c,v 1.1 2004/04/24 21:01:16 brad Exp $
+--- src/gtkimhtml.c.orig	2004-04-24 08:54:44.000000000 -0700
++++ src/gtkimhtml.c	2004-04-24 08:56:27.000000000 -0700
+@@ -540,12 +540,13 @@ gboolean gtk_key_pressed_cb(GtkIMHtml *i
+ static void gtk_imhtml_clipboard_get(GtkClipboard *clipboard, GtkSelectionData *selection_data, guint info, GtkIMHtml *imhtml) {
+ 	char *text;
+ 	GtkTextIter start, end;
++	gboolean primary;
+ 	GtkTextMark *sel = gtk_text_buffer_get_selection_bound(imhtml->text_buffer);
+ 	GtkTextMark *ins = gtk_text_buffer_get_insert(imhtml->text_buffer);
+ 	
+ 	gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &start, sel);
+ 	gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &end, ins);
+-	gboolean primary = gtk_widget_get_clipboard(GTK_WIDGET(imhtml), GDK_SELECTION_PRIMARY) == clipboard;
++	primary = gtk_widget_get_clipboard(GTK_WIDGET(imhtml), GDK_SELECTION_PRIMARY) == clipboard;
+ 
+ 	if (info == TARGET_HTML) {
+ 		int len;

net/gaim/patches/patch-src_gtkrequest_c

@@ -0,0 +1,19 @@
+$OpenBSD: patch-src_gtkrequest_c,v 1.1 2004/04/24 21:01:16 brad Exp $
+--- src/gtkrequest.c.orig	2004-04-24 08:57:09.000000000 -0700
++++ src/gtkrequest.c	2004-04-24 08:58:20.000000000 -0700
+@@ -328,6 +328,7 @@ gaim_gtk_request_input(const char *title
+ 
+ 	if ((data->u.input.hint != NULL) && (!strcmp(data->u.input.hint, "html"))) {
+ 		GtkWidget *sw;
++		GtkWidget *toolbar;
+ 
+ 		sw = gtk_scrolled_window_new(NULL, NULL);
+ 		gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
+@@ -338,7 +339,6 @@ gaim_gtk_request_input(const char *title
+ 		gtk_widget_set_size_request(sw, 320, 130);
+ 
+ 		/* Toolbar */
+-		GtkWidget *toolbar;
+ 		toolbar = gtk_imhtmltoolbar_new();
+ 		gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0);
+ 

net/gaim/patches/patch-src_protocols_novell_nmcontact_c

@@ -0,0 +1,16 @@
+$OpenBSD: patch-src_protocols_novell_nmcontact_c,v 1.1 2004/04/24 21:01:16 brad Exp $
+--- src/protocols/novell/nmcontact.c.orig	2004-04-24 08:28:35.000000000 -0700
++++ src/protocols/novell/nmcontact.c	2004-04-24 08:29:11.000000000 -0700
+@@ -701,10 +701,11 @@ nm_folder_add_folder_to_list(NMFolder * 
+ void
+ nm_folder_remove_contact(NMFolder * folder, NMContact * contact)
+ {
++	GSList *node;
+ 	if (folder == NULL || contact == NULL)
+ 		return;
+ 
+-	GSList *node = folder->contacts;
++	node = folder->contacts;
+ 
+ 	while (node) {
+ 		if (contact->id == ((NMContact *) (node->data))->id) {

net/gaim/patches/patch-src_protocols_novell_nmuser_c

@@ -0,0 +1,41 @@
+$OpenBSD: patch-src_protocols_novell_nmuser_c,v 1.1 2004/04/24 21:01:16 brad Exp $
+--- src/protocols/novell/nmuser.c.orig	2004-04-24 08:29:39.000000000 -0700
++++ src/protocols/novell/nmuser.c	2004-04-24 08:31:19.000000000 -0700
+@@ -50,10 +50,11 @@ NMUser *
+ nm_initialize_user(const char *name, const char *server_addr,
+ 				   int port, gpointer data, nm_event_cb event_callback)
+ {
++	NMUser *user;
+ 	if (name == NULL || server_addr == NULL || event_callback == NULL)
+ 		return NULL;
+ 
+-	NMUser *user = g_new0(NMUser, 1);
++	user = g_new0(NMUser, 1);
+ 
+ 	user->conn = g_new0(NMConn, 1);
+ 
+@@ -1647,11 +1648,12 @@ char *
+ nm_typed_to_dotted(const char *typed)
+ {
+ 	unsigned i = 0, j = 0;
++	char *dotted;
+ 
+ 	if (typed == NULL)
+ 		return NULL;
+ 
+-	char *dotted = g_new0(char, strlen(typed));
++	dotted = g_new0(char, strlen(typed));
+ 
+ 	do {
+ 
+@@ -1712,8 +1714,9 @@ _update_contact_list(NMUser * user, NMFi
+ 			locate =
+ 				nm_locate_field(NM_A_SZ_OBJECT_ID, (NMField *) cursor->value);
+ 			if (locate != NULL && locate->value != 0) {
++				gpointer item;
+ 				objid1 = atoi((char *) locate->value);
+-				gpointer item =
++				item =
+ 					nm_folder_find_item_by_object_id(user->root_folder, objid1);
+ 				if (item != NULL) {
+ 					if (cursor->method == NMFIELD_METHOD_ADD) {

net/gaim/patches/patch-src_protocols_novell_novell_c

@@ -0,0 +1,36 @@
+$OpenBSD: patch-src_protocols_novell_novell_c,v 1.1 2004/04/24 21:01:16 brad Exp $
+--- src/protocols/novell/novell.c.orig	2004-04-24 08:31:39.000000000 -0700
++++ src/protocols/novell/novell.c	2004-04-24 08:32:32.000000000 -0700
+@@ -906,13 +906,14 @@ _add_contacts_to_gaim_blist(NMUser * use
+ 
+ 			name = nm_contact_get_display_id(contact);
+ 			if (name) {
++				GaimGroup *group;
+ 				/* Add it to the gaim buddy list */
+ 				buddy = gaim_buddy_new(user->client_data,
+ 									   name,
+ 									   nm_contact_get_display_name(contact));
+ 
+ 				/* Does the Gaim group exist already? */
+-				GaimGroup *group = gaim_find_group(nm_folder_get_name(folder));
++				group = gaim_find_group(nm_folder_get_name(folder));
+ 
+ 				if (group == NULL) {
+ 					group = gaim_group_new(nm_folder_get_name(folder));
+@@ -2069,6 +2070,7 @@ novell_rename_group(GaimConnection * gc,
+ 
+ 	user = gc->proto_data;
+ 	if (user) {
++		NMFolder *folder;
+ 		/* Does new folder exist already? */
+ 		if (nm_find_folder(user, new_name)) {
+ 			/* Gaim currently calls novell_group_buddy() for
+@@ -2078,7 +2080,7 @@ novell_rename_group(GaimConnection * gc,
+ 			return;
+ 		}
+ 
+-		NMFolder *folder = nm_find_folder(user, old_name);
++		folder = nm_find_folder(user, old_name);
+ 
+ 		if (folder) {
+ 			rc = nm_send_rename_folder(user, folder, new_name,