# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1082761810 0
# Node ID 5a2b5e4abf3afc299d5aa9976673961d447dc61d
# Parent  d3c0203d49619cc31623f30ece7f7237c87bce54
[gaim-migrate @ 9544]
Compiles again with gcc 2.96. Patch by Ignacio J. Elia.

committer: Tailor Script <tailor@pidgin.im>

diff -r d3c0203d4961 -r 5a2b5e4abf3a COPYRIGHT
--- a/COPYRIGHT	Fri Apr 23 23:08:11 2004 +0000
+++ b/COPYRIGHT	Fri Apr 23 23:10:10 2004 +0000
@@ -36,6 +36,7 @@
 Marc E.
 Andrew Echols
 Sean Egan <sean.egan@binghamton.edu>
+Ignacio J. Elia
 Brian Enigma
 Stefan Esser
 Larry Ewing
diff -r d3c0203d4961 -r 5a2b5e4abf3a ChangeLog
--- a/ChangeLog	Fri Apr 23 23:08:11 2004 +0000
+++ b/ChangeLog	Fri Apr 23 23:10:10 2004 +0000
@@ -7,7 +7,7 @@
 
 	Bug Fixes:
 	* Gadu-Gadu updates (Andrew Wellington)
-
+	* Compiles again with gcc 2.96 (Ignacio J. Elia)
 
 version 0.77 (04/22/2004):
 	New Features:
diff -r d3c0203d4961 -r 5a2b5e4abf3a src/gtkimhtml.c
--- a/src/gtkimhtml.c	Fri Apr 23 23:08:11 2004 +0000
+++ b/src/gtkimhtml.c	Fri Apr 23 23:10:10 2004 +0000
@@ -539,13 +539,14 @@
 #if GTK_CHECK_VERSION(2,2,0)
 static void gtk_imhtml_clipboard_get(GtkClipboard *clipboard, GtkSelectionData *selection_data, guint info, GtkIMHtml *imhtml) {
 	char *text;
+	gboolean primary;
 	GtkTextIter start, end;
 	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;
diff -r d3c0203d4961 -r 5a2b5e4abf3a src/gtkrequest.c
--- a/src/gtkrequest.c	Fri Apr 23 23:08:11 2004 +0000
+++ b/src/gtkrequest.c	Fri Apr 23 23:10:10 2004 +0000
@@ -260,6 +260,7 @@
 	GtkWidget *label;
 	GtkWidget *entry;
 	GtkWidget *img;
+	GtkWidget *toolbar;
 	char *label_text;
 
 	data            = g_new0(GaimGtkRequestData, 1);
@@ -338,7 +339,6 @@
 		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);
 
diff -r d3c0203d4961 -r 5a2b5e4abf3a src/protocols/novell/nmuser.c
--- a/src/protocols/novell/nmuser.c	Fri Apr 23 23:08:11 2004 +0000
+++ b/src/protocols/novell/nmuser.c	Fri Apr 23 23:10:10 2004 +0000
@@ -50,10 +50,11 @@
 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 @@
 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 {
 
@@ -1692,6 +1694,7 @@
 	gint objid1;
 	NMContact *contact;
 	NMFolder *folder;
+	gpointer item;
 
 	if (user == NULL || fields == NULL)
 		return;
@@ -1713,7 +1716,7 @@
 				nm_locate_field(NM_A_SZ_OBJECT_ID, (NMField *) cursor->value);
 			if (locate != NULL && locate->value != 0) {
 				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) {
diff -r d3c0203d4961 -r 5a2b5e4abf3a src/protocols/novell/novell.c
--- a/src/protocols/novell/novell.c	Fri Apr 23 23:08:11 2004 +0000
+++ b/src/protocols/novell/novell.c	Fri Apr 23 23:10:10 2004 +0000
@@ -893,6 +893,7 @@
 	NMUserRecord *user_record = NULL;
 	NMContact *contact = NULL;
 	GaimBuddy *buddy = NULL;
+	GaimGroup *group;
 	NMERR_T cnt = 0, i;
 	const char *text = NULL;
 	const char *name = NULL;
@@ -912,7 +913,7 @@
 									   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));
@@ -2061,6 +2062,7 @@
 					const char *new_name, GList * tobemoved)
 {
 	NMERR_T rc = NM_OK;
+	NMFolder *folder;
 	NMUser *user;
 
 	if (gc == NULL || old_name == NULL || new_name == NULL || tobemoved == NULL) {
@@ -2078,7 +2080,7 @@
 			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,