Mercurial > pidgin.yaz
comparison libpurple/smiley.c @ 23127:3da84b370eda
Remove undocumented and [apparently] unnecessary parameter from
purple_smiley_new_from_file.
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Mon, 28 Apr 2008 06:11:36 +0000 |
| parents | d30bee8d6bdf |
| children | 6c4f47b9d201 |
comparison
equal
deleted
inserted
replaced
| 23126:2f4b10ee752b | 23127:3da84b370eda |
|---|---|
| 554 | 554 |
| 555 return smiley; | 555 return smiley; |
| 556 } | 556 } |
| 557 | 557 |
| 558 PurpleSmiley * | 558 PurpleSmiley * |
| 559 purple_smiley_new_from_file(const char *shortcut, const char *filepath, const char *filename) | 559 purple_smiley_new_from_file(const char *shortcut, const char *filepath) |
| 560 { | 560 { |
| 561 PurpleSmiley *smiley = NULL; | 561 PurpleSmiley *smiley = NULL; |
| 562 guchar *smiley_data; | 562 guchar *smiley_data; |
| 563 size_t smiley_data_len; | 563 size_t smiley_data_len; |
| 564 char *filename; | |
| 564 | 565 |
| 565 g_return_val_if_fail(shortcut != NULL, NULL); | 566 g_return_val_if_fail(shortcut != NULL, NULL); |
| 566 g_return_val_if_fail(filepath != NULL, NULL); | 567 g_return_val_if_fail(filepath != NULL, NULL); |
| 567 | 568 |
| 569 filename = g_path_get_basename(filepath); | |
| 568 if (read_smiley_file(filepath, &smiley_data, &smiley_data_len)) | 570 if (read_smiley_file(filepath, &smiley_data, &smiley_data_len)) |
| 569 smiley = purple_smiley_new_from_stream(shortcut, smiley_data, | 571 smiley = purple_smiley_new_from_stream(shortcut, smiley_data, |
| 570 smiley_data_len, filename); | 572 smiley_data_len, filename); |
| 573 g_free(filename); | |
| 571 | 574 |
| 572 return smiley; | 575 return smiley; |
| 573 } | 576 } |
| 574 | 577 |
| 575 void | 578 void |