libpurple/protocols/novell/nmcontact.c

changeset 37389
7240fd8e3462
parent 19859
71d37b57eff2
child 37425
5061721fd98f
--- a/libpurple/protocols/novell/nmcontact.c	Sun Oct 18 22:17:34 2015 -0400
+++ b/libpurple/protocols/novell/nmcontact.c	Wed Oct 21 09:44:50 2015 -0400
@@ -232,13 +232,8 @@
 		purple_debug(PURPLE_DEBUG_INFO, "novell",
 				   "Releasing contact, total=%d\n", --count);
 
-		if (contact->display_name) {
-			g_free(contact->display_name);
-		}
-
-		if (contact->dn) {
-			g_free(contact->dn);
-		}
+		g_free(contact->display_name);
+		g_free(contact->dn);
 
 		if (contact->user_record) {
 			nm_release_user_record(contact->user_record);
@@ -560,9 +555,7 @@
 		return;
 
 	if (--(folder->ref_count) == 0) {
-		if (folder->name) {
-			g_free(folder->name);
-		}
+		g_free(folder->name);
 
 		if (folder->folders) {
 			_release_folder_folders(folder);

mercurial