[Xfce4-commits] r24067 - xfdesktop/trunk/src

[Brian Tarricone]

Author: kelnos
Date: 2006-12-08 23:31:41 +0000 (Fri, 08 Dec 2006)
New Revision: 24067

Modified:
   xfdesktop/trunk/src/xfdesktop-file-icon.c
Log:
fix possible NULL pointer derefs (klocwork id 630)


Modified: xfdesktop/trunk/src/xfdesktop-file-icon.c
===================================================================
--- xfdesktop/trunk/src/xfdesktop-file-icon.c	2006-12-08 23:23:06 UTC (rev 24066)
+++ xfdesktop/trunk/src/xfdesktop-file-icon.c	2006-12-08 23:31:41 UTC (rev 24067)
@@ -167,10 +167,12 @@
 G_CONST_RETURN ThunarVfsInfo *
 xfdesktop_file_icon_peek_info(XfdesktopFileIcon *icon)
 {
-    XfdesktopFileIconClass *klass = XFDESKTOP_FILE_ICON_GET_CLASS(icon);
+    XfdesktopFileIconClass *klass;
     
     g_return_val_if_fail(XFDESKTOP_IS_FILE_ICON(icon), NULL);
     
+    klass = XFDESKTOP_FILE_ICON_GET_CLASS(icon);
+    
     if(klass->peek_info)
        return klass->peek_info(icon);
     else
@@ -181,10 +183,12 @@
 xfdesktop_file_icon_update_info(XfdesktopFileIcon *icon,
                                 ThunarVfsInfo *info)
 {
-    XfdesktopFileIconClass *klass = XFDESKTOP_FILE_ICON_GET_CLASS(icon);
+    XfdesktopFileIconClass *klass;
     
     g_return_if_fail(XFDESKTOP_IS_FILE_ICON(icon));
     
+    klass = XFDESKTOP_FILE_ICON_GET_CLASS(icon);
+    
     if(klass->update_info)
        klass->update_info(icon, info);
 }
@@ -192,10 +196,12 @@
 gboolean
 xfdesktop_file_icon_can_rename_file(XfdesktopFileIcon *icon)
 {
-    XfdesktopFileIconClass *klass = XFDESKTOP_FILE_ICON_GET_CLASS(icon);
+    XfdesktopFileIconClass *klass;
     
     g_return_val_if_fail(XFDESKTOP_IS_FILE_ICON(icon), FALSE);
     
+    klass = XFDESKTOP_FILE_ICON_GET_CLASS(icon);
+    
     if(klass->can_rename_file)
        return klass->can_rename_file(icon);
     else
@@ -206,11 +212,13 @@
 xfdesktop_file_icon_rename_file(XfdesktopFileIcon *icon,
                                 const gchar *new_name)
 {
-    XfdesktopFileIconClass *klass = XFDESKTOP_FILE_ICON_GET_CLASS(icon);
+    XfdesktopFileIconClass *klass;
     
     g_return_val_if_fail(XFDESKTOP_IS_FILE_ICON(icon), FALSE);
     g_return_val_if_fail(new_name && *new_name, FALSE);
     
+    klass = XFDESKTOP_FILE_ICON_GET_CLASS(icon);
+    
     if(klass->rename_file)
        return klass->rename_file(icon, new_name);
     else
@@ -220,10 +228,12 @@
 gboolean
 xfdesktop_file_icon_can_delete_file(XfdesktopFileIcon *icon)
 {
-    XfdesktopFileIconClass *klass = XFDESKTOP_FILE_ICON_GET_CLASS(icon);
+    XfdesktopFileIconClass *klass;
     
     g_return_val_if_fail(XFDESKTOP_IS_FILE_ICON(icon), FALSE);
     
+    klass = XFDESKTOP_FILE_ICON_GET_CLASS(icon);
+    
     if(klass->can_delete_file)
        return klass->can_delete_file(icon);
     else
@@ -233,10 +243,12 @@
 gboolean
 xfdesktop_file_icon_delete_file(XfdesktopFileIcon *icon)
 {
-    XfdesktopFileIconClass *klass = XFDESKTOP_FILE_ICON_GET_CLASS(icon);
+    XfdesktopFileIconClass *klass;
     
     g_return_val_if_fail(XFDESKTOP_IS_FILE_ICON(icon), FALSE);
     
+    klass = XFDESKTOP_FILE_ICON_GET_CLASS(icon);
+    
     if(klass->delete_file)
        return klass->delete_file(icon);
     else