# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1133178470 0
# Node ID 5e2a365af01b8eb786e5d60c2f60bcc6a1e8b3e8
# Parent  064a2c28ceec78ba7f8051271a83798ad1902102
[gaim-migrate @ 14552]
Change some *_unref() reference count guards into g_return_if_fail()/g_return_val_if_fail(). That way we'll get a debug message if they fail, not that they ever should, of course.

committer: Tailor Script <tailor@pidgin.im>

diff -r 064a2c28ceec -r 5e2a365af01b src/buddyicon.c
--- a/src/buddyicon.c	Mon Nov 28 06:55:42 2005 +0000
+++ b/src/buddyicon.c	Mon Nov 28 11:47:50 2005 +0000
@@ -153,9 +153,7 @@
 gaim_buddy_icon_unref(GaimBuddyIcon *icon)
 {
 	g_return_val_if_fail(icon != NULL, NULL);
-
-	if (icon->ref_count <= 0)
-		return NULL;
+	g_return_val_if_fail(icon->ref_count > 0, NULL);
 
 	icon->ref_count--;
 
diff -r 064a2c28ceec -r 5e2a365af01b src/ft.c
--- a/src/ft.c	Mon Nov 28 06:55:42 2005 +0000
+++ b/src/ft.c	Mon Nov 28 11:47:50 2005 +0000
@@ -98,6 +98,7 @@
 gaim_xfer_unref(GaimXfer *xfer)
 {
 	g_return_if_fail(xfer != NULL);
+	g_return_if_fail(xfer->ref > 0);
 
 	xfer->ref--;
 
diff -r 064a2c28ceec -r 5e2a365af01b src/protocols/msn/command.c
--- a/src/protocols/msn/command.c	Mon Nov 28 06:55:42 2005 +0000
+++ b/src/protocols/msn/command.c	Mon Nov 28 11:47:50 2005 +0000
@@ -106,9 +106,7 @@
 msn_command_unref(MsnCommand *cmd)
 {
 	g_return_val_if_fail(cmd != NULL, NULL);
-
-	if (cmd->ref_count <= 0)
-		return NULL;
+	g_return_val_if_fail(cmd->ref_count > 0, NULL);
 
 	cmd->ref_count--;
 
diff -r 064a2c28ceec -r 5e2a365af01b src/protocols/msn/msg.c
--- a/src/protocols/msn/msg.c	Mon Nov 28 06:55:42 2005 +0000
+++ b/src/protocols/msn/msg.c	Mon Nov 28 11:47:50 2005 +0000
@@ -96,9 +96,7 @@
 msn_message_unref(MsnMessage *msg)
 {
 	g_return_val_if_fail(msg != NULL, NULL);
-
-	if (msg->ref_count <= 0)
-		return NULL;
+	g_return_val_if_fail(msg->ref_count > 0, NULL);
 
 	msg->ref_count--;
 
diff -r 064a2c28ceec -r 5e2a365af01b src/roomlist.c
--- a/src/roomlist.c	Mon Nov 28 06:55:42 2005 +0000
+++ b/src/roomlist.c	Mon Nov 28 11:47:50 2005 +0000
@@ -124,6 +124,7 @@
 void gaim_roomlist_unref(GaimRoomlist *list)
 {
 	g_return_if_fail(list != NULL);
+	g_return_if_fail(list->ref > 0);
 
 	list->ref--;