1 files changed, 0 insertions, 103 deletions
diff --git a/net-im/gaim/files/patch-src-protocols-novell b/net-im/gaim/files/patch-src-protocols-novell
deleted file mode 100644
index cf93ece414ca..000000000000
--- a/net-im/gaim/files/patch-src-protocols-novell
+++ /dev/null
@@ -1,103 +0,0 @@
-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,