pidgin.next.minor: b6c989d9: Use the shortcut in the error message to...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: b6c989d9eb369844aa080313f725fddb494b4445
Ancestor: f6e185858acb0eac38c571f6174af78b4da01022
Author: markdoliner at pidgin.im
Date: 2009-01-25T23:23:04
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/b6c989d9eb369844aa080313f725fddb494b4445

Modified files:
        pidgin/gtksmiley.c

ChangeLog: 

Use the shortcut in the error message to give people more context

-------------- next part --------------
============================================================
--- pidgin/gtksmiley.c	c06beca655fb2df5a75ea9484c047cc8c9963f1a
+++ pidgin/gtksmiley.c	6b6e933b609898aaa7fb927440344dd0b7a754dd
@@ -233,9 +233,12 @@ static void do_add(GtkWidget *widget, Pi
 
 	emoticon = purple_smileys_find_by_shortcut(entry);
 	if (emoticon && emoticon != s->smiley) {
+		gchar *msg;
+		msg = g_strdup_printf(_("A custom smiley for '%s' already exists.  "
+				"Please use a different shortcut."), entry);
 		purple_notify_error(s->parent, _("Custom Smiley"),
-				_("Duplicate Shortcut"),
-				_("A custom smiley for the selected shortcut already exists. Please specify a different shortcut."));
+				_("Duplicate Shortcut"), msg);
+		g_free(msg);
 		return;
 	}