Update to 0.78. The list of changes can be found at:

http://gaim.sourceforge.net/ChangeLog

12 files changed, 85 insertions, 324 deletions

diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index ad6b51f2e9a9..446eb5af5830 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -5,8 +5,7 @@
 #
 
 PORTNAME=	gaim
-PORTVERSION=	0.77
-PORTREVISION=	2
+PORTVERSION=	0.78
 CATEGORIES?=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/gaim/distinfo b/net-im/gaim/distinfo
index 3086baffaf40..5e2dd99e354f 100644
--- a/net-im/gaim/distinfo
+++ b/net-im/gaim/distinfo
@@ -1,2 +1,2 @@
-MD5 (gaim-0.77.tar.bz2) = d2ac2eb75e5e27f7fddf2a7dc19eb045
-SIZE (gaim-0.77.tar.bz2) = 3709914
+MD5 (gaim-0.78.tar.bz2) = 079f3286333ed51cc72c65b5efe1b989
+SIZE (gaim-0.78.tar.bz2) = 4219726
diff --git a/net-im/gaim/files/patch-ltmain.sh b/net-im/gaim/files/patch-ltmain.sh
index bb660972a6d1..b3f60f4f8944 100644
--- a/net-im/gaim/files/patch-ltmain.sh
+++ b/net-im/gaim/files/patch-ltmain.sh
@@ -1,15 +1,15 @@
---- ltmain.sh.orig	Thu May 22 16:42:22 2003
-+++ ltmain.sh	Tue May 27 12:12:52 2003
-@@ -1072,7 +1072,7 @@
+--- ltmain.sh.orig	Sun May 30 13:18:23 2004
++++ ltmain.sh	Sun May 30 17:53:23 2004
+@@ -1280,7 +1280,7 @@
  	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
 -	 *-*-openbsd* | *-*-freebsd*)
 +	 *-*-openbsd* | *-*-freebsd4*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-@@ -1082,8 +1082,16 @@
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1290,8 +1290,16 @@
  	continue
  	;;
  
@@ -26,17 +26,17 @@
  	continue
  	;;
  
-@@ -2498,6 +2506,9 @@
- 	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
+@@ -3000,6 +3008,9 @@
+ 	    # problems, so we reset it completely
+ 	    verstring=
  	    ;;
 +	  *-*-freebsd*)
 +	    # FreeBSD doesn't need this...
 +	    ;;
  	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4325,10 +4336,12 @@
