4 files changed, 137 insertions, 94 deletions

diff --git a/net-im/gaim/files/patch-src-gtkimhtml b/net-im/gaim/files/patch-src-gtkimhtml
new file mode 100644
index 000000000000..f5b06e9f1f43
--- /dev/null
+++ b/net-im/gaim/files/patch-src-gtkimhtml
@@ -0,0 +1,16 @@
+--- src/gtkimhtml.c.orig	Fri Apr 23 04:24:05 2004
++++ src/gtkimhtml.c	Sat Apr 24 05:37:14 2004
+@@ -542,10 +542,11 @@
+ 	GtkTextIter start, end;
+ 	GtkTextMark *sel = gtk_text_buffer_get_selection_bound(imhtml->text_buffer);
+ 	GtkTextMark *ins = gtk_text_buffer_get_insert(imhtml->text_buffer);
+-	
++	gboolean primary;
++
+ 	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 --git a/net-im/gaim/files/patch-src-gtkrequest b/net-im/gaim/files/patch-src-gtkrequest
new file mode 100644
index 000000000000..d7db03e09659
--- /dev/null
+++ b/net-im/gaim/files/patch-src-gtkrequest
@@ -0,0 +1,18 @@
+--- src/gtkrequest.c	Sun Apr 18 18:22:41 2004
++++ src/gtkrequest.c	Sat Apr 24 06:19:00 2004
+@@ -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 --git a/net-im/gaim/files/patch-src-protocols-novell b/net-im/gaim/files/patch-src-protocols-novell
new file mode 100644
index 000000000000..cf93ece414ca
--- /dev/null
+++ b/net-im/gaim/files/patch-src-protocols-novell
@@ -0,0 +1,103 @@
+diff -uNr src/protocols/novell/nmcontact.c.orig src/protocols/novell/nmcontact.c
+--- src/protocols/novell/nmcontact.c	Sun Apr 18 06:29:20 2004
++++ src/protocols/novell/nmcontact.c	Sat Apr 24 05:03:53 2004
+@@ -701,10 +701,12 @@
+ 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) {
+diff -uNr src/protocols/novell/nmuser.c.orig src/protocols/novell/nmuser.c
+--- src/protocols/novell/nmuser.c	Thu Apr 22 09:01:16 2004
++++ src/protocols/novell/nmuser.c	Sat Apr 24 05:11:42 2004
+@@ -50,10 +50,12 @@
+ 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 +1649,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 +1695,7 @@
+ 	gint objid1;
+ 	NMContact *contact;
+ 	NMFolder *folder;
++	gpointer item;
+ 
+ 	if (user == NULL || fields == NULL)
+ 		return;
+@@ -1713,8 +1717,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 =
+-					nm_folder_find_item_by_object_id(user->root_folder, objid1);
++				item = nm_folder_find_item_by_object_id(user->root_folder, objid1);
+ 				if (item != NULL) {
+ 					if (cursor->method == NMFIELD_METHOD_ADD) {
+ 						if (g_ascii_strcasecmp(cursor->tag, NM_A_FA_CONTACT) == 0) {
+diff -uNr src/protocols/novell/novell.c.orig src/protocols/novell/novell.c
+--- src/protocols/novell/novell.c	Thu Apr 22 13:53:15 2004
++++ src/protocols/novell/novell.c	Sat Apr 24 05:19:17 2004
+@@ -897,6 +897,7 @@
+ 	const char *text = NULL;
+ 	const char *name = NULL;
+ 	int status = 0;
++	GaimGroup *group;
+ 
+ 	/* Get each contact for this folder */
+ 	cnt = nm_folder_get_contact_count(folder);
+@@ -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));
+@@ -2062,6 +2063,7 @@
+ {
+ 	NMERR_T rc = NM_OK;
+ 	NMUser *user;
++	NMFolder *folder;
+ 
+ 	if (gc == NULL || old_name == NULL || new_name == NULL || tobemoved == NULL) {
+ 		return;
+@@ -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,
diff --git a/net-im/gaim/files/patch-src::protocols::yahoo::yahoo.c b/net-im/gaim/files/patch-src::protocols::yahoo::yahoo.c
deleted file mode 100644
index 2fce1cf7f916..000000000000
--- a/net-im/gaim/files/patch-src::protocols::yahoo::yahoo.c
+++ /dev/null
@@ -1,94 +0,0 @@
-*** ./src/protocols/yahoo/yahoo.c.orig	Wed Apr  7 09:54:00 2004
---- src/protocols/yahoo/yahoo.c	Wed Apr  7 09:59:43 2004
-***************
-*** 895,924 ****
-  	}
-  }
-  
-  #define OUT_CHARSET "utf-8"
-  
-  static char *yahoo_decode(const char *text)
-  {
-  	char *converted;
-! 	char *n, *new;
-! 	const char *end, *p;
-! 	int i;
-! 
-! 	n = new = g_malloc(strlen (text) + 1);
-! 	end = text + strlen(text);
-  
-! 	for (p = text; p < end; p++, n++) {
-  		if (*p == '\\') {
-! 			sscanf(p + 1, "%3o\n", &i);
-! 			*n = i;
-! 			p += 3;
-! 		}
-! 		else
-! 			*n = *p;
-  	}
-- 
-  	*n = '\0';
-- 
-  	converted = g_convert(new, n - new, OUT_CHARSET, "iso-8859-1", NULL, NULL, NULL);
-  	g_free(new);
-  
---- 895,953 ----
-  	}
-  }
-  
-+ 
-+ static void octal(const char **p, const char *end, unsigned char *n)
-+ {
-+ 	int i, c;
-+ 
-+ 	for (i = 0, c = 0; i < 3 && *p < end; ++i, ++*p) {
-+ 		c <<= 3;
-+ 		switch (**p) {
-+ 		case '0': break;
-+ 		case '1': c += 1; break;
-+ 		case '2': c += 2; break;
-+ 		case '3': c += 3; break;
-+ 		case '4': c += 4; break;
-+ 		case '5': c += 5; break;
-+ 		case '6': c += 6; break;
-+ 		case '7': c += 7; break;
-+ 		default:
-+ 			  if (i == 0) {
-+ 				  *n = **p;
-+ 				  ++*p;
-+ 				  return;
-+ 			  }
-+ 			  c >>= 3;
-+ 			  goto done;
-+ 		}
-+ 	}
-+ done:
-+ 	*n = (c > UCHAR_MAX) ? '?' : c;
-+ 	return;
-+ }
-+ 
-  #define OUT_CHARSET "utf-8"
-  
-  static char *yahoo_decode(const char *text)
-  {
-  	char *converted;
-! 	unsigned char *n, *new;
-! 	size_t len;
-! 	const char *p, *end;
-  
-! 	len = strlen (text);
-! 	p = text;
-! 	end = &text[len];
-! 	n = new = g_malloc(len + 1);
-! 	while (p < end) {
-  		if (*p == '\\') {
-! 			++p;
-! 			octal(&p, end, n);
-! 		} else
-! 			*n = *p++;
-! 		++n;
-  	}
-  	*n = '\0';
-  	converted = g_convert(new, n - new, OUT_CHARSET, "iso-8859-1", NULL, NULL, NULL);
-  	g_free(new);
-