# HG changeset patch # User Mark Doliner # Date 1358842483 28800 # Node ID 55fcd87165461d7af42cb419057be95f96a6df5a # Parent 27ee16de77aa31079db3e302a679ad559f44fde2 Change purple_buddy_icon_unref to not return anything. It's weird for unref functions to return a value and we weren't using it anywhere. diff -r 27ee16de77aa -r 55fcd8716546 ChangeLog.API --- a/ChangeLog.API Tue Jan 22 00:09:30 2013 -0800 +++ b/ChangeLog.API Tue Jan 22 00:14:43 2013 -0800 @@ -82,6 +82,7 @@ parameter * purple_account_add_buddies now takes an invite message as the last parameter + * purple_buddy_icon_unref no longer has a return value * purple_certificate_check_signature_chain now returns a list of failing PurpleCertificate*s as the second parameter * purple_connection_error now takes a PurpleConnectionError diff -r 27ee16de77aa -r 55fcd8716546 libpurple/buddyicon.c --- a/libpurple/buddyicon.c Tue Jan 22 00:09:30 2013 -0800 +++ b/libpurple/buddyicon.c Tue Jan 22 00:14:43 2013 -0800 @@ -342,13 +342,13 @@ return icon; } -PurpleBuddyIcon * +void purple_buddy_icon_unref(PurpleBuddyIcon *icon) { if (icon == NULL) - return NULL; + return; - g_return_val_if_fail(icon->ref_count > 0, NULL); + g_return_if_fail(icon->ref_count > 0); icon->ref_count--; @@ -365,11 +365,7 @@ PURPLE_DBUS_UNREGISTER_POINTER(icon); g_slice_free(PurpleBuddyIcon, icon); - - return NULL; } - - return icon; } void diff -r 27ee16de77aa -r 55fcd8716546 libpurple/buddyicon.h --- a/libpurple/buddyicon.h Tue Jan 22 00:09:30 2013 -0800 +++ b/libpurple/buddyicon.h Tue Jan 22 00:14:43 2013 -0800 @@ -79,10 +79,8 @@ * If the reference count reaches 0, the icon will be destroyed. * * @param icon The buddy icon. - * - * @return @a icon, or @c NULL if the reference count reached 0. */ -PurpleBuddyIcon *purple_buddy_icon_unref(PurpleBuddyIcon *icon); +void purple_buddy_icon_unref(PurpleBuddyIcon *icon); /** * Updates every instance of this icon. diff -r 27ee16de77aa -r 55fcd8716546 libpurple/plugins/perl/common/BuddyIcon.xs --- a/libpurple/plugins/perl/common/BuddyIcon.xs Tue Jan 22 00:09:30 2013 -0800 +++ b/libpurple/plugins/perl/common/BuddyIcon.xs Tue Jan 22 00:14:43 2013 -0800 @@ -7,7 +7,7 @@ purple_buddy_icon_ref(icon) Purple::Buddy::Icon icon -Purple::Buddy::Icon +void purple_buddy_icon_unref(icon) Purple::Buddy::Icon icon