changeset 23974:7071b52a0bf4

merge of '3800c01dede1b6e3df0d6f637b4a865ff77e0efe' and 'f86c7d91d43d251c7c0b224acfeeb534046f93d4'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Tue, 26 Aug 2008 22:08:21 +0000
parents 74bb1de0cfe2 (current diff) 64a4069e504e (diff)
children b789b54c5bb2
files pidgin/pixmaps/status/11/scalable/available.svg pidgin/pixmaps/status/11/scalable/away.svg pidgin/pixmaps/status/11/scalable/busy.svg pidgin/pixmaps/status/11/scalable/chat.svg pidgin/pixmaps/status/11/scalable/extended-away.svg pidgin/pixmaps/status/11/scalable/invisible.svg pidgin/pixmaps/status/11/scalable/offline.svg pidgin/pixmaps/status/11/scalable/person.svg pidgin/pixmaps/status/16/scalable/available.svg pidgin/pixmaps/status/16/scalable/away.svg pidgin/pixmaps/status/16/scalable/busy.svg pidgin/pixmaps/status/16/scalable/chat.svg pidgin/pixmaps/status/16/scalable/extended-away.svg pidgin/pixmaps/status/16/scalable/invisible.svg pidgin/pixmaps/status/16/scalable/log-in.svg pidgin/pixmaps/status/16/scalable/log-out.svg pidgin/pixmaps/status/16/scalable/message-pending.svg pidgin/pixmaps/status/16/scalable/offline.svg pidgin/pixmaps/status/16/scalable/person.svg pidgin/pixmaps/status/22/scalable/available.svg pidgin/pixmaps/status/22/scalable/away.svg pidgin/pixmaps/status/22/scalable/busy.svg pidgin/pixmaps/status/22/scalable/chat.svg pidgin/pixmaps/status/22/scalable/extended-away.svg pidgin/pixmaps/status/22/scalable/log-in.svg pidgin/pixmaps/status/22/scalable/log-out.svg pidgin/pixmaps/status/22/scalable/offline.svg pidgin/pixmaps/status/22/scalable/person.svg pidgin/pixmaps/status/22/scalable/sign-off.svg pidgin/pixmaps/status/22/scalable/sign-on.svg pidgin/pixmaps/status/32/scalable/available.svg pidgin/pixmaps/status/32/scalable/away.svg pidgin/pixmaps/status/32/scalable/busy.svg pidgin/pixmaps/status/32/scalable/chat.svg pidgin/pixmaps/status/32/scalable/extended-away.svg pidgin/pixmaps/status/32/scalable/log-in.svg pidgin/pixmaps/status/32/scalable/log-out.svg pidgin/pixmaps/status/32/scalable/offline.svg pidgin/pixmaps/status/32/scalable/person.svg pidgin/pixmaps/tray/16/scalable/tray-away.svg pidgin/pixmaps/tray/16/scalable/tray-busy.svg pidgin/pixmaps/tray/16/scalable/tray-connecting.svg pidgin/pixmaps/tray/16/scalable/tray-extended-away.svg pidgin/pixmaps/tray/16/scalable/tray-invisible.svg pidgin/pixmaps/tray/16/scalable/tray-message.svg pidgin/pixmaps/tray/16/scalable/tray-offline.svg pidgin/pixmaps/tray/16/scalable/tray-online.svg pidgin/pixmaps/tray/22/scalable/tray-away.svg pidgin/pixmaps/tray/22/scalable/tray-busy.svg pidgin/pixmaps/tray/22/scalable/tray-extended-away.svg pidgin/pixmaps/tray/22/scalable/tray-invisible.svg pidgin/pixmaps/tray/22/scalable/tray-message-new.svg pidgin/pixmaps/tray/22/scalable/tray-offline.svg pidgin/pixmaps/tray/22/scalable/tray-online.svg
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;