Update to 0.78:

New Features:
* Support for the SILC protocol (http://www.silcnet.org/)
  (Pekka Riikonen)
* Option to suppress disconnect notification when using
  the autoreconnect plugin (Christopher (siege) O'Brien)
* Added support for dragging buddies from the buddy list into the
  Add Buddy Pounce dialog
* Pounce notification now includes time (Mike Lundy)
* The history plugin now shows history for chats in addition to IMs
* Menu item to view conversation logs (Tom Samstag)
* Conversation and chat sizes automatically saved (Stu Tomlinson)
* Added support for Novell privacy settings (Mike Stoddard of Novell)
* Added ability to initiate multi-user conferences (chats) in Novell (Mike
  Stoddard of Novell)
* Find and Save buttons on the debug window (Stu Tomlinson)
* Plugin Actions menu (Christopher (siege) O'Brien)
* Plugins can now add entries to the right-click menu of a group or chat
  (Stu Tomlinson and Christopher (siege) O'Brien)
* Hyperlink colors are now themeable via your ~/.gtkrc-2.0 file

Bug Fixes:
* Compiles again with gcc 2.96 (Ignacio J. Elia)
* Gtk2.0 compatibility fixes (Tim Ringenbach)
* Many documentation updates (Jonathan Champ, Gary Kramlich,
  Stu Tomlinson, and Kevin Stange)
* Yahoo works on 64 bit machines (Gary Kramlich)
* Zephyr works on 64 bit machines (Arun A Tharuvai)
* Novell 64bit fixes, better error messages, and buddy list sync fixes
  (Mike Stoddard of Novell)
* Novell protocol works on big endian machines (Novell)
* Massive rewrite of MSN support, which should fix a number of issues
  and make errors easier to interpret (Felipe Contreras)
* Fixed a privacy-related bug in MSN that affected blocking/permitting,
  which was due to case-sensitive string comparisons (Gudmundur Olafsson)
* Fixed an MSN HTTP method bug where MSN would queue data indefinitely.
  (Andrew Wellington)
* All known MSN formatting bugs were fixed.
* Overly long messages and paging cell phones in MSN no longer cause
  disconnects (Felipe Contreras)
* Several bug fixes for MSN's MSNSLP and MSNObject support (Finlay Dobbie)
* ALT-F works correctly in the System Log Viewer (Stu Tomlinson)
* New tabs should scroll correctly again (Tim Ringenbach)
* Dialogs opened from a conversation window are now closed when
  the conversation window is closed, preventing a crash (Kevin Stange)
* Copy/paste encoding fixes (Joe Marcus Clarke)
* IRC disconnect crash fix (Luciano Miguel Ferreira Rocha)
* Ampersands in links should work correctly (Tim Ringenbach)
* DirectIM and IM Image support for AIM are greatly improved
  (Tim Ringenbach)
* Gadu-Gadu updates (Andrew Wellington)
* Print Gadu-Gadu messages to the debug window instead of the console
* Updated and standardized blist signals (Gary Kramlich)
* Made the recieve-*-msg signals match the sending ones (Stu Tomlinson)
* The idle time for the buddy-idle and buddy-unidle signals should
  be correct again.

Preference Changes:
* Added "Conversation placement - By conversation count"
* Added a "none" smiley theme to replace the "Show graphical
  smileys" option
* Replace default formatting preferences with a dialog to set a
  default formatting in a WYSIWYG manner.
* Removed "Show logins in window," default to yes
* Removed "Send URLs as links," default to yes (in protocols that
  support HTML)
* Removed "Show URLs as links," default to yes
* Removed New window height & width and Entry field height for Chats & IMs,
  sizes are now saved automatically
* Removed "Tab-complete nicks" default to yes
* Removed "Old-style tab completion", no longer supported
* Removed "Sending message removes away status", default to no
* Removed "Show numbers in groups", default to yes
* Removed "Icons on tabs", default to yes
* Removed "Sounds when you log in", default to no
* Removed "Seconds before resending autoresponse", default to 600 seconds
* Removed "Send autoresponse in active conversations", default to no
* Removed "Show people joining in window", default to yes
* Removed "Show people leaving in window", default to yes

8 files changed, 30 insertions, 184 deletions

diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index 57d71da8ed0..b2a9565de41 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2004/05/06 13:44:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.61 2004/06/01 21:00:59 jmmv Exp $
 #
 
-DISTNAME=	gaim-0.77
-PKGREVISION=	1
+DISTNAME=	gaim-0.78
 CATEGORIES=	chat x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/chat/gaim/PLIST b/chat/gaim/PLIST
index eee2eddb5ef..2cc0f9cca58 100644
--- a/chat/gaim/PLIST
+++ b/chat/gaim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2004/04/24 09:29:53 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.27 2004/06/01 21:00:59 jmmv Exp $
 bin/gaim
 bin/gaim-remote
 include/gaim-remote/remote-socket.h
@@ -92,6 +92,7 @@ ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gaim.mo
@@ -111,6 +112,7 @@ ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gaim.mo
@@ -258,6 +260,7 @@ share/pixmaps/gaim/smileys/default/yahoo_batting.gif
 share/pixmaps/gaim/smileys/default/yahoo_beatup.gif
 share/pixmaps/gaim/smileys/default/yahoo_bigsmile.gif
 share/pixmaps/gaim/smileys/default/yahoo_blush.gif
+share/pixmaps/gaim/smileys/default/yahoo_brokenheart.gif
 share/pixmaps/gaim/smileys/default/yahoo_bye.gif
 share/pixmaps/gaim/smileys/default/yahoo_chicken.gif
 share/pixmaps/gaim/smileys/default/yahoo_clap.gif
@@ -272,10 +275,12 @@ share/pixmaps/gaim/smileys/default/yahoo_doh.gif
 share/pixmaps/gaim/smileys/default/yahoo_drool.gif
 share/pixmaps/gaim/smileys/default/yahoo_eyebrow.gif
 share/pixmaps/gaim/smileys/default/yahoo_eyeroll.gif
+share/pixmaps/gaim/smileys/default/yahoo_femalefighter.gif
 share/pixmaps/gaim/smileys/default/yahoo_flag.gif
 share/pixmaps/gaim/smileys/default/yahoo_flower.gif
 share/pixmaps/gaim/smileys/default/yahoo_frustrated.gif
 share/pixmaps/gaim/smileys/default/yahoo_ghost.gif
+share/pixmaps/gaim/smileys/default/yahoo_giggle.gif
 share/pixmaps/gaim/smileys/default/yahoo_glasses.gif
 share/pixmaps/gaim/smileys/default/yahoo_huggs.gif
 share/pixmaps/gaim/smileys/default/yahoo_hypnotized.gif
@@ -283,34 +288,51 @@ share/pixmaps/gaim/smileys/default/yahoo_idea.gif
 share/pixmaps/gaim/smileys/default/yahoo_kiss.gif
 share/pixmaps/gaim/smileys/default/yahoo_laughloud.gif
 share/pixmaps/gaim/smileys/default/yahoo_liar.gif
+share/pixmaps/gaim/smileys/default/yahoo_loser.gif
 share/pixmaps/gaim/smileys/default/yahoo_love.gif
+share/pixmaps/gaim/smileys/default/yahoo_madtongue.gif
+share/pixmaps/gaim/smileys/default/yahoo_malefighter1.gif
+share/pixmaps/gaim/smileys/default/yahoo_malefighter2.gif
 share/pixmaps/gaim/smileys/default/yahoo_mean.gif
 share/pixmaps/gaim/smileys/default/yahoo_moneyeyes.gif
 share/pixmaps/gaim/smileys/default/yahoo_monkey.gif
+share/pixmaps/gaim/smileys/default/yahoo_nailbiting.gif
 share/pixmaps/gaim/smileys/default/yahoo_neutral.gif
 share/pixmaps/gaim/smileys/default/yahoo_ooooh.gif
+share/pixmaps/gaim/smileys/default/yahoo_party.gif
 share/pixmaps/gaim/smileys/default/yahoo_peace.gif
 share/pixmaps/gaim/smileys/default/yahoo_pig.gif
 share/pixmaps/gaim/smileys/default/yahoo_pray.gif
 share/pixmaps/gaim/smileys/default/yahoo_pumpkin.gif
 share/pixmaps/gaim/smileys/default/yahoo_question.gif
+share/pixmaps/gaim/smileys/default/yahoo_rotfl.gif
 share/pixmaps/gaim/smileys/default/yahoo_sad.gif
 share/pixmaps/gaim/smileys/default/yahoo_shame.gif
 share/pixmaps/gaim/smileys/default/yahoo_shamrock.gif
 share/pixmaps/gaim/smileys/default/yahoo_shhhh.gif
 share/pixmaps/gaim/smileys/default/yahoo_sick.gif
+share/pixmaps/gaim/smileys/default/yahoo_sighing.gif
 share/pixmaps/gaim/smileys/default/yahoo_silent.gif
 share/pixmaps/gaim/smileys/default/yahoo_silly.gif
 share/pixmaps/gaim/smileys/default/yahoo_sleep.gif
 share/pixmaps/gaim/smileys/default/yahoo_smiley.gif
+share/pixmaps/gaim/smileys/default/yahoo_star.gif
 share/pixmaps/gaim/smileys/default/yahoo_sunglas.gif
+share/pixmaps/gaim/smileys/default/yahoo_sweating.gif
+share/pixmaps/gaim/smileys/default/yahoo_talktohand.gif
 share/pixmaps/gaim/smileys/default/yahoo_think.gif
 share/pixmaps/gaim/smileys/default/yahoo_tired.gif
 share/pixmaps/gaim/smileys/default/yahoo_tongue.gif
+share/pixmaps/gaim/smileys/default/yahoo_waiting.gif
+share/pixmaps/gaim/smileys/default/yahoo_waving.gif
 share/pixmaps/gaim/smileys/default/yahoo_whistling.gif
 share/pixmaps/gaim/smileys/default/yahoo_wink.gif
 share/pixmaps/gaim/smileys/default/yahoo_worried.gif
+share/pixmaps/gaim/smileys/default/yahoo_worship.gif
+share/pixmaps/gaim/smileys/default/yahoo_yingyang.gif
+share/pixmaps/gaim/smileys/default/yahoo_youkiddingme.gif
 share/pixmaps/gaim/smileys/default/yell.png
+share/pixmaps/gaim/smileys/none/theme
 share/pixmaps/gaim/status/default/activebuddy.png
 share/pixmaps/gaim/status/default/admin.png
 share/pixmaps/gaim/status/default/aim.png
@@ -339,6 +361,7 @@ share/pixmaps/gaim/status/default/occupied.png
 share/pixmaps/gaim/status/default/offline.png
 share/pixmaps/gaim/status/default/rendezvous.png
 share/pixmaps/gaim/status/default/secure.png
+share/pixmaps/gaim/status/default/silc.png
 share/pixmaps/gaim/status/default/trepia.png
 share/pixmaps/gaim/status/default/wireless.png
 share/pixmaps/gaim/status/default/yahoo.png
@@ -358,6 +381,7 @@ share/sounds/gaim/send.wav
 @comment in xdg-dirs: @dirrm share/sounds
 @dirrm share/pixmaps/gaim/status/default
 @dirrm share/pixmaps/gaim/status
+@dirrm share/pixmaps/gaim/smileys/none
 @dirrm share/pixmaps/gaim/smileys/default
 @dirrm share/pixmaps/gaim/smileys
 @dirrm share/pixmaps/gaim/icons
diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo
index 3d430ec9b4b..2ce8c945768 100644
--- a/chat/gaim/distinfo
+++ b/chat/gaim/distinfo
@@ -1,9 +1,4 @@
-$NetBSD: distinfo,v 1.41 2004/05/06 13:44:00 jmmv Exp $
+$NetBSD: distinfo,v 1.42 2004/06/01 21:00:59 jmmv Exp $
 
-SHA1 (gaim-0.77.tar.bz2) = 56101f1e5da73ad09992f2584fe2cdcff3c47e31
-Size (gaim-0.77.tar.bz2) = 3709914 bytes
-SHA1 (patch-aa) = a32aeaeea27de7cada8db9a8d042c5e7ede60079
-SHA1 (patch-ab) = 669fe9d5e4e35c0a06adf50491e2a54338c060c4
-SHA1 (patch-ac) = aa5e1ae725bba363f7b924d0c61275b0a6dfa7e2
-SHA1 (patch-ad) = 3b6fc88653a5e3f44b8a0a6059ec1a102c874e70
-SHA1 (patch-ae) = e95f5536a4a6360f7ce3c5df429bb65c5dc25a05
+SHA1 (gaim-0.78.tar.bz2) = 017b596f2a8618fe7e6c5800f2c2589dce18ba19
+Size (gaim-0.78.tar.bz2) = 4219726 bytes
diff --git a/chat/gaim/patches/patch-aa b/chat/gaim/patches/patch-aa
deleted file mode 100644
index 6bc93da7716..00000000000
--- a/chat/gaim/patches/patch-aa
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-aa,v 1.20 2004/05/06 13:44:00 jmmv Exp $
-
---- 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;
-@@ -684,7 +685,6 @@
- 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;
-@@ -756,14 +756,14 @@
- 		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/chat/gaim/patches/patch-ab b/chat/gaim/patches/patch-ab
deleted file mode 100644
index 3f4484f9177..00000000000
--- a/chat/gaim/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2004/04/24 09:29:54 jmmv Exp $
-
---- src/gtkrequest.c.orig	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/chat/gaim/patches/patch-ac b/chat/gaim/patches/patch-ac
deleted file mode 100644
index 5e8d68cd42a..00000000000
--- a/chat/gaim/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2004/04/24 09:29:54 jmmv Exp $
-
---- src/protocols/novell/nmcontact.c.orig	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 --git a/chat/gaim/patches/patch-ad b/chat/gaim/patches/patch-ad
deleted file mode 100644
index 5fba86a8232..00000000000
--- a/chat/gaim/patches/patch-ad
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2004/04/24 09:29:54 jmmv Exp $
-
---- src/protocols/novell/nmuser.c.orig	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 --git a/chat/gaim/patches/patch-ae b/chat/gaim/patches/patch-ae
deleted file mode 100644
index a1a43a4cae2..00000000000
--- a/chat/gaim/patches/patch-ae
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/04/24 09:29:54 jmmv Exp $
-
---- src/protocols/novell/novell.c.orig	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,