Restoring patch files needed by 0.77. Thanks to tancred for notification

3 files changed, 167 insertions, 3 deletions

diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index badcad1b1e40..4899d18d21dd 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,11 +1,12 @@
 MD5 3c7029722154eb32b114fd131a0aad45 ChangeLog 30515
 MD5 3bb264bfcd9a28cbc67d9760e7b81b0b gaim-0.75-r10.ebuild 3671
-MD5 965d2993a30aeb3ce3e38c843658f3d3 gaim-0.77.ebuild 4040
 MD5 adf3d75421baa4c0fbe9c5de43c567d8 gaim-0.78-r2.ebuild 4483
+MD5 965d2993a30aeb3ce3e38c843658f3d3 gaim-0.77.ebuild 4040
 MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
 MD5 8b152d59a54ab95627c4c0cd52758d75 files/digest-gaim-0.75-r10 63
 MD5 4bc83ad48d260db208fcae372c2bb291 files/digest-gaim-0.77 63
-MD5 f07855631a1ef3f986568b772f335865 files/digest-gaim-0.78-r2 63
+MD5 98cdf8cb3df34f23f2098df68bd5d06e files/gaim-0.77-newtrayicon.patch 13633
+MD5 3a5e6167d13c4a44a8618c12629d777e files/gaim-0.77-c99.patch 4790
 MD5 68525b8389e356a5d05d531b84fb1ada files/gaim-0.74-gnome-url-handler.patch 1854
 MD5 53302cc68bb7bef9803723e977010339 files/gaim-0.74_cjk_gtkconv.patch 1128
 MD5 4989dc76d941288934c783f52931762d files/gaim-0.75-static-prpls.patch 3710
@@ -14,8 +15,9 @@ MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644
 MD5 a4f3b00a7aa80e7fbc1e315b8c9306c8 files/gaim-0.76cvs-signals-varargs.diff 1753
 MD5 e58ee6f06747da85a60cb9c13b91f805 files/gaim-0.76cvs-yahoo-login-fix.diff 4618
 MD5 a714a5babbb4387f5a5516f75548528a files/gaim-0.76cvs-yahoo-misc-fixes-1.diff 3105
-MD5 98cdf8cb3df34f23f2098df68bd5d06e files/gaim-0.77-newtrayicon.patch 13633
 MD5 926417f5b93b2716eb31f0ceb0d8ce74 files/gaim-0.78-jabber_disconnect.patch 745
 MD5 fa4c02c17e5d4096a6353342bed870ec files/gaim-0.78-log_find_click.patch 1049
 MD5 6c718f1614f3c6c352062b1d775e9242 files/gaim-0.78-msn_disconnect_fix.patch 1241
 MD5 29409b66a70d19d4ceca094de43978a2 files/gaim-0.78-paste_html_img_crash.patch 510
+MD5 f07855631a1ef3f986568b772f335865 files/digest-gaim-0.78-r2 63
+MD5 a8234ce30b90015d2798a6f576982857 files/gaim-0.78cvs-novelltweaks5.patch 715
diff --git a/net-im/gaim/files/gaim-0.77-c99.patch b/net-im/gaim/files/gaim-0.77-c99.patch
new file mode 100644
index 000000000000..0c9b72a8fe1b
--- /dev/null
+++ b/net-im/gaim/files/gaim-0.77-c99.patch
@@ -0,0 +1,140 @@
+--- /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.78cvs-novelltweaks5.patch b/net-im/gaim/files/gaim-0.78cvs-novelltweaks5.patch
new file mode 100644
index 000000000000..2228efd649df
--- /dev/null
+++ b/net-im/gaim/files/gaim-0.78cvs-novelltweaks5.patch
@@ -0,0 +1,22 @@
+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);