# HG changeset patch
# User Etan Reisner <pidgin@unreliablesource.net>
# Date 1177725648 0
# Node ID 992da01baad176ea563932ad7879518a17cb373e
# Parent  b8ba44eafaaeecfc9d1d261b68c5a2227a3d39d7# Parent  5ad28c23e899dcbeccf563b6a1bedebc4d6649e6
merge of '75c6e6af1c101fa3bf55398299bf3e586d30ca0e'
     and '91f83655b89bd0b46b3aeb37394de5f7e59929ae'

diff -r 5ad28c23e899 -r 992da01baad1 Makefile.am
--- a/Makefile.am	Fri Apr 27 05:20:10 2007 +0000
+++ b/Makefile.am	Sat Apr 28 02:00:48 2007 +0000
@@ -6,7 +6,6 @@
 		HACKING \
 		Makefile.mingw \
 		PLUGIN_HOWTO \
-		PROGRAMMING_NOTES \
 		README.MTN \
 		README.mingw \
 		config.h.mingw \
diff -r 5ad28c23e899 -r 992da01baad1 PROGRAMMING_NOTES
--- a/PROGRAMMING_NOTES	Fri Apr 27 05:20:10 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-Notes on keeping Pidgin, Finch, and libpurple OS independant
-------------------------------------------------------------
-
-General
--------
-- Use G_DIR_SEPARATOR_S and G_DIR_SEPARATOR for paths
-
-- Use g_getenv, g_snprintf, g_vsnprintf
-
-- Use purple_home_dir instead of g_get_home_dir or g_getenv("HOME")
-
-- Make sure when including win32dep.h that it is the last header to
-  be included.
-
-- Open binary files when reading or writing with 'b' mode.
-
-  e.g: fopen("somefile", "wb");
-
-  Not doing so will open files in windows using default translation mode. 
-  i.e. newline -> <CR><LF>
-
-Paths
------
-
-- DATADIR, LOCALEDIR & LIBDIR are defined as functions in the win32 build
-  Doing the following will therefore break the windows build:
-
-  printf("File in DATADIR is: %s\n", DATADIR G_DIR_SEPARATOR_S "pic.png");
-
-  it should be:
-
-  printf("File in DATADIR is: %s%s%s\n", DATADIR, G_DIR_SEPARATOR_S, "pic.png");
-
-PLUGINS & PROTOS
-----------------
-
-- G_MODULE_EXPORT all functions which are to be accessed from outside the
-  scope of its "dll" or "so". (E.G. purple_plugin_init)
-
-- G_MODULE_IMPORT all global variables which are located outside your
-  dynamic library. (E.G. connections)
-
-  (Not doing this will cause "Memory Access Violations" in win32)
diff -r 5ad28c23e899 -r 992da01baad1 configure.ac
--- a/configure.ac	Fri Apr 27 05:20:10 2007 +0000
+++ b/configure.ac	Sat Apr 28 02:00:48 2007 +0000
@@ -807,7 +807,22 @@
 AC_CHECK_HEADER(sys/utsname.h)
 AC_CHECK_FUNC(uname)
 
-AC_ARG_ENABLE(fortify, [AC_HELP_STRING([--disable-fortify], [compile without FORTIFY_SOURCE support])], , enable_fortify=yes)
+AC_ARG_ENABLE(fortify, [AC_HELP_STRING([--disable-fortify], [compile without FORTIFY_SOURCE support])], enable_fortify="$enableval", enable_fortify=yes)
+
+AC_ARG_ENABLE(mcheck, [AC_HELP_STRING([--enable-mcheck], [compile with mcheck (malloc debugging) support])], enable_mcheck="$enableval", enable_mcheck="$enable_debug")
+if test "x$enable_mcheck" = "xyes" ; then
+	orig_LIBS="$LIBS"
+	LIBS="$LIBS -lmcheck"
+	AC_MSG_CHECKING(for mcheck support)
+	AC_TRY_COMPILE([], [
+		int main() {return 0;}
+	], [
+		AC_MSG_RESULT(yes)
+	], [
+		AC_MSG_RESULT(no)
+		LIBS="$orig_LIBS"
+	])
+fi
 
 if test "x$GCC" = "xyes"; then
 	dnl We enable -Wall later.
diff -r 5ad28c23e899 -r 992da01baad1 finch/finch.c
--- a/finch/finch.c	Fri Apr 27 05:20:10 2007 +0000
+++ b/finch/finch.c	Sat Apr 28 02:00:48 2007 +0000
@@ -202,6 +202,11 @@
 		{0, 0, 0, 0}
 	};
 
+#ifdef PURPLE_FATAL_ASSERTS
+	/* Make g_return_... functions fatal. */
+	g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
+#endif
+
 #ifdef ENABLE_NLS
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	bind_textdomain_codeset(PACKAGE, "UTF-8");
diff -r 5ad28c23e899 -r 992da01baad1 finch/libgnt/gntwm.c
--- a/finch/libgnt/gntwm.c	Fri Apr 27 05:20:10 2007 +0000
+++ b/finch/libgnt/gntwm.c	Sat Apr 28 02:00:48 2007 +0000
@@ -905,6 +905,32 @@
 	return FALSE;
 }
 
+static gboolean
+toggle_clipboard(GntBindable *bindable, GList *n)
+{
+	static GntWidget *clip;
+	gchar *text;
+	int maxx, maxy;
+	if (clip) {
+		gnt_widget_destroy(clip);
+		clip = NULL;
+		return TRUE;
+	}
+	getmaxyx(stdscr, maxy, maxx);
+	text = gnt_get_clipboard_string();
+	clip = gnt_hwindow_new(FALSE);
+	GNT_WIDGET_SET_FLAGS(clip, GNT_WIDGET_TRANSIENT);
+	GNT_WIDGET_SET_FLAGS(clip, GNT_WIDGET_NO_BORDER);
+	gnt_box_set_pad(GNT_BOX(clip), 0);
+	gnt_box_add_widget(GNT_BOX(clip), gnt_label_new(" "));
+	gnt_box_add_widget(GNT_BOX(clip), gnt_label_new(text));
+	gnt_box_add_widget(GNT_BOX(clip), gnt_label_new(" "));
+	gnt_widget_set_position(clip, 0, 0);
+	gnt_widget_draw(clip);
+	g_free(text);
+	return TRUE;
+}
+
 static void
 gnt_wm_class_init(GntWMClass *klass)
 {
@@ -1039,6 +1065,8 @@
 				"\033" GNT_KEY_CTRL_K, NULL);
 	gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "help-for-widget", help_for_widget,
 				"\033" "/", NULL);
+	gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "toggle-clipboard",
+				toggle_clipboard, "\033" "C", NULL);
 
 	gnt_style_read_actions(G_OBJECT_CLASS_TYPE(klass), GNT_BINDABLE_CLASS(klass));
 
diff -r 5ad28c23e899 -r 992da01baad1 finch/libgnt/wms/s.c
--- a/finch/libgnt/wms/s.c	Fri Apr 27 05:20:10 2007 +0000
+++ b/finch/libgnt/wms/s.c	Sat Apr 28 02:00:48 2007 +0000
@@ -168,32 +168,6 @@
 	return TRUE;
 }
 
-static gboolean
-toggle_clipboard(GntBindable *bindable, GList *n)
-{
-	static GntWidget *clip;
-	gchar *text;
-	int maxx, maxy;
-	if (clip) {
-		gnt_widget_destroy(clip);
-		clip = NULL;
-		return TRUE;
-	}
-	getmaxyx(stdscr, maxy, maxx);
-	text = gnt_get_clipboard_string();
-	clip = gnt_hwindow_new(FALSE);
-	GNT_WIDGET_SET_FLAGS(clip, GNT_WIDGET_TRANSIENT);
-	GNT_WIDGET_SET_FLAGS(clip, GNT_WIDGET_NO_BORDER);
-	gnt_box_set_pad(GNT_BOX(clip), 0);
-	gnt_box_add_widget(GNT_BOX(clip), gnt_label_new(" "));
-	gnt_box_add_widget(GNT_BOX(clip), gnt_label_new(text));
-	gnt_box_add_widget(GNT_BOX(clip), gnt_label_new(" "));
-	gnt_widget_set_position(clip, 0, 0);
-	gnt_widget_draw(clip);
-	g_free(text);
-	return TRUE;
-}
-
 static void
 s_class_init(SClass *klass)
 {
@@ -208,8 +182,6 @@
 
 	gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "toggle-buddylist",
 				toggle_buddylist, "\033" "b", NULL);
-	gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "toggle-clipboard",
-				toggle_clipboard, "\033" "C", NULL);
 	gnt_style_read_actions(G_OBJECT_CLASS_TYPE(klass), GNT_BINDABLE_CLASS(klass));
 	GNTDEBUG;
 }
diff -r 5ad28c23e899 -r 992da01baad1 libpurple/blist.c
--- a/libpurple/blist.c	Fri Apr 27 05:20:10 2007 +0000
+++ b/libpurple/blist.c	Sat Apr 28 02:00:48 2007 +0000
@@ -2334,7 +2334,6 @@
 					buddy = (PurpleBuddy *)bnode;
 					if (account == buddy->account) {
 						PurplePresence *presence;
-						recompute = TRUE;
 
 						presence = purple_buddy_get_presence(buddy);
 
@@ -2354,8 +2353,14 @@
 						if (!g_list_find(list, presence))
 							list = g_list_prepend(list, presence);
 
-						if (ops && ops->remove)
+						if (contact->priority == buddy)
+							purple_contact_invalidate_priority_buddy(contact);
+						else
+							recompute = TRUE;
+
+						if (ops && ops->remove) {
 							ops->remove(purplebuddylist, bnode);
+						}
 					}
 				}
 				if (recompute) {
diff -r 5ad28c23e899 -r 992da01baad1 libpurple/buddyicon.c
--- a/libpurple/buddyicon.c	Fri Apr 27 05:20:10 2007 +0000
+++ b/libpurple/buddyicon.c	Sat Apr 28 02:00:48 2007 +0000
@@ -98,6 +98,7 @@
 {
 	PurpleCipherContext *context;
 	gchar digest[41];
+	const char *ext;
 
 	context = purple_cipher_context_new_by_name("sha1", NULL);
 	if (context == NULL)
@@ -115,9 +116,10 @@
 	}
 	purple_cipher_context_destroy(context);
 
+	ext = purple_util_get_image_extension(icon_data, icon_len);
+
 	/* Return the filename */
-	return g_strdup_printf("%s.%s", digest,
-	                       purple_util_get_image_extension(icon_data, icon_len));
+	return g_strdup_printf("%s%s%s", digest, ext ? "." : "", ext ? ext : "");
 }
 
 static void
