Removing obsolete 0.77-r2 and all it's patch files

9 files changed, 0 insertions, 497 deletions

diff --git a/net-im/gaim/files/digest-gaim-0.77-r2 b/net-im/gaim/files/digest-gaim-0.77-r2
deleted file mode 100644
index 9b4f6738da22..000000000000
--- a/net-im/gaim/files/digest-gaim-0.77-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d2ac2eb75e5e27f7fddf2a7dc19eb045 gaim-0.77.tar.bz2 3709914
diff --git a/net-im/gaim/files/gaim-0.77-64bit_goodness.patch b/net-im/gaim/files/gaim-0.77-64bit_goodness.patch
deleted file mode 100644
index 54f55d8397b3..000000000000
--- a/net-im/gaim/files/gaim-0.77-64bit_goodness.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-#gaim grim's 64bit fixing patch v2
-sha.h fixes yahoo on x86-64
-everything else is for compile warnings
-
-Index: src/gtkimhtml.c
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
-retrieving revision 1.322
-diff -u -p -r1.322 gtkimhtml.c
---- src/gtkimhtml.c	2 May 2004 18:12:07 -0000	1.322
-+++ src/gtkimhtml.c	4 May 2004 07:26:28 -0000
-@@ -553,7 +553,7 @@ static void gtk_imhtml_clipboard_get(Gtk
- 	primary = gtk_widget_get_clipboard(GTK_WIDGET(imhtml), GDK_SELECTION_PRIMARY) == clipboard;
- 
- 	if (info == TARGET_HTML) {
--		int len;
-+		gsize len;
- 		char *selection;
- 		GString *str = g_string_new(NULL);
- 		if (primary) {
-Index: src/sha.h
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/sha.h,v
-retrieving revision 1.3
-diff -u -p -r1.3 sha.h
---- src/sha.h	28 Sep 2003 01:10:06 -0000	1.3
-+++ src/sha.h	4 May 2004 07:26:28 -0000
-@@ -1,22 +1,41 @@
--#if (SIZEOF_INT == 4)
--typedef unsigned int uint32;
--#elif (SIZEOF_SHORT == 4)
--typedef unsigned short uint32;
--#else
--typedef unsigned int uint32;
--#endif /* HAVEUINT32 */
-- 
--int strprintsha(char *dest, int *hashval);
-- 
-+/* 
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ * 
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ * 
-+ * The Original Code is SHA 180-1 Reference Implementation (Compact version)
-+ * 
-+ * The Initial Developer of the Original Code is Paul Kocher of
-+ * Cryptography Research.  Portions created by Paul Kocher are 
-+ * Copyright (C) 1995-9 by Cryptography Research, Inc.  All
-+ * Rights Reserved.
-+ * 
-+ * Contributor(s):
-+ *
-+ */
-+#ifndef _SHA_H_
-+#define _SHA_H_
-+
-+#include <glib.h>
-+
- typedef struct {
--  unsigned long H[5];
--  unsigned long W[80];
--  int lenW;
--  unsigned long sizeHi,sizeLo;
-+	guint32 H[5];
-+ 	guint32 W[80];
-+	int lenW;
-+	guint32 sizeHi;
-+	guint32 sizeLo;
- } SHA_CTX;
-- 
-+
-+int strprintsha(char *dest, int *hashval);
- void shaInit(SHA_CTX *ctx);
- void shaUpdate(SHA_CTX *ctx, unsigned char *dataIn, int len);
- void shaFinal(SHA_CTX *ctx, unsigned char hashout[20]);
- void shaBlock(unsigned char *dataIn, int len, unsigned char hashout[20]);
--                                                                                                         
-+
-+#endif
-Index: src/util.c
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/util.c,v
-retrieving revision 1.283
-diff -u -p -r1.283 util.c
---- src/util.c	21 Apr 2004 01:34:23 -0000	1.283
-+++ src/util.c	4 May 2004 07:26:30 -0000
-@@ -302,7 +302,8 @@ gaim_mime_decode_field(const char *str)
- 
- 	for (unencoded = cur = str; (encoded = cur = strstr(cur, "=?")); unencoded = cur) {
- 		gboolean found_word = FALSE;
--		int i, num, len, dec_len;
-+		int i, num, dec_len;
-+		gsize len;
- 		char *decoded, *converted;
- 		char *tokens[3];
- 
-Index: src/protocols/oscar/oscar.c
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
-retrieving revision 1.584
-diff -u -p -r1.584 oscar.c
---- src/protocols/oscar/oscar.c	1 May 2004 22:17:43 -0000	1.584
-+++ src/protocols/oscar/oscar.c	4 May 2004 07:26:35 -0000
-@@ -5625,7 +5625,7 @@ static int oscar_send_chat(GaimConnectio
- 	char *buf, *buf2;
- 	char *charset = NULL;
- 	int encoding;
--	int len;
-+	gsize len;
- 
- 	if (!(conv = gaim_find_chat(gc, id)))
- 		return -EINVAL;
-Index: src/protocols/zephyr/zephyr.c
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/protocols/zephyr/zephyr.c,v
-retrieving revision 1.90
-diff -u -p -r1.90 zephyr.c
---- src/protocols/zephyr/zephyr.c	22 Apr 2004 01:53:18 -0000	1.90
-+++ src/protocols/zephyr/zephyr.c	4 May 2004 07:26:36 -0000
-@@ -578,7 +578,7 @@ static void handle_message(ZNotice_t not
- 		GaimConversation *gconv1;
- 		GaimConvChat *gcc;
- 		char *ptr = notice.z_message + strlen(notice.z_message) + 1;
--		int len = notice.z_message_len - ((int)ptr - (int)notice.z_message);
-+		int len = notice.z_message_len - (strlen(notice.z_message) +1);		
- 		char *sendertmp = g_strdup_printf("%s", gaim_zephyr_get_sender());
- 		GaimConvImFlags flags = 0;
- 
diff --git a/net-im/gaim/files/gaim-0.77-c99.patch b/net-im/gaim/files/gaim-0.77-c99.patch
deleted file mode 100644
index 0c9b72a8fe1b..000000000000
--- a/net-im/gaim/files/gaim-0.77-c99.patch
+++ /dev/null
@@ -1,140 +0,0 @@
---- /src/protocols/novell/nmcontact.c	2004/04/17 18:29:20	1.2
-+++ /src/protocols/novell/nmcontact.c	2004/04/23 06:14:15	1.3
-@@ -701,11 +701,11 @@
- void
- nm_folder_remove_contact(NMFolder * folder, NMContact * contact)
- {
-+	GSList *node = folder->contacts;
-+
- 	if (folder == NULL || contact == NULL)
- 		return;
- 
--	GSList *node = folder->contacts;
--
- 	while (node) {
- 		if (contact->id == ((NMContact *) (node->data))->id) {
- 			folder->contacts = g_slist_remove(folder->contacts, node->data);
---- /src/protocols/novell/nmuser.c	21 Apr 2004 21:01:16 -0000	1.3
-+++ /src/protocols/novell/nmuser.c	23 Apr 2004 09:13:40 -0000
-@@ -50,10 +50,12 @@ 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 +1649,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 {
- 
---- /src/protocols/novell/nmuser.c	21 Apr 2004 21:01:16 -0000	1.3
-+++ /src/protocols/novell/nmuser.c	23 Apr 2004 09:28:59 -0000
-@@ -1690,6 +1690,7 @@ _update_contact_list(NMUser * user, NMFi
- {
- 	NMField *list, *cursor, *locate;
- 	gint objid1;
-+	gpointer item;
- 	NMContact *contact;
- 	NMFolder *folder;
- 
-@@ -1713,8 +1714,7 @@ _update_contact_list(NMUser * user, NMFi
- 				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) {
---- /src/protocols/novell/novell.c	22 Apr 2004 01:53:15 -0000	1.9
-+++ /src/protocols/novell/novell.c	23 Apr 2004 09:41:23 -0000
-@@ -893,6 +893,7 @@ _add_contacts_to_gaim_blist(NMUser * use
- 	NMUserRecord *user_record = NULL;
- 	NMContact *contact = NULL;
- 	GaimBuddy *buddy = NULL;
-+	GaimGroup *group = NULL;
- 	NMERR_T cnt = 0, i;
- 	const char *text = NULL;
- 	const char *name = NULL;
-@@ -912,7 +913,7 @@ _add_contacts_to_gaim_blist(NMUser * use
- 									   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));
---- /src/protocols/novell/novell.c	22 Apr 2004 01:53:15 -0000	1.9
-+++ /src/protocols/novell/novell.c	23 Apr 2004 09:56:52 -0000
-@@ -2062,6 +2062,7 @@ novell_rename_group(GaimConnection * gc,
- {
- 	NMERR_T rc = NM_OK;
- 	NMUser *user;
-+	NMFolder *folder;
- 
- 	if (gc == NULL || old_name == NULL || new_name == NULL || tobemoved == NULL) {
- 		return;
-@@ -2078,7 +2079,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,
---- /src/gtkrequest.c	Sun Apr 18 09:22:41 2004
-+++ /src/gtkrequest.c	Fri Apr 23 13:42:07 2004
-@@ -261,6 +261,7 @@
- 	GtkWidget *entry;
- 	GtkWidget *img;
- 	char *label_text;
-+	GtkWidget *toolbar;
- 
- 	data            = g_new0(GaimGtkRequestData, 1);
- 	data->type      = GAIM_REQUEST_INPUT;
-@@ -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);
- 
---- /src/gtkimhtml.c	Thu Apr 22 19:24:05 2004
-+++ /src/gtkimhtml.c	Fri Apr 23 13:40:12 2004
-@@ -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 --git a/net-im/gaim/files/gaim-0.77-irc-reconnect.patch b/net-im/gaim/files/gaim-0.77-irc-reconnect.patch
deleted file mode 100644
index 47f616736e00..000000000000
--- a/net-im/gaim/files/gaim-0.77-irc-reconnect.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://cvs.sourceforge.net/viewcvs.py/gaim/gaim/src/protocols/irc/msgs.c?r1=1.23&r2=1.24
-
-diff -ur gaim-0.77.orig/src/protocols/irc/msgs.c gaim-0.77/src/protocols/irc/msgs.c
---- gaim-0.77.orig/src/protocols/irc/msgs.c	2004-03-30 18:44:40.000000000 +0100
-+++ gaim-0.77/src/protocols/irc/msgs.c	2004-05-04 16:50:24.388180040 +0100
-@@ -390,7 +390,8 @@
- 	gaim_connection_set_state(gc, GAIM_CONNECTED);
- 
- 	irc_blist_timeout(irc);
--	irc->timer = gaim_timeout_add(45000, (GSourceFunc)irc_blist_timeout, (gpointer)irc);
-+	if (!irc->timer) 
-+		irc->timer = gaim_timeout_add(45000, (GSourceFunc)irc_blist_timeout, (gpointer)irc);
- }
- 
- void irc_msg_nochan(struct irc_conn *irc, const char *name, const char *from, char **args)
diff --git a/net-im/gaim/files/gaim-0.77-msn_chat_leave.patch b/net-im/gaim/files/gaim-0.77-msn_chat_leave.patch
deleted file mode 100644
index 589b2213f32a..000000000000
--- a/net-im/gaim/files/gaim-0.77-msn_chat_leave.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- msn.c.orig	2004-05-04 23:06:06.983204743 -0500
-+++ msn.c	2004-05-04 23:11:01.329968111 -0500
-@@ -1052,8 +1052,8 @@ msn_chat_leave(GaimConnection *gc, int i
- 
- 	strcpy(buf, "OUT\r\n");
- 
--	if (!msn_servconn_write(swboard->servconn, buf, strlen(buf)))
--		msn_switchboard_destroy(swboard);
-+	msn_servconn_write(swboard->servconn, buf, strlen(buf));
-+	msn_switchboard_destroy(swboard);
- 
- 	serv_got_chat_left(gc, id);
- }
diff --git a/net-im/gaim/files/gaim-0.77-plugin-prefs.patch b/net-im/gaim/files/gaim-0.77-plugin-prefs.patch
deleted file mode 100644
index 624df4ce9c15..000000000000
--- a/net-im/gaim/files/gaim-0.77-plugin-prefs.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-This patch fixes the non saving nature of plugins prefs.  Found in the
-preferences dialog under Protocols->msn/jabber.
-
-The original patch can be found here:
-http://www.reaperworld.com/code/gaim/gaim-plugin_prefs_final.diff
-
-and the corresponding links in cvs are
-
-plugin.h:
-http://cvs.sourceforge.net/viewcvs.py/gaim/gaim/src/plugin.h?r1=1.24&r2=1.25
-
-gtkprefs.c:
-http://cvs.sourceforge.net/viewcvs.py/gaim/gaim/src/gtkprefs.c?r1=1.141&r2=1.139
-
-the viewcvs link contains code from a patch that was applied after the
-release but before this patch.  It's only 2 lines so it's easy to get
-rid of.
-
-Gary
-
-Index: src/gtkprefs.c
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v
-retrieving revision 1.140
-diff -u -p -r1.140 gtkprefs.c
---- src/gtkprefs.c	26 Apr 2004 04:16:34 -0000	1.140
-+++ src/gtkprefs.c	26 Apr 2004 15:25:22 -0000
-@@ -363,6 +363,11 @@ delete_prefs(GtkWidget *asdf, void *gdsa
- 
- 			prefs_info = GAIM_PLUGIN_UI_INFO(plug);
- 
-+			if(prefs_info->frame != NULL) {
-+				gaim_plugin_pref_frame_destroy(prefs_info->frame);
-+				prefs_info->frame = NULL;
-+			}
-+
- 			if(prefs_info->iter != NULL) {
- 				g_free(prefs_info->iter);
- 				prefs_info->iter = NULL;
-@@ -1856,7 +1861,8 @@ static void plugin_load (GtkCellRenderer
- 				iter = plugin_iter;
- 
- 			prefs_info = GAIM_PLUGIN_UI_INFO(plug);
--			pref_frame = gaim_gtk_plugin_pref_create_frame(prefs_info->get_plugin_pref_frame(plug));
-+			prefs_info->frame = prefs_info->get_plugin_pref_frame(plug);
-+			pref_frame = gaim_gtk_plugin_pref_create_frame(prefs_info->frame);
- 
- 			if(pref_frame != NULL) {
- 				prefs_info->iter = g_new0(GtkTreeIter, 1);
-@@ -1894,6 +1900,11 @@ static void plugin_load (GtkCellRenderer
- 			prefs_info = GAIM_PLUGIN_UI_INFO(plug);
- 
- 			if(prefs_info != NULL) {
-+				if(prefs_info->frame != NULL) {
-+					gaim_plugin_pref_frame_destroy(prefs_info->frame);
-+					prefs_info->frame = NULL;
-+				}
-+
- 				if(prefs_info->iter != NULL) {
- 					gtk_tree_store_remove(GTK_TREE_STORE(prefstree), prefs_info->iter);
- 					g_free(prefs_info->iter);
-@@ -2544,13 +2555,11 @@ void prefs_notebook_init() {
- 
- 			if(GAIM_PLUGIN_HAS_PREF_FRAME(plug)) {
- 				GtkWidget *gtk_frame;
--				GaimPluginPrefFrame *pp_frame;
- 				GaimPluginUiInfo *prefs_info;
- 
- 				prefs_info = GAIM_PLUGIN_UI_INFO(plug);
--				pp_frame = prefs_info->get_plugin_pref_frame(plug);
--				gtk_frame = gaim_gtk_plugin_pref_create_frame(pp_frame);
--				gaim_plugin_pref_frame_destroy(pp_frame);
-+				prefs_info->frame = prefs_info->get_plugin_pref_frame(plug);
-+				gtk_frame = gaim_gtk_plugin_pref_create_frame(prefs_info->frame);
- 
- 				if(GTK_IS_WIDGET(gtk_frame)) {
- 					prefs_info->iter = g_new0(GtkTreeIter, 1);
-@@ -2558,6 +2567,12 @@ void prefs_notebook_init() {
- 										gtk_frame, prefs_info->iter,
- 										(plug->info->type == GAIM_PLUGIN_PROTOCOL) ? &proto_iter : &plugin_iter,
- 										notebook_page++);
-+				} else if(prefs_info->frame) {
-+					/* in the event that there is a pref frame and we can
-+					 * not make a widget out of it, we free the
-+					 * pluginpref frame --Gary
-+					 */
-+					gaim_plugin_pref_frame_destroy(prefs_info->frame);
- 				}
- 			}
- 		}
-Index: src/plugin.h
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/plugin.h,v
-retrieving revision 1.24
-diff -u -p -r1.24 plugin.h
---- src/plugin.h	22 Apr 2004 01:53:11 -0000	1.24
-+++ src/plugin.h	26 Apr 2004 15:25:22 -0000
-@@ -87,7 +87,7 @@ struct _GaimPluginInfo
- 
- 	void *ui_info;
- 	void *extra_info;
--	void *prefs_info;
-+	GaimPluginUiInfo *prefs_info;
- };
- 
- /**
-@@ -127,6 +127,7 @@ struct _GaimPluginUiInfo {
- 	GaimPluginPrefFrame *(*get_plugin_pref_frame)(GaimPlugin *plugin);
- 
- 	void *iter;                                           /**< Reserved */
-+	GaimPluginPrefFrame *frame;                           /**< Reserved */
- };
- 
- #define GAIM_PLUGIN_HAS_PREF_FRAME(plugin) \
diff --git a/net-im/gaim/files/gaim-0.77-smileys_dialogs.patch b/net-im/gaim/files/gaim-0.77-smileys_dialogs.patch
deleted file mode 100644
index fb93014450cf..000000000000
--- a/net-im/gaim/files/gaim-0.77-smileys_dialogs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-http://cvs.sourceforge.net/viewcvs.py/gaim/gaim/src/dialogs.c?r1=1.594&r2=1.595&diff_format=u
-Fixes smileys in away message dialog
-
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
-retrieving revision 1.594
-retrieving revision 1.595
-diff -u -r1.594 -r1.595
---- gaim/gaim/src/dialogs.c	2004/04/24 01:43:11	1.594
-+++ gaim/gaim/src/dialogs.c	2004/04/24 20:44:41	1.595
-@@ -815,6 +815,8 @@
- 	if (gaim_prefs_get_bool("/gaim/gtk/conversations/spellcheck"))
- 		gaim_gtk_setup_gtkspell(GTK_TEXT_VIEW(ca->text));
- 	gtk_imhtmltoolbar_attach(GTK_IMHTMLTOOLBAR(ca->toolbar), ca->text);
-+	gtk_imhtmltoolbar_associate_smileys(GTK_IMHTMLTOOLBAR(ca->toolbar), "default");
-+	gaim_setup_imhtml(ca->text);
- 
- 	gtk_container_add(GTK_CONTAINER(sw), ca->text);
- 
diff --git a/net-im/gaim/files/gaim-0.77-ucs2-copypaste.patch b/net-im/gaim/files/gaim-0.77-ucs2-copypaste.patch
deleted file mode 100644
index d2911afdbcc2..000000000000
--- a/net-im/gaim/files/gaim-0.77-ucs2-copypaste.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-http://cvs.sourceforge.net/viewcvs.py/gaim/gaim/src/gtkimhtml.c?r1=1.322&r2=1.323
-Copy/paste fixes for UCS-2 encoded selections
-
-Index: gtkimhtml.c
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
-retrieving revision 1.322
-retrieving revision 1.323
-diff -u -d -p -r1.322 -r1.323
---- src/gtkimhtml.c	2 May 2004 18:12:07 -0000	1.322
-+++ src/gtkimhtml.c	4 May 2004 06:08:47 -0000	1.323
-@@ -689,7 +689,6 @@ static void cut_clipboard_cb(GtkIMHtml *
- static void paste_received_cb (GtkClipboard *clipboard, GtkSelectionData *selection_data, gpointer data)
- {
- 	char *text;
--	guint16 c;
- 	GtkIMHtml *imhtml = data;
- 	GtkTextIter iter;
- 	GtkIMHtmlOptions flags = GTK_IMHTML_NO_NEWLINE;
-@@ -761,14 +760,14 @@ static void paste_received_cb (GtkClipbo
- 		memcpy(text, selection_data->data, selection_data->length);
- 	}
- 
--	memcpy (&c, text, 2);
--	if (c == 0xfeff) {
--		/* This is UCS2 */
--		char *utf8 = g_convert(text+2, selection_data->length - 2, "UTF-8", "UCS-2", NULL, NULL, NULL);
-+	if (selection_data->length >= 2 &&
-+		(*(guint16 *)text == 0xfeff || *(guint16 *)text == 0xfffe)) {
-+		/* This is UCS-2 */
-+		char *utf8 = g_convert(text, selection_data->length, "UTF-8", "UCS-2", NULL, NULL, NULL);
- 		g_free(text);
- 		text = utf8;
- 		if (!text) {
--			gaim_debug_warning("gtkimhtml", "g_convert failed in paste_received_cb\n");
-+			gaim_debug_warning("gtkimhtml", "g_convert from UCS-2 failed in paste_received_cb\n");
- 			return;
- 		}
- 	}
diff --git a/net-im/gaim/files/gaim-0.78cvs-novelltweaks5.patch b/net-im/gaim/files/gaim-0.78cvs-novelltweaks5.patch
deleted file mode 100644
index 2228efd649df..000000000000
--- a/net-im/gaim/files/gaim-0.78cvs-novelltweaks5.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: nmcontact.c
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/protocols/novell/nmcontact.c,v
-retrieving revision 1.3
-diff -u -p -u -r1.3 nmcontact.c
---- nmcontact.c	23 Apr 2004 06:14:15 -0000	1.3
-+++ nmcontact.c	23 Apr 2004 12:23:33 -0000
-@@ -701,11 +701,13 @@ nm_folder_add_folder_to_list(NMFolder * 
- void
- nm_folder_remove_contact(NMFolder * folder, NMContact * contact)
- {
--	GSList *node = folder->contacts;
-+	GSList *node;
- 
- 	if (folder == NULL || contact == NULL)
- 		return;
- 
-+	node = folder->contacts;
-+
- 	while (node) {
- 		if (contact->id == ((NMContact *) (node->data))->id) {
- 			folder->contacts = g_slist_remove(folder->contacts, node->data);