Mercurial > pidgin.yaz
changeset 16494:fc76627be6de
merge of '69c8aa9ab909c877e64f34aba095717eeb55e448'
and 'b2f7f5700c2672e7f2da9ee8d3ff3f593226b5d5'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Fri, 27 Apr 2007 03:28:41 +0000 |
| parents | 1dc138345d15 (diff) 6c3b44ac71f3 (current diff) |
| children | b8b2e35ec7c6 |
| files | |
| diffstat | 5 files changed, 34 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/Makefile.am Fri Apr 27 03:27:37 2007 +0000 +++ b/finch/Makefile.am Fri Apr 27 03:28:41 2007 +0000 @@ -1,5 +1,3 @@ -if ENABLE_GNT - EXTRA_DIST = \ getopt.c \ getopt.h \ @@ -7,8 +5,12 @@ SUBDIRS = libgnt plugins +if ENABLE_GNT + bin_PROGRAMS = finch +endif + finch_SOURCES = \ gntaccount.c \ gntblist.c \ @@ -74,4 +76,3 @@ $(DBUS_CFLAGS) \ $(LIBXML_CFLAGS) \ $(GNT_CFLAGS) -endif
--- a/libpurple/plugins/perl/common/Account.xs Fri Apr 27 03:27:37 2007 +0000 +++ b/libpurple/plugins/perl/common/Account.xs Fri Apr 27 03:28:41 2007 +0000 @@ -59,7 +59,7 @@ const char *user_info void -purple_account_set_buddy_icon(account, icon) +purple_account_set_buddy_icon_path(account, icon) Purple::Account account const char *icon @@ -144,7 +144,7 @@ Purple::Account account const char * -purple_account_get_buddy_icon(account) +purple_account_get_buddy_icon_path(account) Purple::Account account const char *
--- a/libpurple/plugins/perl/common/ImgStore.xs Fri Apr 27 03:27:37 2007 +0000 +++ b/libpurple/plugins/perl/common/ImgStore.xs Fri Apr 27 03:28:41 2007 +0000 @@ -3,17 +3,23 @@ MODULE = Purple::ImgStore PACKAGE = Purple::ImgStore PREFIX = purple_imgstore_ PROTOTYPES: ENABLE -int +Purple::StoredImage purple_imgstore_add(data, size, filename) void *data size_t size const char *filename +int +purple_imgstore_add_with_id(data, size, filename) + void *data + size_t size + const char *filename + Purple::StoredImage -purple_imgstore_get(id) +purple_imgstore_find_by_id(id) int id -gpointer +gconstpointer purple_imgstore_get_data(i) Purple::StoredImage i @@ -25,11 +31,23 @@ purple_imgstore_get_size(i) Purple::StoredImage i -void +const char * +purple_imgstore_get_extension(i) + Purple::StoredImage i + +Purple::StoredImage purple_imgstore_ref(id) + Purple::StoredImage id + +Purple::StoredImage +purple_imgstore_unref(id) + Purple::StoredImage id + +void +purple_imgstore_ref_by_id(id) int id -void -purple_imgstore_unref(id) +void +purple_imgstore_unref_by_id(id) int id
--- a/pidgin/plugins/perl/common/GtkStatusBox.xs Fri Apr 27 03:27:37 2007 +0000 +++ b/pidgin/plugins/perl/common/GtkStatusBox.xs Fri Apr 27 03:28:41 2007 +0000 @@ -37,13 +37,9 @@ Pidgin::StatusBox status_box void -pidgin_status_box_set_buddy_icon(status_box, filename) +pidgin_status_box_set_buddy_icon(status_box, img) Pidgin::StatusBox status_box - const char * filename - -const char * -pidgin_status_box_get_buddy_icon(status_box) - Pidgin::StatusBox status_box + Purple::StoredImage img gchar_own * pidgin_status_box_get_message(status_box)
--- a/pidgin/plugins/perl/common/GtkUtils.xs Fri Apr 27 03:27:37 2007 +0000 +++ b/pidgin/plugins/perl/common/GtkUtils.xs Fri Apr 27 03:28:41 2007 +0000 @@ -11,6 +11,7 @@ pidgin_load_accels() gchar_own * -pidgin_convert_buddy_icon(plugin, path) +pidgin_convert_buddy_icon(plugin, path, size) Purple::Plugin plugin const char * path + size_t *size