From: Michael Natterer <mitch@imendio.com>
Date: Wed, 6 Feb 2008 13:22:57 +0000 (+0000)
Subject: replace "icon && G_IS_ICON (icon)" by simply "G_IS_ICON (icon)".
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=2b02891ef7ffdcc6ad4c228d176c945c5b1dbeb9;p=dana%2Fcg-glib.git

replace "icon && G_IS_ICON (icon)" by simply "G_IS_ICON (icon)".

2008-02-06  Michael Natterer  <mitch@imendio.com>

	* gfileinfo.c (g_file_info_get_icon): replace
	"icon && G_IS_ICON (icon)" by simply "G_IS_ICON (icon)".


svn path=/trunk/; revision=6463
---

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 9fe83200..7534e949 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-06  Michael Natterer  <mitch@imendio.com>
+
+	* gfileinfo.c (g_file_info_get_icon): replace
+	"icon && G_IS_ICON (icon)" by simply "G_IS_ICON (icon)".
+
 2008-02-06  Tomas Bzatek  <tbzatek@redhat.com>
 
 	* gfile.c (g_file_create):
diff --git a/gio/gfileinfo.c b/gio/gfileinfo.c
index 1b629497..17768ed0 100644
--- a/gio/gfileinfo.c
+++ b/gio/gfileinfo.c
@@ -1315,7 +1315,7 @@ g_file_info_get_icon (GFileInfo *info)
   
   value = g_file_info_find_value (info, attr);
   obj = _g_file_attribute_value_get_object (value);
-  if (obj != NULL && G_IS_ICON (obj))
+  if (G_IS_ICON (obj))
     return G_ICON (obj);
   return NULL;
 }