summaryrefslogtreecommitdiff
path: root/pidgin/gtksmiley.c
diff options
context:
space:
mode:
authorMarcus Lundblad <malu@pidgin.im>2008-05-25 16:16:22 +0000
committerMarcus Lundblad <malu@pidgin.im>2008-05-25 16:16:22 +0000
commit6eb401717cfc8e81bf7a28fd31f17aaa1ad4fd34 (patch)
tree79b2892cd77494fac5da5e454bb1ea20b5079429 /pidgin/gtksmiley.c
parent8518627987c45a6d5bf5cb435254caf0aa3f6288 (diff)
downloadpidgin-6eb401717cfc8e81bf7a28fd31f17aaa1ad4fd34.tar.gz
Always store custom smileys with hashed filenames. Closes #5913.
committer: Sadrul Habib Chowdhury <sadrul@pidgin.im>
Diffstat (limited to 'pidgin/gtksmiley.c')
-rw-r--r--pidgin/gtksmiley.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/pidgin/gtksmiley.c b/pidgin/gtksmiley.c
index 08ff25aa9e..9439087d6a 100644
--- a/pidgin/gtksmiley.c
+++ b/pidgin/gtksmiley.c
@@ -229,7 +229,7 @@ static void do_add(GtkWidget *widget, PidginSmiley *s)
return;
}
- purple_smiley_set_data(s->smiley, (guchar*)data, len, FALSE);
+ purple_smiley_set_data(s->smiley, (guchar*)data, len);
}
purple_smiley_set_shortcut(s->smiley, entry);
} else {
@@ -329,8 +329,8 @@ pidgin_smiley_edit(GtkWidget *widget, PurpleSmiley *smiley)
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,
smiley ? GTK_STOCK_SAVE : GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
NULL);
s->parent = window;