Mercurial > pidgin.yaz
diff pidgin/gtksmiley.c @ 23189:7e0b815d2133
merge of '45401c961ca97b6dd3675db39ca8d46f5142dada'
and '886c30a3d3006c7497f9e6ce6354ba660e5505bd'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sun, 25 May 2008 22:06:51 +0000 |
| parents | 013ec6fabd3f |
| children | bfbd2b038135 |
line wrap: on
line diff
--- a/pidgin/gtksmiley.c Sun May 25 21:56:36 2008 +0000 +++ b/pidgin/gtksmiley.c Sun May 25 22:06:51 2008 +0000 @@ -229,7 +229,7 @@ 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 @@ 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;