Mercurial > pidgin.yaz
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 23182:e0bcb8cfda74 | 23189:7e0b815d2133 |
|---|---|
| 227 s->filename, err->message); | 227 s->filename, err->message); |
| 228 g_error_free(err); | 228 g_error_free(err); |
| 229 | 229 |
| 230 return; | 230 return; |
| 231 } | 231 } |
| 232 purple_smiley_set_data(s->smiley, (guchar*)data, len, FALSE); | 232 purple_smiley_set_data(s->smiley, (guchar*)data, len); |
| 233 } | 233 } |
| 234 purple_smiley_set_shortcut(s->smiley, entry); | 234 purple_smiley_set_shortcut(s->smiley, entry); |
| 235 } else { | 235 } else { |
| 236 if ((s->filename == NULL && s->custom_pixbuf == NULL) | 236 if ((s->filename == NULL && s->custom_pixbuf == NULL) |
| 237 || *entry == 0) { | 237 || *entry == 0) { |
| 327 s->smiley = smiley; | 327 s->smiley = smiley; |
| 328 | 328 |
| 329 window = gtk_dialog_new_with_buttons(smiley ? _("Edit Smiley") : _("Add Smiley"), | 329 window = gtk_dialog_new_with_buttons(smiley ? _("Edit Smiley") : _("Add Smiley"), |
| 330 widget ? GTK_WINDOW(widget) : NULL, | 330 widget ? GTK_WINDOW(widget) : NULL, |
| 331 GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, | 331 GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, |
| 332 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, | |
| 332 smiley ? GTK_STOCK_SAVE : GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT, | 333 smiley ? GTK_STOCK_SAVE : GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT, |
| 333 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, | |
| 334 NULL); | 334 NULL); |
| 335 s->parent = window; | 335 s->parent = window; |
| 336 | 336 |
| 337 gtk_container_set_border_width(GTK_CONTAINER(window), PIDGIN_HIG_BORDER); | 337 gtk_container_set_border_width(GTK_CONTAINER(window), PIDGIN_HIG_BORDER); |
| 338 | 338 |