# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1219788501 0
# Node ID 7071b52a0bf4986c37bc1fd91b9098b18fb06c98
# Parent  74bb1de0cfe2edda3f0a41808e56b10ba557c616# Parent  64a4069e504e419867774fb0f6e4391292898a44
merge of '3800c01dede1b6e3df0d6f637b4a865ff77e0efe'
     and 'f86c7d91d43d251c7c0b224acfeeb534046f93d4'

diff -r 74bb1de0cfe2 -r 7071b52a0bf4 pidgin/gtksmiley.c
--- a/pidgin/gtksmiley.c	Tue Aug 26 20:42:52 2008 +0000
+++ b/pidgin/gtksmiley.c	Tue Aug 26 22:08:21 2008 +0000
@@ -224,6 +224,13 @@
 	PurpleSmiley *emoticon;
 
 	entry = gtk_entry_get_text(GTK_ENTRY(s->smile));
+	if (!entry || !*entry) {
+		purple_notify_error(s->parent, _("Custom Smiley"),
+				_("More Data needed"),
+				_("Please provide a shortcut to associate with the smiley."));
+		return;
+	}
+
 	emoticon = purple_smileys_find_by_shortcut(entry);
 	if (emoticon && emoticon != s->smiley) {
 		purple_notify_error(s->parent, _("Custom Smiley"),
@@ -346,7 +353,7 @@
 	window = gtk_dialog_new_with_buttons(smiley ? _("Edit Smiley") : _("Add Smiley"),
 			widget ? GTK_WINDOW(widget) : NULL,
 			GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
-			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,							 
+			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 			smiley ? GTK_STOCK_SAVE : GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT,
 			NULL);
 	s->parent = window;