im.pidgin.pidgin: a9d1791990e2f5cc03fd7e1c4b0fe15710d5ce02

[seanegan at pidgin.im]

-----------------------------------------------------------------
Revision: a9d1791990e2f5cc03fd7e1c4b0fe15710d5ce02
Ancestor: 541a0e3980189093a325ec6d71224176b7f2ab5d
Author: seanegan at pidgin.im
Date: 2007-11-27T09:17:38
Branch: im.pidgin.pidgin

Modified files:
        pidgin/gtkblist.c

ChangeLog: 

Having a long sentence as a title is a bit overly-bold, and I really want this dialog to say 'Welcome back'

-------------- next part --------------
============================================================
--- pidgin/gtkblist.c	7c9c24db131c1e753145ba61a6ae32e5c7eacd5b
+++ pidgin/gtkblist.c	32115bb67b6ad7c3e7cbf38ce76c03cc0f28c16e
@@ -4601,14 +4601,6 @@ static void
 }
 
 static void
-ignore_elsewhere_accounts(PidginMiniDialog *mini_dialog,
-                          GtkButton *button,
-                          gpointer unused)
-{
-	elsewhere_foreach_account(mini_dialog, purple_account_clear_current_error);
-}
-
-static void
 ensure_signed_on_elsewhere_minidialog(PidginBuddyList *gtkblist)
 {
 	PidginBuddyListPrivate *priv = PIDGIN_BUDDY_LIST_GET_PRIVATE(gtkblist);
@@ -4618,14 +4610,11 @@ ensure_signed_on_elsewhere_minidialog(Pi
 		return;
 
 	mini_dialog = priv->signed_on_elsewhere =
-		pidgin_mini_dialog_new(NULL, NULL, PIDGIN_STOCK_DISCONNECT);
+		pidgin_mini_dialog_new(_("Welcome back!"), NULL, PIDGIN_STOCK_DISCONNECT);
 
 	pidgin_mini_dialog_add_button(mini_dialog, _("Re-enable"),
 		reconnect_elsewhere_accounts, NULL);
 
-	pidgin_mini_dialog_add_button(mini_dialog, _("Ignore"),
-		ignore_elsewhere_accounts, NULL);
-
 	add_error_dialog(gtkblist, GTK_WIDGET(mini_dialog));
 
 	/* Set priv->signed_on_elsewhere to NULL when the dialog is destroyed */
@@ -4651,11 +4640,11 @@ update_signed_on_elsewhere_minidialog_ti
 	}
 
 	title = g_strdup_printf(
-		ngettext("%d account was disabled because you signed on from another location.",
-			 "%d accounts were disabled because you signed on from another location.",
+		ngettext("%d account was disabled because you signed on from another location:",
+			 "%d accounts were disabled because you signed on from another location:",
 			 accounts),
 		accounts);
-	pidgin_mini_dialog_set_title(mini_dialog, title);
+	pidgin_mini_dialog_set_description(mini_dialog, title);
 	g_free(title);
 }