Update to 2.10.2:

default application:
- List Thunderbird as an option (Pawel Worach)
- Fix a warning about the window icon (Matthias Clasen)

keyboard preferences:
- Fix build with GCC 2.95 (Jens Granseuer)

theme manager:
- Fix theme preview crash with xorg composite (Colin Gibbs)

settings daemon:
- Fix some leaks (Kjartan Maraas)

shell:
- Fix order of categories (Frederic Crozat)

Updated translations: en_CA, tr, xh, vi, hu, eu, uk, et, cy, rw, bg, zh_TW.

3 files changed, 6 insertions, 42 deletions

diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index d66371b8292..0f627e09e8f 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2005/08/12 15:59:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.49 2005/08/21 11:29:24 jmmv Exp $
 #
 
-DISTNAME=	control-center-2.10.1
+DISTNAME=	control-center-2.10.2
 PKGNAME=	gnome2-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.10/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gnome2-control-center/distinfo b/x11/gnome2-control-center/distinfo
index 73779ca0c0d..0f69711e603 100644
--- a/x11/gnome2-control-center/distinfo
+++ b/x11/gnome2-control-center/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.21 2005/08/12 15:59:22 jmmv Exp $
+$NetBSD: distinfo,v 1.22 2005/08/21 11:29:24 jmmv Exp $
 
-SHA1 (control-center-2.10.1.tar.bz2) = b2d6ea6f4e81b84b58ef7e3585922a87360ce667
-RMD160 (control-center-2.10.1.tar.bz2) = 7bf57aba9416c5c89169474ef65fa05cea6e9cd8
-Size (control-center-2.10.1.tar.bz2) = 2648247 bytes
+SHA1 (control-center-2.10.2.tar.bz2) = 96daf4aff313bb9ee0abbb2b23af15cebd92206b
+RMD160 (control-center-2.10.2.tar.bz2) = 6c73d3c2c00fee3ee774bf0a10994af00af73625
+Size (control-center-2.10.2.tar.bz2) = 2833639 bytes
 SHA1 (patch-aa) = 826bd6ef91135a61a86450ff150662156c833ae8
 SHA1 (patch-ab) = a522bf7b8d1108b2350bbc35125bc794a1fb0ac7
 SHA1 (patch-ac) = 0bec26fa35730ddd706ec8e80855d1bc72b1dd7d
 SHA1 (patch-ad) = 15aeffd62733036840d402f1ed3a2f1a89c8945d
-SHA1 (patch-ae) = 1c6e2ff7ca214c5cca74d6447a01eed718a79b4a
 SHA1 (patch-af) = 50f179c3d2775f0a058d7644f6f9a0b958f4b531
diff --git a/x11/gnome2-control-center/patches/patch-ae b/x11/gnome2-control-center/patches/patch-ae
deleted file mode 100644
index 8b14b89c75a..00000000000
--- a/x11/gnome2-control-center/patches/patch-ae
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/04/12 00:56:19 rillig Exp $
-
-Needed for gcc-2.95.
-
---- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig	Thu Jan 20 00:16:13 2005
-+++ capplets/keyboard/gnome-keyboard-properties-xkbot.c	Sat Apr  9 14:00:39 2005
-@@ -243,20 +243,22 @@ xkb_options_add_group (const XklConfigIt
-                                          GladeXML * dialog)
- {
-   GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
-+  gchar *utfGroupName, *titlemarkup;
-+  GtkWidget *expander, *align, *vbox;
- 
-   current1stLevelId = configItem->name;
- 
--  gchar *utfGroupName = xci_desc_to_utf8 (configItem);
--  gchar *titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
-+  utfGroupName = xci_desc_to_utf8 (configItem);
-+  titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
- 
--  GtkWidget *expander = gtk_expander_new (titlemarkup);
-+  expander = gtk_expander_new (titlemarkup);
-   g_object_set_data_full (G_OBJECT (expander), "utfGroupName", utfGroupName, g_free);
- 
-   g_free (titlemarkup);
-   gtk_expander_set_use_markup (GTK_EXPANDER (expander), TRUE);
--  GtkWidget *align = gtk_alignment_new (0, 0, 1, 1);
-+  align = gtk_alignment_new (0, 0, 1, 1);
-   gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 12, 12, 0);
--  GtkWidget *vbox = gtk_vbox_new (TRUE, 6);
-+  vbox = gtk_vbox_new (TRUE, 6);
-   gtk_container_add (GTK_CONTAINER (align), vbox);
-   gtk_container_add (GTK_CONTAINER (expander), align);
-   currentVbox = vbox;