Mercurial > pidgin3 / changeset

--- 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

--- 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

--- 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.

--- 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