Revision: 16343
Author: thekingant
Date: 2006-06-25 20:53:13 -0700 (Sun, 25 Jun 2006)
ViewCVS: http://svn.sourceforge.net/gaim/?rev=16343&view=rev
Log Message:
-----------
Backport SVN revision #16342 from HEAD to v2_0_0
Original commit message:
Get rid of some unnecessary if !NULL checks
ViewCVS Links:
-------------
http://svn.sourceforge.net/gaim/?rev=16342&view=rev
Modified Paths:
--------------
branches/v2_0_0/src/buddyicon.c
Modified: branches/v2_0_0/src/buddyicon.c
===================================================================
--- branches/v2_0_0/src/buddyicon.c 2006-06-26 03:52:21 UTC (rev 16342)
+++ branches/v2_0_0/src/buddyicon.c 2006-06-26 03:53:13 UTC (rev 16343)
@@ -132,12 +132,8 @@
if (icon_cache != NULL)
g_hash_table_remove(icon_cache, gaim_buddy_icon_get_username(icon));
- if (icon->username != NULL)
- g_free(icon->username);
-
- if (icon->data != NULL)
- g_free(icon->data);
-
+ g_free(icon->username);
+ g_free(icon->data);
GAIM_DBUS_UNREGISTER_POINTER(icon);
g_free(icon);
}
@@ -315,8 +311,7 @@
g_return_if_fail(icon != NULL);
g_return_if_fail(username != NULL);
- if (icon->username != NULL)
- g_free(icon->username);
+ g_free(icon->username);
icon->username = g_strdup(username);
}
@@ -326,8 +321,7 @@
{
g_return_if_fail(icon != NULL);
- if (icon->data != NULL)
- g_free(icon->data);
+ g_free(icon->data);
if (data != NULL && len > 0)
{
@@ -485,8 +479,7 @@
{
g_return_if_fail(dir != NULL);
- if (cache_dir != NULL)
- g_free(cache_dir);
+ g_free(cache_dir);
cache_dir = g_strdup(dir);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