diff -r 5ad28c23e899 -r 992da01baad1 libpurple/core.c
--- a/libpurple/core.c	Fri Apr 27 05:20:10 2007 +0000
+++ b/libpurple/core.c	Sat Apr 28 02:00:48 2007 +0000
@@ -310,7 +310,6 @@
 gboolean
 purple_core_migrate(void)
 {
-#error You probably want to back up your .gaim directory right now. This revision is going to destroy it, potentially not in the way we've intended
 	const char *user_dir = purple_user_dir();
 	char *old_user_dir = g_strconcat(purple_home_dir(),
 	                                 G_DIR_SEPARATOR_S ".gaim", NULL);
diff -r 5ad28c23e899 -r 992da01baad1 libpurple/gaim-compat.h
--- a/libpurple/gaim-compat.h	Fri Apr 27 05:20:10 2007 +0000
+++ b/libpurple/gaim-compat.h	Sat Apr 28 02:00:48 2007 +0000
@@ -27,6 +27,8 @@
 #ifndef _GAIM_COMPAT_H_
 #define _GAIM_COMPAT_H_
 
+#include <glib.h>
+
 /* from account.h */
 #define GaimAccountUiOps PurpleAccountUiOps
 #define GaimAccount PurpleAccount
@@ -51,7 +53,6 @@
 #define gaim_account_set_password            purple_account_set_password
 #define gaim_account_set_alias               purple_account_set_alias
 #define gaim_account_set_user_info           purple_account_set_user_info
-#define gaim_account_set_buddy_icon          purple_account_set_buddy_icon
 #define gaim_account_set_buddy_icon_path     purple_account_set_buddy_icon_path
 #define gaim_account_set_protocol_id         purple_account_set_protocol_id
 #define gaim_account_set_connection          purple_account_set_connection
@@ -81,7 +82,6 @@
 #define gaim_account_get_password           purple_account_get_password
 #define gaim_account_get_alias              purple_account_get_alias
 #define gaim_account_get_user_info          purple_account_get_user_info
-#define gaim_account_get_buddy_icon         purple_account_get_buddy_icon
 #define gaim_account_get_buddy_icon_path    purple_account_get_buddy_icon_path
 #define gaim_account_get_protocol_id        purple_account_get_protocol_id
 #define gaim_account_get_protocol_name      purple_account_get_protocol_name
@@ -338,22 +338,22 @@
 
 #define GaimBuddyIcon  PurpleBuddyIcon
 
-#define gaim_buddy_icon_new      purple_buddy_icon_new
-#define gaim_buddy_icon_destroy  purple_buddy_icon_destroy
+#define gaim_buddy_icon_new(account, username, icon_data, icon_len)\
+        purple_buddy_icon_new(account, username, g_memdup(icon_data, icon_len), icon_len)
 #define gaim_buddy_icon_ref      purple_buddy_icon_ref
 #define gaim_buddy_icon_unref    purple_buddy_icon_unref
 #define gaim_buddy_icon_update   purple_buddy_icon_update
 
-#define gaim_buddy_icon_set_account   purple_buddy_icon_set_account
-#define gaim_buddy_icon_set_username  purple_buddy_icon_set_username
-#define gaim_buddy_icon_set_data      purple_buddy_icon_set_protocol_data
+#define gaim_buddy_icon_set_data(icon, data, len) \
+        purple_buddy_icon_set_protocol_data(icon, g_memdup(data, len), len, NULL);
 
 #define gaim_buddy_icon_get_account   purple_buddy_icon_get_account
 #define gaim_buddy_icon_get_username  purple_buddy_icon_get_username
 #define gaim_buddy_icon_get_data      purple_buddy_icon_get_data
 #define gaim_buddy_icon_get_type      purple_buddy_icon_get_extension
 
-#define gaim_buddy_icons_set_for_user   purple_buddy_icons_set_for_user
+#define gaim_buddy_icons_set_for_user(icon, data, len) \
+        purple_buddy_icons_set_for_user(icon, g_memdup(data, len), len)
 #define gaim_buddy_icons_find           purple_buddy_icons_find
 #define gaim_buddy_icons_set_caching    purple_buddy_icons_set_caching
 #define gaim_buddy_icons_is_caching     purple_buddy_icons_is_caching
@@ -944,7 +944,6 @@
 
 /* from gaim-client.h */
 
-/* XXX: should this be purple_init, or pidgin_init */
 #define gaim_init  purple_init
 
 /* from idle.h */
@@ -962,7 +961,7 @@
 
 #define GaimStoredImage  PurpleStoredImage
 
-#define gaim_imgstore_add           purple_imgstore_add_with_id
+#define gaim_imgstore_add(data, size, filename) purple_imgstore_add_with_id(g_memdup(data, size), size, filename)
 #define gaim_imgstore_get           purple_imgstore_find_by_id
 #define gaim_imgstore_get_data      purple_imgstore_get_data
 #define gaim_imgstore_get_size      purple_imgstore_get_size
diff -r 5ad28c23e899 -r 992da01baad1 libpurple/imgstore.c
--- a/libpurple/imgstore.c	Fri Apr 27 05:20:10 2007 +0000
+++ b/libpurple/imgstore.c	Sat Apr 28 02:00:48 2007 +0000
@@ -71,13 +71,13 @@
 	PurpleStoredImage *img = purple_imgstore_add(data, size, filename);
 	img->id = ++nextid;
 
-	g_hash_table_insert(imgstore, GINT_TO_POINTER(img->id), img);
+	g_hash_table_insert(imgstore, &(img->id), img);
 
 	return img->id;
 }
 
 PurpleStoredImage *purple_imgstore_find_by_id(int id) {
-	PurpleStoredImage *img = g_hash_table_lookup(imgstore, GINT_TO_POINTER(id));
+	PurpleStoredImage *img = g_hash_table_lookup(imgstore, &id);
 
 	if (img != NULL)
 		purple_debug_misc("imgstore", "retrieved image id %d\n", img->id);
@@ -155,7 +155,7 @@
 		purple_signal_emit(purple_imgstore_get_handle(),
 		                   "image-deleting", img);
 		if (img->id)
-			g_hash_table_remove(imgstore, GINT_TO_POINTER(img->id));
+			g_hash_table_remove(imgstore, &img->id);
 
 		g_free(img->data);
 		g_free(img->filename);
@@ -192,5 +192,5 @@
 {
 	g_hash_table_destroy(imgstore);
 
-	purple_signals_unregister_by_instance(purple_blist_get_handle());
+	purple_signals_unregister_by_instance(purple_imgstore_get_handle());
 }
diff -r 5ad28c23e899 -r 992da01baad1 libpurple/imgstore.h
--- a/libpurple/imgstore.h	Fri Apr 27 05:20:10 2007 +0000
+++ b/libpurple/imgstore.h	Sat Apr 28 02:00:48 2007 +0000
@@ -100,7 +100,7 @@
  * @return The size of the data that the pointer returned by
  *         purple_imgstore_get_data points to.
  */
-size_t purple_imgstore_get_size(PurpleStoredImage *i);
+size_t purple_imgstore_get_size(PurpleStoredImage *img);
 
 /**
  * Retrieves a pointer to the image's filename.
diff -r 5ad28c23e899 -r 992da01baad1 libpurple/plugins/joinpart.c
diff -r 5ad28c23e899 -r 992da01baad1 libpurple/plugins/log_reader.c
diff -r 5ad28c23e899 -r 992da01baad1 libpurple/plugins/mono/api/Makefile.am
diff -r 5ad28c23e899 -r 992da01baad1 libpurple/plugins/mono/loader/Makefile.am
diff -r 5ad28c23e899 -r 992da01baad1 libpurple/plugins/pluginpref_example.c
diff -r 5ad28c23e899 -r 992da01baad1 libpurple/plugins/psychic.c
diff -r 5ad28c23e899 -r 992da01baad1 libpurple/plugins/statenotify.c
diff -r 5ad28c23e899 -r 992da01baad1 libpurple/prefs.c
--- a/libpurple/prefs.c	Fri Apr 27 05:20:10 2007 +0000
+++ b/libpurple/prefs.c	Sat Apr 28 02:00:48 2007 +0000
@@ -1102,13 +1102,14 @@
 static void
 purple_prefs_rename_node(struct purple_pref *oldpref, struct purple_pref *newpref)
 {
-	struct purple_pref *child;
+	struct purple_pref *child, *next;
 	char *oldname, *newname;
 
 	/* if we're a parent, rename the kids first */
-	for(child = oldpref->first_child; child != NULL; child = child->sibling)
+	for(child = oldpref->first_child; child != NULL; child = next)
 	{
 		struct purple_pref *newchild;
+		next = child->sibling;
 		for(newchild = newpref->first_child; newchild != NULL; newchild = newchild->sibling)
 		{
 			if(!strcmp(child->name, newchild->name))
diff -r 5ad28c23e899 -r 992da01baad1 libpurple/protocols/jabber/buddy.c
--- a/libpurple/protocols/jabber/buddy.c	Fri Apr 27 05:20:10 2007 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Sat Apr 28 02:00:48 2007 +0000
@@ -955,22 +955,23 @@
 					gboolean photo = (strcmp(child->name, "PHOTO") == 0);
 
 					data = purple_base64_decode(bintext, &size);
-
-					jbi->vcard_imgids = g_slist_prepend(jbi->vcard_imgids, GINT_TO_POINTER(purple_imgstore_add_with_id(g_memdup(data, size), size, "logo.png")));
-					g_string_append_printf(info_text,
-							"<b>%s:</b> <img id='%d'><br/>",
-							photo ? _("Photo") : _("Logo"),
-							GPOINTER_TO_INT(jbi->vcard_imgids->data));
+					if (data) {
+						jbi->vcard_imgids = g_slist_prepend(jbi->vcard_imgids, GINT_TO_POINTER(purple_imgstore_add_with_id(g_memdup(data, size), size, "logo.png")));
+						g_string_append_printf(info_text,
+								"<b>%s:</b> <img id='%d'><br/>",
+								photo ? _("Photo") : _("Logo"),
+								GPOINTER_TO_INT(jbi->vcard_imgids->data));
+	
+						purple_cipher_digest_region("sha1", (guchar *)data, size,
+								sizeof(hashval), hashval, NULL);
+						p = hash;
+						for(i=0; i<20; i++, p+=2)
+							snprintf(p, 3, "%02x", hashval[i]);
 
-					purple_cipher_digest_region("sha1", (guchar *)data, size,
-							sizeof(hashval), hashval, NULL);
-					p = hash;
-					for(i=0; i<20; i++, p+=2)
-						snprintf(p, 3, "%02x", hashval[i]);
-
-					purple_buddy_icons_set_for_user(js->gc->account, bare_jid,
-							data, size, hash);
-					g_free(bintext);
+						purple_buddy_icons_set_for_user(js->gc->account, bare_jid,
+								data, size, hash);
+						g_free(bintext);
+					}
 				}
 			}
 			g_free(text);
diff -r 5ad28c23e899 -r 992da01baad1 libpurple/protocols/msn/slpmsg.c
--- a/libpurple/protocols/msn/slpmsg.c	Fri Apr 27 05:20:10 2007 +0000
+++ b/libpurple/protocols/msn/slpmsg.c	Sat Apr 28 02:00:48 2007 +0000
@@ -106,9 +106,9 @@
 						 long long size)
 {
 	/* We can only have one data source at a time. */
-	g_return_if_fail(slpmsg->buffer);
-	g_return_if_fail(slpmsg->img);
-	g_return_if_fail(slpmsg->fp);
+	g_return_if_fail(slpmsg->buffer == NULL);
+	g_return_if_fail(slpmsg->img == NULL);
+	g_return_if_fail(slpmsg->fp == NULL);
 
 	if (body != NULL)
 		slpmsg->buffer = g_memdup(body, size);
@@ -122,9 +122,9 @@
 msn_slpmsg_set_image(MsnSlpMessage *slpmsg, PurpleStoredImage *img)
 {
 	/* We can only have one data source at a time. */
-	g_return_if_fail(slpmsg->buffer);
-	g_return_if_fail(slpmsg->img);
-	g_return_if_fail(slpmsg->fp);
+	g_return_if_fail(slpmsg->buffer == NULL);
+	g_return_if_fail(slpmsg->img == NULL);
+	g_return_if_fail(slpmsg->fp == NULL);
 
 	slpmsg->img = purple_imgstore_ref(img);
 	slpmsg->buffer = (guchar *)purple_imgstore_get_data(img);
@@ -137,9 +137,9 @@
 	struct stat st;
 
 	/* We can only have one data source at a time. */
-	g_return_if_fail(slpmsg->buffer);
-	g_return_if_fail(slpmsg->img);
-	g_return_if_fail(slpmsg->fp);
+	g_return_if_fail(slpmsg->buffer == NULL);
+	g_return_if_fail(slpmsg->img == NULL);
+	g_return_if_fail(slpmsg->fp == NULL);
 
 	slpmsg->fp = g_fopen(file_name, "rb");
 
diff -r 5ad28c23e899 -r 992da01baad1 libpurple/protocols/yahoo/yahoo.c
--- a/libpurple/protocols/yahoo/yahoo.c	Fri Apr 27 05:20:10 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Sat Apr 28 02:00:48 2007 +0000
@@ -345,6 +345,7 @@
 			/* FIXME: Please, if you know this protocol,
 			 * FIXME: fix up the strtol() stuff if possible. */
 			int cksum = strtol(pair->value, NULL, 10);
+			const char *locksum = NULL;
 			PurpleBuddy *b;
 
 			if (!name)
@@ -363,7 +364,8 @@
 				break;
 
 			yahoo_friend_set_buddy_icon_need_request(f, FALSE);
-			if (b && cksum != strtol(purple_buddy_icons_get_checksum_for_user(b), NULL, 10))
+			if (b && (locksum = purple_buddy_icons_get_checksum_for_user(b)) != NULL &&
+					cksum != strtol(locksum, NULL, 10))
 				yahoo_send_picture_request(gc, name);
 
 			break;
diff -r 5ad28c23e899 -r 992da01baad1 libpurple/protocols/yahoo/yahoo_picture.c
--- a/libpurple/protocols/yahoo/yahoo_picture.c	Fri Apr 27 05:20:10 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo_picture.c	Sat Apr 28 02:00:48 2007 +0000
@@ -115,9 +115,11 @@
 		PurpleUtilFetchUrlData *url_data;
 		struct yahoo_fetch_picture_data *data;
 		PurpleBuddy *b = purple_find_buddy(gc->account, who);
+		const char *locksum = NULL;
 
 		/* FIXME: Cleanup this strtol() stuff if possible. */
-		if (b && (checksum == strtol(purple_buddy_icons_get_checksum_for_user(b), NULL, 10)))
+		if (b && (locksum = purple_buddy_icons_get_checksum_for_user(b)) != NULL && 
+				(checksum == strtol(locksum, NULL, 10)))
 			return;
 
 		data = g_new0(struct yahoo_fetch_picture_data, 1);
@@ -200,9 +202,11 @@
 
 	if (who) {
 		PurpleBuddy *b = purple_find_buddy(gc->account, who);
+		const char *locksum = NULL;
 
 		/* FIXME: Cleanup this strtol() stuff if possible. */
-		if (b && (checksum != strtol(purple_buddy_icons_get_checksum_for_user(b), NULL, 10)))
+		if (b && (locksum = purple_buddy_icons_get_checksum_for_user(b)) != NULL && 
+				(checksum != strtol(locksum, NULL, 10)))
 			yahoo_send_picture_request(gc, who);
 	}
 }
diff -r 5ad28c23e899 -r 992da01baad1 libpurple/request.h
--- a/libpurple/request.h	Fri Apr 27 05:20:10 2007 +0000
+++ b/libpurple/request.h	Sat Apr 28 02:00:48 2007 +0000
@@ -1332,7 +1332,7 @@
  * @param cancel_text The text for the @c Cancel button.
  * @param cancel_cb   The callback for the @c Cancel button.
  * @param account	  The PurpleAccount associated with this request, or NULL if none is
- * @param who		  The username of the buddy assocaited with this request, or NULL if none is
+ * @param who		  The username of the buddy associated with this request, or NULL if none is
  * @param conv		  The PurpleConversation associated with this request, or NULL if none is 
  * @param user_data   The data to pass to the callback.
  *
diff -r 5ad28c23e899 -r 992da01baad1 libpurple/status.c
--- a/libpurple/status.c	Fri Apr 27 05:20:10 2007 +0000
+++ b/libpurple/status.c	Sat Apr 28 02:00:48 2007 +0000
@@ -597,8 +597,6 @@
 notify_buddy_status_update(PurpleBuddy *buddy, PurplePresence *presence,
 		PurpleStatus *old_status, PurpleStatus *new_status)
 {
-	PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
-
 	if (purple_prefs_get_bool("/purple/logging/log_system"))
 	{
 		time_t current_time = time(NULL);
@@ -637,9 +635,6 @@
 
 		g_free(tmp);
 	}
-
-	if (ops != NULL && ops->update != NULL)
-		ops->update(purple_get_blist(), (PurpleBlistNode*)buddy);
 }
 
 static void
diff -r 5ad28c23e899 -r 992da01baad1 libpurple/tests/check_libpurple.c
--- a/libpurple/tests/check_libpurple.c	Fri Apr 27 05:20:10 2007 +0000
+++ b/libpurple/tests/check_libpurple.c	Sat Apr 28 02:00:48 2007 +0000
@@ -54,7 +54,14 @@
 int main(void)
 {
 	int number_failed;
-	SRunner *sr = srunner_create (master_suite());
+	SRunner *sr;
+
+	/* Make g_return_... functions fatal, ALWAYS.
+	 * As this is the test code, this is NOT controlled
+	 * by PURPLE_FATAL_ASSERTS. */
+	g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
+
+	sr = srunner_create (master_suite());
 
 	srunner_add_suite(sr, cipher_suite());
 	srunner_add_suite(sr, jabber_jutil_suite());
diff -r 5ad28c23e899 -r 992da01baad1 libpurple/util.c
--- a/libpurple/util.c	Fri Apr 27 05:20:10 2007 +0000
+++ b/libpurple/util.c	Sat Apr 28 02:00:48 2007 +0000
@@ -2696,6 +2696,7 @@
 purple_normalize(const PurpleAccount *account, const char *str)
 {
 	const char *ret = NULL;
+	static char buf[BUF_LEN];
 
 	if (account != NULL)
 	{
@@ -2712,7 +2713,6 @@
 
 	if (ret == NULL)
 	{
-		static char buf[BUF_LEN];
 		char *tmp;
 
 		tmp = g_utf8_normalize(str, -1, G_NORMALIZE_DEFAULT);
diff -r 5ad28c23e899 -r 992da01baad1 pidgin.spec.in
--- a/pidgin.spec.in	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin.spec.in	Sat Apr 28 02:00:48 2007 +0000
@@ -227,8 +227,10 @@
 # Delete files that we don't want to put in any of the RPMs
 rm -f $RPM_BUILD_ROOT%{_libdir}/finch/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/libpurple/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/libpurple/private/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/purple/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/purple/liboscar.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/purple/libjabber.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/purple/private/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/pixmaps/emblems/16/scalable/secure.svg
--- a/pidgin/pixmaps/emblems/16/scalable/secure.svg	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/pixmaps/emblems/16/scalable/secure.svg	Sat Apr 28 02:00:48 2007 +0000
@@ -7,96 +7,81 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/s odipodi-0.dtd"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
+   width="16px"
+   height="16px"
+   id="svg4220"
    sodipodi:version="0.32"
-   inkscape:version="0.43"
-   version="1.0"
-   sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/emblems/scalable"
+   inkscape:version="0.44.1"
+   sodipodi:docbase="/home/hbons/code/pidgin-mtn/pidgin/pixmaps/emblems/16/scalable"
    sodipodi:docname="secure.svg"
-   inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/emblems/secure.png"
+   inkscape:export-filename="/home/hbons/code/pidgin-mtn/pidgin/pixmaps/emblems/16/secure.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
-     id="defs4">
+     id="defs4222">
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient2193">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop2195" />
-      <stop
-         style="stop-color:#555753;stop-opacity:0;"
-         offset="1"
-         id="stop2197" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2351">
+       id="linearGradient5170">
       <stop
          style="stop-color:#eeeeec;stop-opacity:1;"
          offset="0"
-         id="stop2353" />
+         id="stop5172" />
       <stop
          style="stop-color:#eeeeec;stop-opacity:0;"
          offset="1"
-         id="stop2355" />
+         id="stop5174" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5160">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop5162" />
+      <stop
+         style="stop-color:#c4a000;stop-opacity:0;"
+         offset="1"
+         id="stop5164" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient2343">
+       id="linearGradient5127">
       <stop
-         style="stop-color:#babdb6;stop-opacity:1;"
+         style="stop-color:white;stop-opacity:1;"
          offset="0"
-         id="stop2345" />
+         id="stop5129" />
       <stop
-         style="stop-color:#babdb6;stop-opacity:0;"
+         style="stop-color:white;stop-opacity:0;"
          offset="1"
-         id="stop2347" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2276">
-      <stop
-         style="stop-color:#f57900;stop-opacity:1;"
-         offset="0"
-         id="stop2278" />
-      <stop
-         style="stop-color:#fcaf3e;stop-opacity:1;"
-         offset="1"
-         id="stop2280" />
+         id="stop5131" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient2343"
-       id="linearGradient2349"
-       x1="12.515625"
-       y1="8.7261219"
-       x2="12.515625"
-       y2="0.68458056"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.661626,0,0,0.669831,0.220067,-0.15079)" />
+       xlink:href="#linearGradient5127"
+       id="linearGradient5133"
+       x1="-8.5730524"
+       y1="8.1949167"
+       x2="-8.5730524"
+       y2="14.091002"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient2351"
-       id="linearGradient2357"
-       x1="12.488563"
-       y1="5.8544211"
-       x2="12.488563"
-       y2="19.066195"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.571617,0,0,0.664095,1.361509,-0.130758)" />
+       xlink:href="#linearGradient5160"
+       id="linearGradient5166"
+       x1="-5.2575259"
+       y1="14.311456"
+       x2="-10.187596"
+       y2="11.560035"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient2193"
-       id="linearGradient2199"
-       x1="8.5"
-       y1="11.038469"
-       x2="8.5"
-       y2="13"
+       xlink:href="#linearGradient5170"
+       id="linearGradient5176"
+       x1="-7.5400991"
+       y1="0.79740471"
+       x2="-7.5400991"
+       y2="4.7783289"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -106,20 +91,21 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="39.000666"
-     inkscape:cx="12.56383"
-     inkscape:cy="9.2861054"
-     inkscape:document-units="px"
+     inkscape:zoom="22.197802"
+     inkscape:cx="8.5405941"
+     inkscape:cy="8.0965274"
      inkscape:current-layer="layer1"
      showgrid="true"
-     fill="#eeeeec"
-     inkscape:window-width="1268"
-     inkscape:window-height="972"
-     inkscape:window-x="6"
-     inkscape:window-y="21"
-     inkscape:grid-points="true" />
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="872"
+     inkscape:window-height="625"
+     inkscape:window-x="47"
+     inkscape:window-y="150" />
   <metadata
-     id="metadata7">
+     id="metadata4225">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -130,47 +116,46 @@
     </rdf:RDF>
   </metadata>
   <g
+     id="layer1"
      inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:url(#linearGradient2349);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.99999934;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 6.1333463,1.5028569 C 5.2074147,1.597488 4.4999578,2.402644 4.4999578,3.3658261 L 4.4999578,7.656935 C 4.4999578,8.6843293 5.3046208,9.4989715 6.3194286,9.4989715 L 10.661348,9.4989715 C 11.676156,9.4989715 12.501495,8.6843293 12.501495,7.656935 L 12.501495,3.3658261 C 12.501495,2.3384316 11.676156,1.5028569 10.661348,1.5028569 L 6.3194286,1.5028569 C 6.256003,1.5028569 6.1950751,1.496548 6.1333463,1.5028569 z M 7.2911913,3.5332839 C 7.3292999,3.5284078 7.3757891,3.5332839 7.4152465,3.5332839 L 9.5862055,3.5332839 C 9.8150574,3.5332839 10.026054,3.623525 10.185805,3.7635385 C 10.201979,3.7784151 10.232757,3.8103245 10.247831,3.8263353 C 10.272321,3.8536261 10.309391,3.9008527 10.330534,3.9309964 C 10.428638,4.0782548 10.49594,4.2625583 10.49594,4.4543024 L 10.49594,6.5893908 C 10.49594,7.1007088 10.091261,7.5104093 9.5862055,7.5104093 L 7.4152465,7.5104093 C 7.1232614,7.5104093 6.8582226,7.3694453 6.691593,7.1545613 C 6.5780448,7.000656 6.5055108,6.7971136 6.5055108,6.5893908 L 6.5055108,4.4543024 C 6.5055108,4.2625583 6.5728119,4.0782548 6.6709171,3.9309964 C 6.7301189,3.8465936 6.8149822,3.7606775 6.8983509,3.7007419 C 7.0135024,3.6221117 7.1463786,3.5518132 7.2911913,3.5332839 z "
-       id="rect1437" />
+     inkscape:groupmode="layer">
     <rect
-       style="fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#c4a000;stroke-width:0.97247171;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect1435"
-       width="10.030794"
-       height="8.0158854"
-       x="3.4845238"
-       y="6.4937477"
-       ry="2.1756756"
-       rx="2.1756771" />
+       style="opacity:1;fill:#fce94f;fill-opacity:1;stroke:#c4a000;stroke-width:0.52907252;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4238"
+       width="5.7297029"
+       height="6.3509903"
+       x="-6"
+       y="6"
+       transform="matrix(2.268879,0,0,1.574557,15.11327,-3.947338)"
+       rx="0.44198585"
+       ry="0.60082906" />
     <rect
-       style="opacity:0.4;fill:url(#linearGradient2357);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2312"
-       width="8.0056992"
-       height="5.982585"
-       x="4.4973445"
-       y="7.5063467"
-       ry="1.1603612"
-       rx="1.1603615" />
+       style="opacity:1;fill:url(#linearGradient5166);fill-opacity:1.0;stroke:url(#linearGradient5133);stroke-width:0.50402278;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect5125"
+       width="5.6391087"
+       height="2.9732673"
+       x="-11"
+       y="10.458911"
+       transform="matrix(1.950662,0,0,2.017983,23.95729,-12.6059)" />
+    <rect
+       style="opacity:0.56331877;fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect5156"
+       width="5.1252475"
+       height="2.6569307"
+       x="-14"
+       y="6"
+       transform="matrix(2.34135,0,0,0.752748,34.7789,1.48351)" />
     <path
-       sodipodi:type="arc"
-       style="fill:#555753;fill-opacity:1;stroke:none;stroke-width:0.86272454;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2325"
-       sodipodi:cx="12.265541"
-       sodipodi:cy="14"
-       sodipodi:rx="0.73445857"
-       sodipodi:ry="1"
-       d="M 13 14 A 0.73445857 1 0 1 1  11.531083,14 A 0.73445857 1 0 1 1  13 14 z"
-       transform="matrix(2.042319,0,0,1.5,-16.55015,-11.5)" />
-    <rect
-       style="fill:url(#linearGradient2199);fill-opacity:1.0;stroke:none;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2333"
-       width="1"
-       height="3"
-       x="8"
-       y="10" />
+       transform="translate(15,0)"
+       style="fill:#babdb6;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M -9.4188119,0.5 C -10.500938,0.5 -11.5,1.4812151 -11.5,2.4460396 L -11.5,7.5 L -9.5,7.5 L -9.4549505,4.0089109 C -9.4549505,2.4726571 -9.4588865,2.5 -8.1034653,2.5 L -5.9866337,2.5 C -4.4993176,2.5 -4.5,2.5177763 -4.5,4.0539604 L -4.5,7.5 L -2.5,7.5 L -2.5,2.4910891 C -2.5,1.6080661 -3.5388679,0.54504951 -4.4460396,0.54504951 L -9.4188119,0.5 z "
+       id="path5168"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <path
+       transform="translate(15,0)"
+       style="fill:url(#linearGradient5176);fill-opacity:1.0;stroke:#888a85;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M -9.4188119,0.5 C -10.500938,0.5 -11.5,1.4812151 -11.5,2.4460396 L -11.5,6.4638614 C -11.5,7.8729886 -9.5,7.6557806 -9.5,6.5089109 L -9.4549505,4.0089109 C -9.4549505,2.4726571 -9.4588865,2.5 -8.1034653,2.5 L -5.9866337,2.5 C -4.4993176,2.5 -4.5,2.5177763 -4.5,4.0539604 L -4.5,6.5539604 C -4.5450495,7.8163699 -2.5,7.594009 -2.5,6.5539604 L -2.5,2.4910891 C -2.5,1.6080661 -3.5388679,0.54504951 -4.4460396,0.54504951 L -9.4188119,0.5 z "
+       id="rect5149"
+       sodipodi:nodetypes="ccccccccccccc" />
   </g>
 </svg>
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/pixmaps/emblems/16/secure.png
Binary file pidgin/pixmaps/emblems/16/secure.png has changed
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/pixmaps/icons/32/pidgin.png
Binary file pidgin/pixmaps/icons/32/pidgin.png has changed
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/pixmaps/icons/32/scalable/pidgin.svg
--- a/pidgin/pixmaps/icons/32/scalable/pidgin.svg	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/pixmaps/icons/32/scalable/pidgin.svg	Sat Apr 28 02:00:48 2007 +0000
@@ -14,9 +14,9 @@
    id="svg4345"
    sodipodi:version="0.32"
    inkscape:version="0.44.1"
-   sodipodi:docbase="/home/hbons/Desktop/icons/32/scalable"
+   sodipodi:docbase="/home/hbons/code/pidgin-mtn/pidgin/pixmaps/icons/32/scalable"
    sodipodi:docname="pidgin.svg"
-   inkscape:export-filename="/home/hbons/Desktop/pidgin32.png"
+   inkscape:export-filename="/home/hbons/code/pidgin-mtn/pidgin/pixmaps/icons/32/pidgin.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
    version="1.0">
@@ -231,7 +231,7 @@
      inkscape:pageshadow="2"
      inkscape:zoom="21.220032"
      inkscape:cx="25.558911"
-     inkscape:cy="16.938593"
+     inkscape:cy="16.91503"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
@@ -398,12 +398,6 @@
        id="rect5189"
        sodipodi:nodetypes="cccc" />
     <path
-       transform="matrix(0.798987,0,0,0.495994,22.79842,2.215302)"
-       style="fill:url(#linearGradient6569);fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
-       d="M -0.99929609,42.004237 C 3.5188333,45.348102 4.1278823,38.950282 4.9828709,38.950282 C 5.8260957,38.950282 6.1724645,45.375511 10.014606,42.007796 C 9.2074596,43.955072 6.7265914,47.014858 5.6807127,47.014858 C 4.6230593,47.014858 0.31231911,44.880662 -0.99929609,42.004237 z "
-       id="path6561"
-       sodipodi:nodetypes="czczc" />
-    <path
        transform="matrix(0.798987,0,0,0.495994,8.99846,-1.319104)"
        style="fill:url(#linearGradient6823);fill-opacity:1.0;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
        d="M -0.99929609,42.004237 C 2.9290204,42.117701 4.1278823,38.950282 4.9828709,38.950282 C 5.8260957,38.950282 7.1161651,42.240122 10.014606,42.007796 C 9.2074596,43.955072 6.7265914,47.014858 5.6807127,47.014858 C 4.6230593,47.014858 0.31231911,44.880662 -0.99929609,42.004237 z "
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/langmacros.nsh
--- a/pidgin/win32/nsis/langmacros.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/langmacros.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -40,11 +40,6 @@
   ; Components Page
   !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SECTION_TITLE			${CUR_LANG}
   !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_SECTION_TITLE			${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_THEMES_SECTION_TITLE		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_NOTHEME_SECTION_TITLE		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_WIMP_SECTION_TITLE		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_BLUECURVE_SECTION_TITLE		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_LIGHTHOUSEBLUE_SECTION_TITLE	${CUR_LANG}
   !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SHORTCUTS_SECTION_TITLE	${CUR_LANG}
   !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE ${CUR_LANG}
   !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	${CUR_LANG}
@@ -69,9 +64,6 @@
   !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_INSTALL_ERROR			${CUR_LANG}
   !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_BAD_INSTALL_PATH		${CUR_LANG}
 
-  ; GTK+ Themes section
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_NO_THEME_INSTALL_RIGHTS		${CUR_LANG}
-
   ; URI Handler section
   !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT URI_HANDLERS_SECTION_TITLE		${CUR_LANG}
 
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/pidgin-installer.nsi
--- a/pidgin/win32/nsis/pidgin-installer.nsi	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Sat Apr 28 02:00:48 2007 +0000
@@ -326,7 +326,6 @@
 
 !ifdef WITH_GTK
 Section $(GTK_SECTION_TITLE) SecGtk
-  SectionIn 1 RO
 
   Call CheckUserInstallRights
   Pop $R1
@@ -1065,11 +1064,11 @@
       StrCmp $1 "HKCU" 0 +2   ; if HKLM can upgrade..
       StrCmp $2 "HKLM" no_gtk ; have hkcu rights.. if found hklm ver can't upgrade..
       Push $2
-    IntCmp $3 1 +3
-      Push "1" ; Optional Upgrade
-      Goto done
-      Push "2" ; Mandatory Upgrade
-      Goto done
+      IntCmp $3 1 +3
+        Push "1" ; Optional Upgrade
+        Goto done
+        Push "2" ; Mandatory Upgrade
+        Goto done
 
   good_version:
     StrCmp $2 "HKLM" have_hklm_gtk have_hkcu_gtk
@@ -1095,11 +1094,11 @@
   done:
   ; The top two items on the stack are what we want to return
   Exch 4
+  Pop $1
+  Exch 4
   Pop $0
-  Exch 4
   Pop $3
   Pop $2
-  Pop $1
 FunctionEnd
 
 
@@ -1199,6 +1198,7 @@
     StrCpy $INSTDIR "$R2\Pidgin"
 
   instdir_done:
+;LogSet on
   Pop $R0
 FunctionEnd
 
@@ -1275,7 +1275,7 @@
 ; Page enter and exit functions..
 
 Function preWelcomePage
-  Push R0
+  Push $R0
 
 !ifndef WITH_GTK
   ; If this installer dosn't have GTK, check whether we need it.
@@ -1292,7 +1292,16 @@
   done:
 
 !else
-  Push R1
+  Push $R1
+  Push $R2
+
+  ; Make the GTK+ Section RO if it is required.
+  Call DoWeNeedGtk
+  Pop $R0
+  Pop $R2
+  IntCmp $R0 1 gtk_not_mandatory gtk_not_mandatory
+    !insertmacro SetSectionFlag ${SecGtk} ${SF_RO}
+  gtk_not_mandatory:
 
   ; If on Win95/98/ME warn them that the GTK+ version wont work
   Call GetWindowsVersion
@@ -1304,22 +1313,13 @@
 
   win_ver_bad:
     !insertmacro UnselectSection ${SecGtk}
-    !insertmacro SetSectionFlag ${SecGtkNone} ${SF_RO}
-    !insertmacro UnselectSection ${SecGtkNone}
-    !insertmacro SetSectionFlag ${SecGtkWimp} ${SF_RO}
-    !insertmacro UnselectSection ${SecGtkWimp}
-    !insertmacro SetSectionFlag ${SecGtkBluecurve} ${SF_RO}
-    !insertmacro UnselectSection ${SecGtkBluecurve}
-    !insertmacro SetSectionFlag ${SecGtkLighthouseblue} ${SF_RO}
-    !insertmacro UnselectSection ${SecGtkLighthouseblue}
+    !insertmacro SetSectionFlag ${SecGtk} ${SF_RO}
     MessageBox MB_OK $(GTK_WINDOWS_INCOMPATIBLE) /SD IDOK
-    Call DoWeNeedGtk
-    Pop $R0
-    Pop $R1
     IntCmp $R0 1 done done ; Upgrade isn't optional - abort if we don't have a suitable version
     Quit
 
   done:
+  Pop $R2
   Pop $R1
 !endif
   Pop $R0
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/pixmaps/pidgin-header.bmp
Binary file pidgin/win32/nsis/pixmaps/pidgin-header.bmp has changed
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/pixmaps/pidgin-install.ico
Binary file pidgin/win32/nsis/pixmaps/pidgin-install.ico has changed
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/pixmaps/pidgin-intro.bmp
Binary file pidgin/win32/nsis/pixmaps/pidgin-intro.bmp has changed
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/albanian.nsh
--- a/pidgin/win32/nsis/translations/albanian.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/albanian.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -18,11 +18,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Klient Shkëmbimi Mesazhesh të Atypëratyshëm Pidgin (i nevojshëm)"
 !define GTK_SECTION_TITLE			"GTK+ Runtime Environment (i nevojshëm)"
-!define GTK_THEMES_SECTION_TITLE		"Tema GTK+"
-!define GTK_NOTHEME_SECTION_TITLE		"Pa Tema"
-!define GTK_WIMP_SECTION_TITLE		"Temë Wimp"
-!define GTK_BLUECURVE_SECTION_TITLE		"Temë Bluecurve"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Temë Light House Blue"
 !define PIDGIN_SECTION_DESCRIPTION		"Kartela dhe dll bazë të Pidgin-it"
 !define GTK_SECTION_DESCRIPTION		"Një grup mjetesh shumëplatformësh për GUI, përdorur nga Pidgin-i"
 
@@ -40,9 +35,6 @@
 !define GTK_INSTALL_ERROR			"gabim gjatë instalimit të GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Shtegu që treguat nuk mund të arrihet ose krijohet."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Nuk keni leje të instaloni tema GTK+."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"Çinstaluesi nuk gjeti dot zëra regjistri për Pidgin-in.$\rKa mundësi që këtë zbatim ta ketë instaluar një tjetër përdorues."
 !define un.PIDGIN_UNINSTALL_ERROR_2		"Nuk keni leje të çinstaloni këtë zbatim."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/bulgarian.nsh
--- a/pidgin/win32/nsis/translations/bulgarian.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/bulgarian.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -14,11 +14,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Pidgin ������ �� ����� ��������� (������� ��)"
 !define GTK_SECTION_TITLE			"GTK+ Runtime ����� (required)"
-!define GTK_THEMES_SECTION_TITLE		"GTK+ ����"
-!define GTK_NOTHEME_SECTION_TITLE		"��� ����"
-!define GTK_WIMP_SECTION_TITLE			"Wimp ����"
-!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve ����"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue ����"
 !define PIDGIN_SECTION_DESCRIPTION		"������� �� ������ �� Pidgin � ����������"
 !define GTK_SECTION_DESCRIPTION			"�������������� ��� �� �������� ������, ��������� �� Pidgin"
 
@@ -33,9 +28,6 @@
 !define GTK_INSTALL_ERROR			"������ ��� ����������� �� GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"���������� ��� �� ���� �� ���� �������� ��� ��������."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"������ ����� �� �� ����������� GTK+ ����."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"����������� �� ���� �� ������ ������ � ��������� �� Pidgin.$\r�������� � ��� ���������� �� ���� ����������."
 !define un.PIDGIN_UNINSTALL_ERROR_2		"������ ����� �� ������������� ���� ��������."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/catalan.nsh
--- a/pidgin/win32/nsis/translations/catalan.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/catalan.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -21,11 +21,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Client Pidgin de Missatgeria Instant�nia (necessari)"
 !define GTK_SECTION_TITLE			"Entorn d'Execuci� GTK+ (necessari)"
-!define GTK_THEMES_SECTION_TITLE		"Temes GTK+"
-!define GTK_NOTHEME_SECTION_TITLE		"Sense tema"
-!define GTK_WIMP_SECTION_TITLE			"Tema Imwi"
-!define GTK_BLUECURVE_SECTION_TITLE		"Tema Corba Blava"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema Light House Blue"
 !define PIDGIN_SHORTCUTS_SECTION_TITLE		"Enlla�os directes"
 !define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Escriptori"
 !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Menu Inici"
@@ -51,9 +46,6 @@
 !define GTK_INSTALL_ERROR			"Error installlant l'entorn d'execuci� GTK+."
 !define GTK_BAD_INSTALL_PATH			"El directori que has introdu�t no pot �sser accedit o creat."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"No tens permisos per instal.lar un tema GTK+."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"L'instal.lador podria no trobar les entrades del registre de Pidgin.$\rProbablement un altre usuari ha instal.lat aquesta aplicaci�."
 !define un.PIDGIN_UNINSTALL_ERROR_2		"No tens perm�s per desinstal.lar aquesta aplicaci�."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/czech.nsh
--- a/pidgin/win32/nsis/translations/czech.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/czech.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -18,11 +18,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Pidgin Instant Messaging Client (nutn�)"
 !define GTK_SECTION_TITLE			"GTK+ Runtime Environment (nutn�)"
-!define GTK_THEMES_SECTION_TITLE		"GTK+ t�mata"
-!define GTK_NOTHEME_SECTION_TITLE		"Bez t�mat"
-!define GTK_WIMP_SECTION_TITLE		"Wimp t�ma"
-!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve t�ma"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue t�ma"
 !define PIDGIN_SECTION_DESCRIPTION		"Z�kladn� soubory a DLL pro Pidgin"
 !define GTK_SECTION_DESCRIPTION		"Multi-platform GUI toolkit pou��van� Pidginem"
 
@@ -40,9 +35,6 @@
 !define GTK_INSTALL_ERROR			"Chyba p�i instalaci GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Zadan� cesta je nedostupn�, nebo ji nelze vytvo�it."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Nem�te opr�vn�n� k instalaci GTK+ t�matu."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"Odinstal�n� proces nem��e naj�t z�znamy pro Pidgin v registrech.$\rPravd�podobn� instalaci t�to aplikace provedl jin� u�ivatel."
 !define un.PIDGIN_UNINSTALL_ERROR_2		"Nem�te opr�vn�n� k odinstalaci t�to aplikace."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/danish.nsh
--- a/pidgin/win32/nsis/translations/danish.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/danish.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -18,11 +18,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Pidgin Instant Messaging Client (obligatorisk)"
 !define GTK_SECTION_TITLE			"GTK+ Runtime Environment (obligatorisk)"
-!define GTK_THEMES_SECTION_TITLE		"GTK+ Temaer"
-!define GTK_NOTHEME_SECTION_TITLE		"Intet Tema"
-!define GTK_WIMP_SECTION_TITLE		"Wimp Tema"
-!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve Tema"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue Tema"
 !define PIDGIN_SECTION_DESCRIPTION		"Basale Pidgin filer og biblioteker"
 !define GTK_SECTION_DESCRIPTION		"Et multi-platform grafisk interface udviklingsv�rkt�j, bruges af Pidgin"
 
@@ -40,9 +35,6 @@
 !define GTK_INSTALL_ERROR			"Fejl under installeringen af GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Stien du har angivet kan ikke findes eller oprettes."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Du har ikke tilladelse til at installere et GTK+ tema."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"Afinstallationen kunne ikke finde Pidgin i registreringsdatabasen.$\rMuligvis har en anden bruger installeret programmet."
 !define un.PIDGIN_UNINSTALL_ERROR_2		"Du har ikke tilladelse til at afinstallere dette program."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/dutch.nsh
--- a/pidgin/win32/nsis/translations/dutch.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/dutch.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -21,11 +21,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Pidgin Instant Messaging Client (vereist)"
 !define GTK_SECTION_TITLE			"GTK+ runtime-omgeving (vereist)"
-!define GTK_THEMES_SECTION_TITLE		"GTK+ thema's"
-!define GTK_NOTHEME_SECTION_TITLE		"Geen thema"
-!define GTK_WIMP_SECTION_TITLE		"Wimp thema"
-!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve thema"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue thema"
 !define PIDGIN_SECTION_DESCRIPTION		"Pidgin hoofdbestanden en dlls"
 !define GTK_SECTION_DESCRIPTION		"Een multi-platform gebruikersinterface, gebruikt door Pidgin"
 
@@ -43,9 +38,6 @@
 !define GTK_INSTALL_ERROR			"Fout bij installatie van GTK+ runtime omgeving."
 !define GTK_BAD_INSTALL_PATH			"Het door u gegeven pad kan niet benaderd worden."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"U heeft geen toestemming om een GTK+ thema te installeren."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"Het verwijderingsprogramma voor Pidgin kon geen register-ingangen voor Pidgin vinden.$\rWaarschijnlijk heeft een andere gebruiker het programma ge�nstalleerd."
 !define un.PIDGIN_UNINSTALL_ERROR_2         "U mag dit programma niet verwijderen."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/english.nsh
--- a/pidgin/win32/nsis/translations/english.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/english.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -22,12 +22,7 @@
 
 ; Components Page
 !insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SECTION_TITLE			"Pidgin Instant Messaging Client (required)"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_SECTION_TITLE			"GTK+ Runtime Environment (required)"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_THEMES_SECTION_TITLE		"GTK+ Themes"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_NOTHEME_SECTION_TITLE		"No Theme"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_WIMP_SECTION_TITLE			"MS-Windows (WIMP) Theme"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_BLUECURVE_SECTION_TITLE		"Bluecurve Theme"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue Theme"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_SECTION_TITLE			"GTK+ Runtime (required if not present)"
 !insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SHORTCUTS_SECTION_TITLE		"Shortcuts"
 !insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Desktop"
 !insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Start Menu"
@@ -53,9 +48,6 @@
 !insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_INSTALL_ERROR			"Error installing GTK+ runtime."
 !insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_BAD_INSTALL_PATH			"The path you entered can not be accessed or created."
 
-; GTK+ Themes section
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_NO_THEME_INSTALL_RIGHTS		"You do not have permission to install a GTK+ theme."
-
 ; URL Handler section
 !insertmacro PIDGIN_MACRO_DEFAULT_STRING URI_HANDLERS_SECTION_TITLE		"URI Handlers"
 
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/finnish.nsh
--- a/pidgin/win32/nsis/translations/finnish.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/finnish.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -18,11 +18,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Pidgin Suoraviestint�ohjelma (required)"
 !define GTK_SECTION_TITLE			"GTK+ runtime ymp�rist� (required)"
-!define GTK_THEMES_SECTION_TITLE		"GTK+ Teemat"
-!define GTK_NOTHEME_SECTION_TITLE		"Ei teemaa"
-!define GTK_WIMP_SECTION_TITLE		"Wimp Teema"
-!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve Teema"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue Teema"
 !define PIDGIN_SECTION_DESCRIPTION		"Pidfinin ytimen tiedostot ja dll:t"
 !define GTK_SECTION_DESCRIPTION		"Monipohjainen GUI (k�ytt�j�ulkoasu) ty�kalupakki, Pidginin k�ytt�m�"
 
@@ -39,9 +34,6 @@
 !define GTK_INSTALL_ERROR			"Virhe asennettaessa GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Antamasi polku ei toimi tai sit� ei voi luoda."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Sinulla ei ole valtuuksia asentaa GTK+ teemaa."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"Asennuksen poistaja ei l�yt�nyt reksiterist� tietoja Pidginista.$\rOn todenn�k�ist� ett� joku muu k�ytt�j� on asentanut ohjelman."
 !define un.PIDGIN_UNINSTALL_ERROR_2		"Sinulla ei ole valtuuksia poistaa ohjelmaa."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/french.nsh
--- a/pidgin/win32/nsis/translations/french.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/french.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -24,11 +24,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Pidgin client de messagerie instantan�e (obligatoire)"
 !define GTK_SECTION_TITLE			"Biblioth�ques GTK+ (obligatoire)"
-!define GTK_THEMES_SECTION_TITLE		"Th�mes GTK+"
-!define GTK_NOTHEME_SECTION_TITLE		"Pas de th�me"
-!define GTK_WIMP_SECTION_TITLE			"Th�me Wimp"
-!define GTK_BLUECURVE_SECTION_TITLE		"Th�me Bluecurve"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Th�me Light House Blue"
 !define PIDGIN_SHORTCUTS_SECTION_TITLE		"Raccourcis"
 !define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Bureau"
 !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Menu D�marrer"
@@ -52,9 +47,6 @@
 !define GTK_INSTALL_ERROR			"Erreur lors de l'installation des biblioth�ques GTK+"
 !define GTK_BAD_INSTALL_PATH			"Le dossier d'installation ne peut pas �tre cr�� ou n'est pas accessible."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Vous n'avez pas les permissions pour installer un th�me GTK+."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"Le programme de d�sinstallation n'a pas retrouv� les entr�es de Pidgin dans la base de registres.$\rL'application a peut-�tre �t� install�e par un utilisateur diff�rent."
 !define un.PIDGIN_UNINSTALL_ERROR_2		"Vous n'avez pas les permissions pour supprimer cette application."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/galician.nsh
--- a/pidgin/win32/nsis/translations/galician.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/galician.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -18,11 +18,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Cliente de mensaxer�a instant�nea de Pidgin (necesario)"
 !define GTK_SECTION_TITLE			"Entorno de execuci�n de GTK+ (necesario)"
-!define GTK_THEMES_SECTION_TITLE		"Temas GTK+" 
-!define GTK_NOTHEME_SECTION_TITLE		"Sen tema"
-!define GTK_WIMP_SECTION_TITLE		"Tema Wimp"
-!define GTK_BLUECURVE_SECTION_TITLE		"Tema Bluecurve"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema Light House Blue"
 !define PIDGIN_SECTION_DESCRIPTION		"Ficheiros e dlls principais de Core"
 !define GTK_SECTION_DESCRIPTION		"Unha suite de ferramentas GUI multiplataforma, utilizada por Pidgin"
 
@@ -40,9 +35,6 @@
 !define GTK_INSTALL_ERROR			"Erro ao instalar o executable GTK+."
 !define GTK_BAD_INSTALL_PATH			"Non se puido acceder ou crear a ruta que vd. indicou."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Non ten permisos para instalar un tema GTK+."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1         "O desinstalador non puido atopar as entradas no rexistro de Pidgin.$\r� probable que outro usuario instalara a aplicaci�n."
 !define un.PIDGIN_UNINSTALL_ERROR_2         "Non ten permisos para desinstalar esta aplicaci�n."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/german.nsh
--- a/pidgin/win32/nsis/translations/german.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/german.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -21,11 +21,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Pidgin Instant Messaging Client (erforderlich)"
 !define GTK_SECTION_TITLE			"GTK+ Runtime Umgebung (erforderlich)"
-!define GTK_THEMES_SECTION_TITLE		"GTK+ Themen"
-!define GTK_NOTHEME_SECTION_TITLE		"Kein Thema"
-!define GTK_WIMP_SECTION_TITLE		"Wimp Thema"
-!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve Thema"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue Thema"
 !define PIDGIN_SHORTCUTS_SECTION_TITLE	"Verkn�pfungen"
 !define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Desktop"
 !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Startmen�"
@@ -48,9 +43,6 @@
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Fehler beim Installieren der GTK+ Runtime."
 !define GTK_BAD_INSTALL_PATH			"Der Pfad, den Sie eingegeben haben, existiert nicht und kann nicht erstellt werden."
- 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Sie haben keine Berechtigung, ein GTK+ Thema zu installieren."
 
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"Der Deinstaller konnte keine Registrierungsschl�ssel f�r Pidgin finden.$\rEs ist wahrscheinlich, da� ein anderer Benutzer diese Anwendung installiert hat."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/hebrew.nsh
--- a/pidgin/win32/nsis/translations/hebrew.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/hebrew.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -18,11 +18,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"(����) .Pidgin �����"
 !define GTK_SECTION_TITLE			"(����) .GTK+ �����"
-!define GTK_THEMES_SECTION_TITLE		"GTK+ ����� ��"
-!define GTK_NOTHEME_SECTION_TITLE		"��� ����"
-!define GTK_WIMP_SECTION_TITLE		"Wimp ����"
-!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve ����"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue ����"
 !define PIDGIN_SECTION_DESCRIPTION		".������� DLL-� Pidgin ����"
 !define GTK_SECTION_DESCRIPTION		".�����-���������� GUI ���"
 
@@ -39,9 +34,6 @@
 !define GTK_INSTALL_ERROR			".GTK+ ����� ������ �����"
 !define GTK_BAD_INSTALL_PATH			".������ ������ �� ���� �������"
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		".GTK+ ��� �� ���� ������ ���� ��"
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		".GTK+ ������ �� ���� �� �������� ��$\r.���� ����� ������� ��� ����� �� ������ ����"
 !define un.PIDGIN_UNINSTALL_ERROR_2		".��� �� ���� ����� ����� ���"
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/hungarian.nsh
--- a/pidgin/win32/nsis/translations/hungarian.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/hungarian.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -20,11 +20,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Pidgin azonnali �zen� kliens (sz�ks�ges)"
 !define GTK_SECTION_TITLE			"GTK+ futtat� k�rnyezet (sz�ks�ges)"
-!define GTK_THEMES_SECTION_TITLE		"GTK+ t�m�k"
-!define GTK_NOTHEME_SECTION_TITLE		"Nincs t�ma"
-!define GTK_WIMP_SECTION_TITLE			"Wimp t�ma"
-!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve t�ma"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue t�ma"
 !define PIDGIN_SHORTCUTS_SECTION_TITLE		"Parancsikonok"
 !define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Asztal"
 !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Start Men�"
@@ -51,9 +46,6 @@
 !define GTK_INSTALL_ERROR			"Hiba a GTK+ futtat�k�rnyezet telep�t�se k�zben."
 !define GTK_BAD_INSTALL_PATH			"A megadott el�r�si �t nem �rhet� el, vagy nem hozhat� l�tre."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Nincs jogosults�ga a GTK+ t�m�k telep�t�s�hez."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"Az elt�vol�t� nem tal�lta a Pidgin registry bejegyz�seket.$\rVal�sz�n�leg egy m�sik felhaszn�l� telep�tette az alkalmaz�st."
 !define un.PIDGIN_UNINSTALL_ERROR_2		"Nincs jogosults�ga az alkalmaz�s elt�vol�t�s�hoz."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/italian.nsh
--- a/pidgin/win32/nsis/translations/italian.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/italian.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -18,11 +18,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Pidgin - Client per Messaggi Immediati (richiesto)"
 !define GTK_SECTION_TITLE			"Ambiente di Runtime GTK+ (richiesto)"
-!define GTK_THEMES_SECTION_TITLE		"Temi GTK+"
-!define GTK_NOTHEME_SECTION_TITLE		"Nessun Tema"
-!define GTK_WIMP_SECTION_TITLE		"Tema Wimp"
-!define GTK_BLUECURVE_SECTION_TITLE		"Tema Bluecurve"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema Light House Blue"
 !define PIDGIN_SECTION_DESCRIPTION		"File principali di Pidgin e dll"
 !define GTK_SECTION_DESCRIPTION		"Un toolkit multipiattaforma per interfacce grafiche, usato da Pidgin"
 
@@ -39,9 +34,6 @@
 !define GTK_INSTALL_ERROR			"Errore di installazione di GTK+."
 !define GTK_BAD_INSTALL_PATH			"Il percorso scelto non pu� essere raggiunto o creato."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Non hai il permesso per installare un tema GTK+."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1         "Il programma di rimozione non � in grado di trovare le voci di registro per Pidgin.$\rProbabilmente un altro utente ha installato questa applicazione."
 !define un.PIDGIN_UNINSTALL_ERROR_2         "Non hai il permesso per rimuovere questa applicazione."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/japanese.nsh
--- a/pidgin/win32/nsis/translations/japanese.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/japanese.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -21,11 +21,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Pidgin�C���X�^���g���b�Z���W�� (�K�{)"
 !define GTK_SECTION_TITLE			"GTK+ Runtime Environment (�K�{)"
-!define GTK_THEMES_SECTION_TITLE		"GTK+�̃e�[�}"
-!define GTK_NOTHEME_SECTION_TITLE		"�e�[�}�Ȃ�"
-!define GTK_WIMP_SECTION_TITLE			"Wimp�e�[�}"
-!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve�e�[�}"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue�e�[�}"
 !define PIDGIN_SHORTCUTS_SECTION_TITLE		"�V���[�g�J�b�g"
 !define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"�f�X�N�g�b�v"
 !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"�X�^�[�g�A�b�v"
@@ -50,9 +45,6 @@
 !define GTK_INSTALL_ERROR			"GTK+�����^�C���̃C���X�g�[���ŃG���[���������܂����B"
 !define GTK_BAD_INSTALL_PATH			"���Ȃ��̓��͂����p�X�ɃA�N�Z�X�܂��͍쐬�ł��܂���B"
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"���Ȃ���GTK+�̃e�[�}���C���X�g�[�����錠���������Ă��܂���B"
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"�A���C���X�g�[����Pidgin�̃��W�X�g���G���g���𔭌��ł��܂���ł����B$\r�����炭�ʂ̃��[�U�ɃC���X�g�[�����ꂽ�ł��傤�B"
 !define un.PIDGIN_UNINSTALL_ERROR_2		"���Ȃ��͂��̃A�v���P�[�V�������A���C���X�g�[�����錠���������Ă��܂���B"
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/korean.nsh
--- a/pidgin/win32/nsis/translations/korean.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/korean.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -13,11 +13,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"���� �޽��� (�ʼ�)"
 !define GTK_SECTION_TITLE			"GTK+ ��Ÿ�� ȯ�� (�ʼ�)"
-!define GTK_THEMES_SECTION_TITLE		"GTK+ �׸�"
-!define GTK_NOTHEME_SECTION_TITLE		"�׸� ����"
-!define GTK_WIMP_SECTION_TITLE		"���� �׸�"
-!define GTK_BLUECURVE_SECTION_TITLE		"����Ŀ�� �׸�"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue �׸�"
 !define PIDGIN_SECTION_DESCRIPTION		"������ �ھ� ���ϰ� dll"
 !define GTK_SECTION_DESCRIPTION		"������ ����ϴ� ��Ƽ �÷��� GUI ��Ŷ"
 
@@ -31,9 +26,6 @@
 !define GTK_INSTALL_ERROR			"GTK+ ��Ÿ�� ��ġ �� ���� �߻�."
 !define GTK_BAD_INSTALL_PATH			"�Է��Ͻ� ��ο� ������ �� ���ų� ���� �� �������ϴ�."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"GTK+ �׸��� ��ġ�� ������ �����ϴ�."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1         "���ν��緯�� ������ ������Ʈ�� ��Ʈ���� ã�� �� �����ϴ�.$\r�� ���α׷��� �ٸ� ���� �������� ��ġ�� �� �����ϴ�."
 !define un.PIDGIN_UNINSTALL_ERROR_2         "�� ���α׷��� ������ �� �ִ� ������ �����ϴ�."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/kurdish.nsh
--- a/pidgin/win32/nsis/translations/kurdish.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/kurdish.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -21,11 +21,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Pidgin Instant Messaging Client (p�w�st)"
 !define GTK_SECTION_TITLE			"GTK+ Runtime Environment (p�w�st)"
-!define GTK_THEMES_SECTION_TITLE		"Dirb�n GTK+"
-!define GTK_NOTHEME_SECTION_TITLE		"Dirb tunebe"
-!define GTK_WIMP_SECTION_TITLE		"Dirb� Wimp"
-!define GTK_BLUECURVE_SECTION_TITLE	"Dirb� Bluecurve"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Dirb� Light House Blue"
 !define PIDGIN_SHORTCUTS_SECTION_TITLE "Riy�n kin"
 !define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "Sermas�"
 !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Menuya destp�k�"
@@ -49,9 +44,6 @@
 !define GTK_INSTALL_ERROR			"Di sazkirina GTK+ de �ewt� derket."
 !define GTK_BAD_INSTALL_PATH			"r�ya te niv�sand nay� gihi�tin an afirandin."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS	"Dest�ra sazkirina dirbek� GTK+ tune."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"Raker t�ketiy�n registry y�n Pidgin ned�t. $\rQey bikarh�nereke din v� bername saz kir."
 !define un.PIDGIN_UNINSTALL_ERROR_2		"Dest�ra te ji bo rakirina v� bernamey� tune."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/lithuanian.nsh
--- a/pidgin/win32/nsis/translations/lithuanian.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/lithuanian.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -18,11 +18,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Pidgin pokalbi� klientas (b�tinas)"
 !define GTK_SECTION_TITLE			"GTK+ vykdymo meto aplinka (b�tina)"
-!define GTK_THEMES_SECTION_TITLE		"GTK+ apipavidalinimai"
-!define GTK_NOTHEME_SECTION_TITLE		"Jokio apipavidalinimo"
-!define GTK_WIMP_SECTION_TITLE			"Wimp apipavidalinimas"
-!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve apipavidalinimas"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue apipavidalinimas"
 !define PIDGIN_SHORTCUTS_SECTION_TITLE		"Nuorodos"
 !define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Darbalaukyje"
 !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Pradiniame meniu"
@@ -46,9 +41,6 @@
 !define GTK_INSTALL_ERROR			"GTK+ vykdymo meto aplinkos diegimo klaida."
 !define GTK_BAD_INSTALL_PATH			"J�s� nurodytas katalogas neprieinamas ar negali b�ti sukurtas."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Neturite teisi� �diegti GTK+ apipavidalinim�."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"�alinimo programa nerado Pidgin registro �ra��.$\rGalb�t kitas vartotojas instaliavo �i� program�."
 !define un.PIDGIN_UNINSTALL_ERROR_2		"Neturite teisi� pa�alinti �ios programos."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/norwegian.nsh
--- a/pidgin/win32/nsis/translations/norwegian.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/norwegian.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -20,11 +20,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Pidgin Hurtigmeldingsklient (obligatorisk)"
 !define GTK_SECTION_TITLE			"GTK+ Runtime Environment (obligatorisk)"
-!define GTK_THEMES_SECTION_TITLE		"GTK+ Tema"
-!define GTK_NOTHEME_SECTION_TITLE		"Ingen tema"
-!define GTK_WIMP_SECTION_TITLE			"Wimp-tema"
-!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve-tema"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue-tema"
 !define PIDGIN_SHORTCUTS_SECTION_TITLE		"Snarveier"
 !define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Skrivebord"
 !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Startmeny"
@@ -48,9 +43,6 @@
 !define GTK_INSTALL_ERROR			"En feil oppstod ved installering av GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Stien du oppga kan ikke aksesseres eller lages."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Du har ikke rettigheter til � installere et GTK+ tema."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"Avinstalleringsprogrammet kunne ikke finne noen registeroppf�ring for Pidgin.$\rTrolig har en annen bruker avinstallert denne applikasjonen."
 !define un.PIDGIN_UNINSTALL_ERROR_2		"Du har ikke rettigheter til � avinstallere denne applikasjonen."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/polish.nsh
--- a/pidgin/win32/nsis/translations/polish.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/polish.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -18,11 +18,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Wymagany jest Pidgin Instant Messaging Client"
 !define GTK_SECTION_TITLE			"Wymagany jest runtime �rodowiska GTK+"
-!define GTK_THEMES_SECTION_TITLE		"Temat GTK+"
-!define GTK_NOTHEME_SECTION_TITLE		"Brak temat�w"
-!define GTK_WIMP_SECTION_TITLE		"Temat Wimp"
-!define GTK_BLUECURVE_SECTION_TITLE		"Temat Bluecurve "
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Temat Light House Blue"
 !define PIDGIN_SECTION_DESCRIPTION		"Zbiory Core Pidgin oraz dll"
 !define GTK_SECTION_DESCRIPTION		"Wieloplatformowe narz�dzie GUI, u�ywane w Pidgin"
 
@@ -39,9 +34,6 @@
 !define GTK_INSTALL_ERROR			"B��d instalacji runtime-a GTK+."
 !define GTK_BAD_INSTALL_PATH			"Nie ma dost�pu do wybranej �cie�ki / �aty."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Nie masz uprawnie� do zainstalowania tematu GTK+."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"Deinstalator nie mo�e znale�� rejestr�w dla Pidgin.$\r Wskazuje to na to, �e instalacj� przeprowadzi� inny u�ytkownik."
 !define un.PIDGIN_UNINSTALL_ERROR_2		"Nie masz uprawnie� do deinstalacji tej aplikacji."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/portuguese-br.nsh
--- a/pidgin/win32/nsis/translations/portuguese-br.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/portuguese-br.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -18,11 +18,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Cliente de mensagens instant�neas Pidgin (requerido)"
 !define GTK_SECTION_TITLE			"Ambiente de tempo de execu��o do GTK+ (requerido)"
-!define GTK_THEMES_SECTION_TITLE		"Temas do GTK+"
-!define GTK_NOTHEME_SECTION_TITLE		"Nenhum tema"
-!define GTK_WIMP_SECTION_TITLE		"Tema 'Wimp'"
-!define GTK_BLUECURVE_SECTION_TITLE		"Tema 'Bluecurve'"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema 'Light House Blue'"
 !define PIDGIN_SHORTCUTS_SECTION_TITLE "Atalhos"
 !define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "�rea de Trabalho"
 !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Menu Iniciar"
@@ -43,9 +38,6 @@
 !define GTK_INSTALL_ERROR			"Erro ao instalar o ambiente de tempo de execu��o do GTK+."
 !define GTK_BAD_INSTALL_PATH			"O caminho que voc� digitou n�o p�de ser acessado ou criado."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Voc� n�o tem permiss�o para instalar um tema do GTK+."
-
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Visite a p�gina da web do Pidgin para Windows"
 
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/portuguese.nsh
--- a/pidgin/win32/nsis/translations/portuguese.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/portuguese.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -20,11 +20,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Cliente de Mensagens Instant�neas Pidgin (obrigat�rio)"
 !define GTK_SECTION_TITLE			"Ambiente de Execu��o GTK+ (obrigat�rio)"
-!define GTK_THEMES_SECTION_TITLE		"Temas do GTK+"
-!define GTK_NOTHEME_SECTION_TITLE		"Nenhum tema"
-!define GTK_WIMP_SECTION_TITLE		"Tema Wimp"
-!define GTK_BLUECURVE_SECTION_TITLE		"Tema Bluecurve"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema Light House Blue"
 !define PIDGIN_SHORTCUTS_SECTION_TITLE "Atalhos"
 !define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "Ambiente de Trabalho"
 !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Menu de Iniciar"
@@ -48,9 +43,6 @@
 !define GTK_INSTALL_ERROR			"Erro ao instalar o ambiente de execu��o GTK+."
 !define GTK_BAD_INSTALL_PATH			"O caminho que digitou n�o pode ser acedido nem criado."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS	"N�o tem permiss�o para instalar um tema do GTK+."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"O desinstalador n�o encontrou entradas de registo do Pidgin.$\r� prov�vel que outro utilizador tenha instalado este programa."
 !define un.PIDGIN_UNINSTALL_ERROR_2		"N�o tem permiss�o para desinstalar este programa."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/romanian.nsh
--- a/pidgin/win32/nsis/translations/romanian.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/romanian.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -19,11 +19,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Client de mesagerie instant (obligatoriu)"
 !define GTK_SECTION_TITLE			"Mediu GTK+ (obligatoriu)"
-!define GTK_THEMES_SECTION_TITLE		"Teme GTK+"
-!define GTK_NOTHEME_SECTION_TITLE		"F�r� teme"
-!define GTK_WIMP_SECTION_TITLE		"Tem� Wimp"
-!define GTK_BLUECURVE_SECTION_TITLE		"Tem� Bluecurve"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tem� Light House Blue"
 !define PIDGIN_SHORTCUTS_SECTION_TITLE "Scurt�turi"
 !define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "Desktop"
 !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Meniu Start"
@@ -47,9 +42,6 @@
 !define GTK_INSTALL_ERROR			"Eroare la instalarea mediului GTK+."
 !define GTK_BAD_INSTALL_PATH			"Directorul specificat nu poate fi accesat sau creat."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Nu ave�i drepturile de acces necesare instal�rii unei teme GTK+."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1         "Programul de dezinstalare nu a g�sit intr�ri Pidgin �n regi�tri.$\rProbabil un alt utilizator a instalat aceast� aplica�ie."
 !define un.PIDGIN_UNINSTALL_ERROR_2         "Nu ave�i drepturile de acces necesare dezinstal�rii acestei aplica�ii."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/russian.nsh
--- a/pidgin/win32/nsis/translations/russian.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/russian.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -18,11 +18,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Pidgin - ������ ��� ����������� ������ ����������� �� ��������� ���������� (����������)."
 !define GTK_SECTION_TITLE			"GTK+ ��������� ��� ������� (����������)."
-!define GTK_THEMES_SECTION_TITLE		"���� ��� GTK+."
-!define GTK_NOTHEME_SECTION_TITLE		"��� ����."
-!define GTK_WIMP_SECTION_TITLE		"���� 'Wimp Theme'"
-!define GTK_BLUECURVE_SECTION_TITLE		"���� 'Bluecurve'."
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"���� 'Light House Blue'."
 !define PIDGIN_SECTION_DESCRIPTION		"�������� ����� Pidgin � ����������."
 !define GTK_SECTION_DESCRIPTION		"������������������� ����������� ��������������, ������������ Pidgin."
 
@@ -39,9 +34,6 @@
 !define GTK_INSTALL_ERROR			"������ ��� ��������� ��������� GTK+."
 !define GTK_BAD_INSTALL_PATH			"���� ������� �� ����� ���������� ��� �� ����������."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"� ��� ��� ���� �� ������������ ���� ��� GTK+."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"��������� �������� �� ����� ����� ������ Pidgin � ��������..$\r�������� ��� ���������� ��������� ������ ������������."
 !define un.PIDGIN_UNINSTALL_ERROR_2		"� ��� ��� ���� �� �������� ����� ����������."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/serbian-latin.nsh
--- a/pidgin/win32/nsis/translations/serbian-latin.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/serbian-latin.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -13,11 +13,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Pidgin klijent za brze poruke (neophodno)"
 !define GTK_SECTION_TITLE			"GTK+ okolina za izvr�avanje (neophodno)"
-!define GTK_THEMES_SECTION_TITLE		"GTK+ teme"
-!define GTK_NOTHEME_SECTION_TITLE		"Bez teme"
-!define GTK_WIMP_SECTION_TITLE		"Wimp tema"
-!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve tema"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue tema"
 !define PIDGIN_SECTION_DESCRIPTION		"Osnovne Pidgin datoteke i dinami�ke biblioteke"
 !define GTK_SECTION_DESCRIPTION		"Skup oru�a za grafi�ko okru�enje, za vi�e platformi, koristi ga Pidgin "
 
@@ -31,9 +26,6 @@
 !define GTK_INSTALL_ERROR			"Gre�ka prilikom instalacije GTK+ okoline za izvr�avanje."
 !define GTK_BAD_INSTALL_PATH			"Putanja koju ste naveli se ne mo�e ni napraviti niti joj se mo�e pri�i."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Nemate ovla��enja za instalaciju GTK+ teme."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1         "Program za uklanjanje instalacije ne mo�e da prona�e stavke registra za Pidgin.$\rVerovatno je ovu aplikaciju instalirao drugi korisnik."
 !define un.PIDGIN_UNINSTALL_ERROR_2         "Nemate ovla��enja za deinstalaciju ove aplikacije."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/simp-chinese.nsh
--- a/pidgin/win32/nsis/translations/simp-chinese.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/simp-chinese.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -20,11 +20,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Pidgin ��ʱͨѶ����(����)"
 !define GTK_SECTION_TITLE			"GTK+ ����ʱ�̻���(����)"
-!define GTK_THEMES_SECTION_TITLE		"GTK+ ����"
-!define GTK_NOTHEME_SECTION_TITLE		"������"
-!define GTK_WIMP_SECTION_TITLE		"Wimp ����"
-!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve ����"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue ����"
 !define PIDGIN_SHORTCUTS_SECTION_TITLE "��ݷ�ʽ"
 !define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "����"
 !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "��ʼ�˵�"
@@ -48,9 +43,6 @@
 !define GTK_INSTALL_ERROR			"��װ GTK+ ����ʱ��ʧ�ܡ�"
 !define GTK_BAD_INSTALL_PATH			"�޷����ʻ򴴽��������·����"
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"��û��Ȩ�ް�װ GTK+ ���⡣"
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1         "ж�س����Ҳ��� Pidgin ��ע�����Ŀ��$\r������������û���װ�˴˳���"
 !define un.PIDGIN_UNINSTALL_ERROR_2         "��û��Ȩ��ж�ش˳���"
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/slovak.nsh
--- a/pidgin/win32/nsis/translations/slovak.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/slovak.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -20,11 +20,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Pidgin Instant Messaging Klient (nevyhnutn�)"
 !define GTK_SECTION_TITLE			"GTK+ Runtime prostredie (nevyhnutn�)"
-!define GTK_THEMES_SECTION_TITLE		"GTK+ t�my"
-!define GTK_NOTHEME_SECTION_TITLE		"�iadna grafick� t�ma"
-!define GTK_WIMP_SECTION_TITLE			"Wimp grafick� t�ma"
-!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve grafick� t�ma"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue grafick� t�ma"
 !define PIDGIN_SHORTCUTS_SECTION_TITLE		"Z�stupcovia"
 !define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Plocha"
 !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"�tart Menu"
@@ -48,9 +43,6 @@
 !define GTK_INSTALL_ERROR			"Chyba pri in�tal�cii GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Zadan� cesta nie je pr�stupn� alebo ju nie je mo�n� vytvori�."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Nem�te opr�vnenie na in�tal�ciu GTK+ grafickej t�my."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"In�tal�toru sa nepodarilo n�js� polo�ky v registri pre Pidgin.$\rJe mo�n�, �e t�to aplik�ciu nain�taloval in� pou��vate�."
 !define un.PIDGIN_UNINSTALL_ERROR_2		"Nem�te opr�vnenie na odin�tal�ciu tejto aplik�cie."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/slovenian.nsh
--- a/pidgin/win32/nsis/translations/slovenian.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/slovenian.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -20,11 +20,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Pidgin - odjemalec za klepet (zahtevano)"
 !define GTK_SECTION_TITLE			"GTK+ izvajalno okolje (zahtevano)"
-!define GTK_THEMES_SECTION_TITLE		"Teme GTK+"
-!define GTK_NOTHEME_SECTION_TITLE		"Brez teme"
-!define GTK_WIMP_SECTION_TITLE			"Tema Wimp"
-!define GTK_BLUECURVE_SECTION_TITLE		"Tema Bluecurve"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema Light House Blue"
 !define PIDGIN_SHORTCUTS_SECTION_TITLE		"Bli�njice"
 !define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Namizje"
 !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Za�etni meni"
@@ -48,9 +43,6 @@
 !define GTK_INSTALL_ERROR			"Napaka pri namestitvi izvajalnega okolja GTK+."
 !define GTK_BAD_INSTALL_PATH			"Pot, ki ste jo vnesli, ni dosegljiva ali je ni mogo�e ustvariti."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Za namestitev teme GTK+ nimate ustreznih pravic."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"Vnosov za Pidgin v registru ni mogo�e najti.$\rNajverjetneje je ta program namestil drug uporabnik."
 !define un.PIDGIN_UNINSTALL_ERROR_2		"Za odstranitev programa nimate ustreznih pravic."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/spanish.nsh
--- a/pidgin/win32/nsis/translations/spanish.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/spanish.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -18,11 +18,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Cliente de mensajer�a instant�nea de Pidgin (necesario)"
 !define GTK_SECTION_TITLE			"Entorno de ejecuci�n de GTK+ (necesario)"
-!define GTK_THEMES_SECTION_TITLE		"Temas GTK+" 
-!define GTK_NOTHEME_SECTION_TITLE		"Sin tema"
-!define GTK_WIMP_SECTION_TITLE		"Tema Wimp"
-!define GTK_BLUECURVE_SECTION_TITLE		"Tema Bluecurve"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema Light House Blue"
 !define PIDGIN_SECTION_DESCRIPTION		"Ficheros y dlls principales de Core"
 !define GTK_SECTION_DESCRIPTION		"Una suite de herramientas GUI multiplataforma, utilizada por Pidgin"
 
@@ -39,9 +34,6 @@
 !define GTK_INSTALL_ERROR			"Error al instalar el ejecutable GTK+."
 !define GTK_BAD_INSTALL_PATH			"No se pudo acceder o crear la ruta que vd. indic�."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"No tiene permisos para instalar un tema GTK+."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1         "El desinstalador no pudo encontrar las entradas en el registro de Pidgin.$\rEs probable que otro usuario instalara la aplicaci�n."
 !define un.PIDGIN_UNINSTALL_ERROR_2         "No tiene permisos para desinstalar esta aplicaci�n."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/swedish.nsh
--- a/pidgin/win32/nsis/translations/swedish.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/swedish.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -23,11 +23,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Pidgin Snabbmeddelandeklient (obligatorisk)"
 !define GTK_SECTION_TITLE			"GTK+-k�rmilj� (obligatorisk)"
-!define GTK_THEMES_SECTION_TITLE		"GTK+-teman"
-!define GTK_NOTHEME_SECTION_TITLE		"Inget tema"
-!define GTK_WIMP_SECTION_TITLE		"Wimp-tema"
-!define GTK_BLUECURVE_SECTION_TITLE	"Bluecurve-tema"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue-tema"
 !define PIDGIN_SHORTCUTS_SECTION_TITLE "Genv�gar"
 !define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "Skrivbord"
 !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Startmeny"
@@ -51,9 +46,6 @@
 !define GTK_INSTALL_ERROR			"Fel vid installation av GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Den s�kv�g du angivit g�r inte att komma �t eller skapa."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Du har inte r�ttigheter att installera ett GTK+tema."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1         "Avinstalleraren kunde inte hitta registerv�rden f�r Pidgin.$\rAntagligen har en annan anv�ndare installerat applikationen."
 !define un.PIDGIN_UNINSTALL_ERROR_2         "Du har inte r�ttigheter att avinstallera den h�r applikationen."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/trad-chinese.nsh
--- a/pidgin/win32/nsis/translations/trad-chinese.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/trad-chinese.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -22,11 +22,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Pidgin �D�{�� (����)"
 !define GTK_SECTION_TITLE			"GTK+ �������� (����)"
-!define GTK_THEMES_SECTION_TITLE		"GTK+ �G���D�D"
-!define GTK_NOTHEME_SECTION_TITLE		"���w�˧G���D�D"
-!define GTK_WIMP_SECTION_TITLE			"Wimp �G���D�D"
-!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve �G���D�D"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue �G���D�D"
 !define PIDGIN_SHORTCUTS_SECTION_TITLE		"���|"
 !define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"�ୱ���|"
 !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "�}�l�\���"
@@ -50,9 +45,6 @@
 !define GTK_INSTALL_ERROR			"�w�� GTK+ �������Үɵo�Ϳ��~�C"
 !define GTK_BAD_INSTALL_PATH			"�z�ҿ�J���w�˥ؿ��L�k�s���ΫإߡC"
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"�z�ثe���v���L�k�w�� GTK+ �G���D�D�C"
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"�����{���L�k��� Pidgin ���w�˸�T�C$\r�o���ӬO����L���ϥΪ̭��s�w�ˤF�o�ӵ{���C"
 !define un.PIDGIN_UNINSTALL_ERROR_2		"�z�ثe���v���L�k���� Pidgin �C"
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/valencian.nsh
--- a/pidgin/win32/nsis/translations/valencian.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/valencian.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -23,11 +23,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Client Mensageria Instantanea Pidgin (necessari)"
 !define GTK_SECTION_TITLE			"Entorn d'Eixecucio GTK+ (necessari)"
-!define GTK_THEMES_SECTION_TITLE		"Temes GTK+"
-!define GTK_NOTHEME_SECTION_TITLE		"Sense Tema"
-!define GTK_WIMP_SECTION_TITLE			"Tema Wimp"
-!define GTK_BLUECURVE_SECTION_TITLE		"Tema Bluecurve"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema Light House Blue"
 !define PIDGIN_SHORTCUTS_SECTION_TITLE 		"Enlla�os directes"
 !define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE 	"Escritori"
 !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE 	"Menu d'Inici"
@@ -51,9 +46,6 @@
 !define GTK_INSTALL_ERROR			"Erro instalant l'entorn GTK+."
 !define GTK_BAD_INSTALL_PATH			"La ruta introduida no pot ser accedida o creada."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"No tens permissos per a instalar un tema GTK+."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"El desinstalador podria no trobar les entrades del registre de Pidgin.$\rProbablement un atre usuari instal� esta aplicacio."
 !define un.PIDGIN_UNINSTALL_ERROR_2		"No tens permis per a desinstalar esta aplicacio."
diff -r 5ad28c23e899 -r 992da01baad1 pidgin/win32/nsis/translations/vietnamese.nsh
--- a/pidgin/win32/nsis/translations/vietnamese.nsh	Fri Apr 27 05:20:10 2007 +0000
+++ b/pidgin/win32/nsis/translations/vietnamese.nsh	Sat Apr 28 02:00:48 2007 +0000
@@ -19,11 +19,6 @@
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Trình Khách Thông Điệp Tức Thời Pidgin (phải có)"
 !define GTK_SECTION_TITLE			"GTK+ Runtime Environment (phải có)"
-!define GTK_THEMES_SECTION_TITLE		"GTK+ Theme"
-!define GTK_NOTHEME_SECTION_TITLE		"Không có Theme"
-!define GTK_WIMP_SECTION_TITLE		"Wimp Theme"
-!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve Theme"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue Theme"
 !define PIDGIN_SECTION_DESCRIPTION		"Các tập tin Pidgin chính và dlls"
 !define GTK_SECTION_DESCRIPTION		"Bộ công cụ giao diện đồ họa đa nền để dùng cho Pidgin"
 
@@ -40,9 +35,6 @@
 !define GTK_INSTALL_ERROR			"Lỗi cài đặt GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Đường dẫn mà bạn nhập có thể không truy cập được hay không tạo được."
 
-; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Bạn không có quyền hạn để cài đặt GTK+ theme."
-
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"Trình gỡ cài đặt không tìm được các  registry entry cho Pidgin.$\rCó thể là chương trình được người dùng khác cài đặt."
 !define un.PIDGIN_UNINSTALL_ERROR_2		"Bạn không có quyền hạn để gỡ bỏ chương trình này."