+ 	    verstring="0.0"
+ 	    ;;
+@@ -5428,10 +5439,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/net-im/gaim/files/patch-msn_bye_fix b/net-im/gaim/files/patch-msn_bye_fix
deleted file mode 100644
index 7217a2748e7c..000000000000
--- a/net-im/gaim/files/patch-msn_bye_fix
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -urp msn-old/servconn.c msn/servconn.c
---- src/protocols/msn-old/servconn.c	2004-05-07 22:59:52.240091544 -0500
-+++ src/protocols/msn/servconn.c	2004-05-07 23:00:21.214686736 -0500
-@@ -201,6 +201,12 @@ msn_servconn_destroy(MsnServConn *servco
- 
- 	g_return_if_fail(servconn != NULL);
- 
-+	if (servconn->processing)
-+	{
-+		servconn->wasted = TRUE;
-+		return;
-+	}
-+
- 	session = servconn->session;
- 
- 	session->servconns = g_list_remove(session->servconns, servconn);
-@@ -568,6 +574,8 @@ read_cb(gpointer data, gint source, Gaim
- 
- 	end = old_rx_buf = servconn->rx_buf;
- 
-+	servconn->processing = TRUE;
-+
- 	do
- 	{
- 		cur = end;
-@@ -608,6 +616,8 @@ read_cb(gpointer data, gint source, Gaim
- 		}
- 	} while (servconn->connected && servconn->rx_len);
- 
-+	servconn->processing = FALSE;
-+
- 	if (servconn->connected)
- 	{
- 		if (servconn->rx_len)
-diff -urp msn-old/servconn.h msn/servconn.h
---- src/protocols/msn-old/servconn.h	2004-04-12 23:08:22.000000000 -0500
-+++ src/protocols/msn/servconn.h	2004-05-06 02:07:03.000000000 -0500
-@@ -45,6 +45,7 @@ struct _MsnServConn
- 	MsnSession *session;
- 
- 	gboolean connected;
-+	gboolean processing;
- 	gboolean wasted;
- 
- 	MsnHttpMethodData *http_data;
diff --git a/net-im/gaim/files/patch-plugins_Makefile.in b/net-im/gaim/files/patch-plugins_Makefile.in
index 3208c993c071..7fd2ba7bed19 100644
--- a/net-im/gaim/files/patch-plugins_Makefile.in
+++ b/net-im/gaim/files/patch-plugins_Makefile.in
@@ -1,9 +1,9 @@
---- plugins/Makefile.in.orig	Sat Apr  3 02:52:47 2004
-+++ plugins/Makefile.in	Sat Apr  3 02:53:02 2004
-@@ -160,9 +160,9 @@
- install_sh = @install_sh@
- perlpath = @perlpath@
- sedpath = @sedpath@
+--- plugins/Makefile.in.orig	Sun May 30 17:53:41 2004
++++ plugins/Makefile.in	Sun May 30 17:54:22 2004
+@@ -285,9 +285,9 @@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
 -DIST_SUBDIRS = docklet gevolution gaim-remote gestures perl ssl tcl ticker
 +DIST_SUBDIRS = docklet gaim-remote gestures perl ssl tcl ticker
  
diff --git a/net-im/gaim/files/patch-src-gtkimhtml b/net-im/gaim/files/patch-src-gtkimhtml
deleted file mode 100644
index 4bf981d8a39c..000000000000
--- a/net-im/gaim/files/patch-src-gtkimhtml
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/gtkimhtml.c.orig	Tue May  4 18:09:10 2004
-+++ src/gtkimhtml.c	Tue May  4 18:09:12 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/net-im/gaim/files/patch-src-gtkrequest b/net-im/gaim/files/patch-src-gtkrequest
deleted file mode 100644
index d7db03e09659..000000000000
--- a/net-im/gaim/files/patch-src-gtkrequest
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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
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,
diff --git a/net-im/gaim/files/patch-src::util.c b/net-im/gaim/files/patch-src::util.c
index 7beb3f6c76af..f573f29d971c 100644
--- a/net-im/gaim/files/patch-src::util.c
+++ b/net-im/gaim/files/patch-src::util.c
@@ -1,92 +1,6 @@
---- src/util.c.orig	Wed Mar 31 17:56:09 2004
-+++ src/util.c	Sat Apr  3 00:18:30 2004
-@@ -247,26 +247,71 @@
- /**************************************************************************
-  * Quoted Printable Functions
-  **************************************************************************/
-+static void hex(const char **p, const char *end, unsigned char *n)
-+{
-+	int i, c;
-+
-+	for (i = 0, c = 0; i < 2 && *p < end; ++i, ++*p) {
-+		c <<= 4;
-+		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;
-+		case '8': c += 8; break;
-+		case '9': c += 9; break;
-+		case 'a': c += 10; break;
-+		case 'b': c += 11; break;
-+		case 'c': c += 12; break;
-+		case 'd': c += 13; break;
-+		case 'e': c += 14; break;
-+		case 'f': c += 15; break;
-+		case 'A': c += 10; break;
-+		case 'B': c += 11; break;
-+		case 'C': c += 12; break;
-+		case 'D': c += 13; break;
-+		case 'E': c += 14; break;
-+		case 'F': c += 15; break;
-+		default:
-+			  if (i == 0) {
-+				  *n = **p;
-+				  ++*p;
-+				  return;
-+			  }
-+			  c >>= 4;
-+			  goto done;
-+		}
-+	}
-+done:
-+	*n = (c > UCHAR_MAX) ? '?' : c;
-+	return;
-+}
-+  
- void
- gaim_quotedp_decode(const char *str, char **ret_str, int *ret_len)
- {
--	char *n, *new;
--	const char *end, *p;
--	int i;
--
--	n = new = g_malloc(strlen (str) + 1);
--	end = str + strlen(str);
-+	const char *p, *end;
-+	unsigned char *n, *new;
-+	size_t len;
-+
-+	len = strlen (str);
-+	n = new = g_malloc(len + 1);
-+	p = str;
-+	end = &p[len];
- 
--	for (p = str; p < end; p++, n++) {
-+	while (p < end) {
- 		if (*p == '=') {
--			sscanf(p + 1, "%2x\n", &i);
--			*n = i;
--			p += 2;
-+			++p;
-+			hex(&p, end, n);
-+		} else {
-+			*n = *p == '_' ? ' ' : *p;
-+			++p;
- 		}
--		else if (*p == '_')
--			*n = ' ';
--		else
--			*n = *p;
-+		++n;
- 	}
- 
- 	*n = '\0';
-@@ -2119,9 +2164,14 @@
+--- src/util.c.orig	Wed May 26 19:24:44 2004
++++ src/util.c	Sun May 30 17:57:02 2004
+@@ -2328,9 +2328,14 @@
  static size_t
  parse_content_len(const char *data, size_t data_len)
  {
diff --git a/net-im/gaim/files/patch-src_gtkimhtml.c b/net-im/gaim/files/patch-src_gtkimhtml.c
new file mode 100644
index 000000000000..9430baae1449
--- /dev/null
+++ b/net-im/gaim/files/patch-src_gtkimhtml.c
@@ -0,0 +1,22 @@
+--- src/gtkimhtml.c.orig	Sun May 30 18:17:14 2004
++++ src/gtkimhtml.c	Sun May 30 18:19:47 2004
+@@ -782,7 +782,7 @@
+ 	if (selection_data->length >= 2 &&
+ 		(*(guint16 *)text == 0xfeff || *(guint16 *)text == 0xfffe)) {
+ 		/* This is UCS-2 */
+-		char *tmp;
++		/*char *tmp;*/
+ 		char *utf8 = g_convert(text, selection_data->length, "UTF-8", "UCS-2", NULL, NULL, NULL);
+ 		g_free(text);
+ 		text = utf8;
+@@ -790,8 +790,8 @@
+ 			gaim_debug_warning("gtkimhtml", "g_convert from UCS-2 failed in paste_received_cb\n");
+ 			return;
+ 		}
+-		tmp = g_utf8_next_char(text);
+-		memmove(text, tmp, strlen(tmp) + 1);
++		/*tmp = g_utf8_next_char(text);*/
++		/*memmove(text, tmp, strlen(tmp) + 1);*/
+ 	}
+ 
+ 	if (!(*text) || !g_utf8_validate(text, -1, NULL)) {
diff --git a/net-im/gaim/files/patch-src_protocols_gg_libgg.h b/net-im/gaim/files/patch-src_protocols_gg_libgg.h
new file mode 100644
index 000000000000..7cb0f3eec670
--- /dev/null
+++ b/net-im/gaim/files/patch-src_protocols_gg_libgg.h
@@ -0,0 +1,12 @@
+--- src/protocols/gg/libgg.h.orig	Sun May 30 18:01:35 2004
++++ src/protocols/gg/libgg.h	Sun May 30 18:01:58 2004
+@@ -29,7 +29,9 @@
+   #define INADDR_NONE 0xffffffff
+ #endif
+ 
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#endif
+ #include <sys/types.h>
+ 
+ /*
diff --git a/net-im/gaim/pkg-plist b/net-im/gaim/pkg-plist
index daea165b4054..4cbefd032a3d 100644
--- a/net-im/gaim/pkg-plist
+++ b/net-im/gaim/pkg-plist
@@ -174,6 +174,7 @@ share/gnome/pixmaps/gaim/smileys/default/yahoo_batting.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_beatup.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_bigsmile.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_blush.gif
+share/gnome/pixmaps/gaim/smileys/default/yahoo_brokenheart.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_bye.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_chicken.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_clap.gif
@@ -188,10 +189,12 @@ share/gnome/pixmaps/gaim/smileys/default/yahoo_doh.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_drool.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_eyebrow.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_eyeroll.gif
+share/gnome/pixmaps/gaim/smileys/default/yahoo_femalefighter.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_flag.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_flower.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_frustrated.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_ghost.gif
+share/gnome/pixmaps/gaim/smileys/default/yahoo_giggle.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_glasses.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_huggs.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_hypnotized.gif
@@ -199,34 +202,51 @@ share/gnome/pixmaps/gaim/smileys/default/yahoo_idea.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_kiss.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_laughloud.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_liar.gif
+share/gnome/pixmaps/gaim/smileys/default/yahoo_loser.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_love.gif
+share/gnome/pixmaps/gaim/smileys/default/yahoo_madtongue.gif
+share/gnome/pixmaps/gaim/smileys/default/yahoo_malefighter1.gif
+share/gnome/pixmaps/gaim/smileys/default/yahoo_malefighter2.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_mean.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_moneyeyes.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_monkey.gif
+share/gnome/pixmaps/gaim/smileys/default/yahoo_nailbiting.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_neutral.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_ooooh.gif
+share/gnome/pixmaps/gaim/smileys/default/yahoo_party.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_peace.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_pig.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_pray.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_pumpkin.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_question.gif
+share/gnome/pixmaps/gaim/smileys/default/yahoo_rotfl.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_sad.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_shame.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_shamrock.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_shhhh.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_sick.gif
+share/gnome/pixmaps/gaim/smileys/default/yahoo_sighing.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_silent.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_silly.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_sleep.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_smiley.gif
+share/gnome/pixmaps/gaim/smileys/default/yahoo_star.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_sunglas.gif
+share/gnome/pixmaps/gaim/smileys/default/yahoo_sweating.gif
+share/gnome/pixmaps/gaim/smileys/default/yahoo_talktohand.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_think.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_tired.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_tongue.gif
+share/gnome/pixmaps/gaim/smileys/default/yahoo_waiting.gif
+share/gnome/pixmaps/gaim/smileys/default/yahoo_waving.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_whistling.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_wink.gif
 share/gnome/pixmaps/gaim/smileys/default/yahoo_worried.gif
+share/gnome/pixmaps/gaim/smileys/default/yahoo_worship.gif
+share/gnome/pixmaps/gaim/smileys/default/yahoo_yingyang.gif
+share/gnome/pixmaps/gaim/smileys/default/yahoo_youkiddingme.gif
 share/gnome/pixmaps/gaim/smileys/default/yell.png
+share/gnome/pixmaps/gaim/smileys/none/theme
 share/gnome/pixmaps/gaim/status/default/activebuddy.png
 share/gnome/pixmaps/gaim/status/default/admin.png
 share/gnome/pixmaps/gaim/status/default/aim.png
@@ -255,6 +275,7 @@ share/gnome/pixmaps/gaim/status/default/occupied.png
 share/gnome/pixmaps/gaim/status/default/offline.png
 share/gnome/pixmaps/gaim/status/default/rendezvous.png
 share/gnome/pixmaps/gaim/status/default/secure.png
+share/gnome/pixmaps/gaim/status/default/silc.png
 share/gnome/pixmaps/gaim/status/default/trepia.png
 share/gnome/pixmaps/gaim/status/default/wireless.png
 share/gnome/pixmaps/gaim/status/default/yahoo.png
@@ -276,6 +297,7 @@ share/locale/ca/LC_MESSAGES/gaim.mo
 share/locale/cs/LC_MESSAGES/gaim.mo
 share/locale/da/LC_MESSAGES/gaim.mo
 share/locale/de/LC_MESSAGES/gaim.mo
+share/locale/en_CA/LC_MESSAGES/gaim.mo
 share/locale/en_GB/LC_MESSAGES/gaim.mo
 share/locale/es/LC_MESSAGES/gaim.mo
 share/locale/fi/LC_MESSAGES/gaim.mo
@@ -295,6 +317,7 @@ share/locale/pt_BR/LC_MESSAGES/gaim.mo
 share/locale/ro/LC_MESSAGES/gaim.mo
 share/locale/ru/LC_MESSAGES/gaim.mo
 share/locale/sk/LC_MESSAGES/gaim.mo
+share/locale/sl/LC_MESSAGES/gaim.mo
 share/locale/sr/LC_MESSAGES/gaim.mo
 share/locale/sr@Latn/LC_MESSAGES/gaim.mo
 share/locale/sv/LC_MESSAGES/gaim.mo
@@ -304,6 +327,7 @@ share/locale/zh_TW/LC_MESSAGES/gaim.mo
 @dirrm share/gnome/sounds/gaim
 @dirrm share/gnome/pixmaps/gaim/status/default
 @dirrm share/gnome/pixmaps/gaim/status
+@dirrm share/gnome/pixmaps/gaim/smileys/none
 @dirrm share/gnome/pixmaps/gaim/smileys/default
 @dirrm share/gnome/pixmaps/gaim/smileys
 @dirrm share/gnome/pixmaps/gaim/icons