[empathy] Take advantage of tp_clear_object().

[Travis Reitter <treitter src gnome org>]

commit 22c93bf49f6a3fdf31496d2c2fd7b7553ee351f1
Author: Travis Reitter <treitter gmail com>
Date:   Fri Jul 9 13:54:16 2010 -0700

    Take advantage of tp_clear_object().

 libempathy-gtk/empathy-individual-menu.c |    3 +--
 src/empathy-main-window.c                |   11 ++++-------
 2 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index be5895a..a3cacda 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -232,8 +232,7 @@ empathy_individual_add_menu_item_new (FolksIndividual *individual)
       individual);
 
 out:
-  if (contact != NULL)
-    g_object_unref (contact);
+  tp_clear_object (&contact);
 
   return item;
 }
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 4c60c87..be3ca54 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -30,6 +30,7 @@
 #include <glib/gi18n.h>
 
 #include <telepathy-glib/account-manager.h>
+#include <telepathy-glib/util.h>
 #include <folks/folks.h>
 
 #include <libempathy/empathy-contact.h>
@@ -189,9 +190,7 @@ main_window_flash_foreach (GtkTreeModel *model,
 
 	contact = empathy_contact_dup_from_folks_individual (individual);
 	if (contact != data->event->contact) {
-		if (contact != NULL) {
-			g_object_unref (contact);
-		}
+		tp_clear_object (&contact);
 		return FALSE;
 	}
 
@@ -221,8 +220,7 @@ main_window_flash_foreach (GtkTreeModel *model,
 	}
 
 	g_object_unref (individual);
-	if (contact != NULL)
-		g_object_unref (contact);
+	tp_clear_object (&contact);
 
 	return FALSE;
 }
@@ -355,8 +353,7 @@ main_window_row_activated_cb (EmpathyContactListView *view,
 
 	g_object_unref (contact);
 OUT:
-	if (individual != NULL)
-		g_object_unref (individual);
+	tp_clear_object (&individual);
 }
 
 static void