# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1222923551 0
# Node ID a7e1edeb3ac6d928cb6e2904e2871e4eaeec5f86
# Parent  3a5ae157b730626962ab89888c10cd2887226398# Parent  40d03c5388ad21a3ce94b2494b69200264e31c98
merge of '791f3e070376e218af0a5c33695979827bbda747'
     and 'f9c75197f0a1451c4c5cc375d37cc5aa441c82a8'

diff -r 3a5ae157b730 -r a7e1edeb3ac6 libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c	Thu Oct 02 01:02:44 2008 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Thu Oct 02 04:59:11 2008 +0000
@@ -131,6 +131,9 @@
 			}
 			if((my_jb = jabber_buddy_find(js, full_jid, TRUE)))
 				my_jb->subscription |= JABBER_SUB_BOTH;
+
+			purple_connection_set_display_name(js->gc, full_jid);
+
 			g_free(full_jid);
 		}
 	} else {
diff -r 3a5ae157b730 -r a7e1edeb3ac6 pidgin/gtkaccount.c
--- a/pidgin/gtkaccount.c	Thu Oct 02 01:02:44 2008 +0000
+++ b/pidgin/gtkaccount.c	Thu Oct 02 04:59:11 2008 +0000
@@ -451,7 +451,8 @@
 	if (dialog->account != NULL)
 		username = g_strdup(purple_account_get_username(dialog->account));
 
-	if (!username && PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(dialog->prpl_info, get_account_text_table)) {
+	if (!username && dialog->prpl_info
+			&& PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(dialog->prpl_info, get_account_text_table)) {
 		GdkColor color = {0, 34952, 35466, 34181};
 		GHashTable *table;
 		const char *label;
diff -r 3a5ae157b730 -r a7e1edeb3ac6 pidgin/plugins/notify.c
--- a/pidgin/plugins/notify.c	Thu Oct 02 01:02:44 2008 +0000
+++ b/pidgin/plugins/notify.c	Thu Oct 02 04:59:11 2008 +0000
@@ -557,9 +557,7 @@
 static void
 handle_urgent(PidginWindow *win, gboolean set)
 {
-#ifndef _WIN32
 	pidgin_set_urgent(GTK_WINDOW(win->window), set);
-#endif
 }
 
 static void
@@ -767,12 +765,15 @@
 
 	/* Urgent method button */
 	toggle = gtk_check_button_new_with_mnemonic(_("Set window manager \"_URGENT\" hint"));
+#else
+	/* TODO: When we're not string frozen, mark for translation */
+	toggle = gtk_check_button_new_with_mnemonic("_Flash window");
+#endif
 	gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle),
 	                             purple_prefs_get_bool("/plugins/gtk/X11/notify/method_urgent"));
 	g_signal_connect(G_OBJECT(toggle), "toggled",
 	                 G_CALLBACK(method_toggle_cb), "method_urgent");
-#endif
 
 	/* Raise window method button */
 	toggle = gtk_check_button_new_with_mnemonic(_("R_aise conversation window"));
diff -r 3a5ae157b730 -r a7e1edeb3ac6 pidgin/win32/winpidgin.c
--- a/pidgin/win32/winpidgin.c	Thu Oct 02 01:02:44 2008 +0000
+++ b/pidgin/win32/winpidgin.c	Thu Oct 02 04:59:11 2008 +0000
@@ -212,6 +212,9 @@
 		return;
 	}
 
+	/* Set $HOME so that the GTK+ settings get stored in the right place */
+	_snprintf(path2, sizeof(path2), "HOME=%s", path);
+	_putenv(path2);
 
 	/* Set up the settings dir base to be \\path\to
 	 * The actual settings dir will be \\path\to\.purple */