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

[Brian Tarricone]

Author: kelnos
Date: 2006-12-08 23:39:24 +0000 (Fri, 08 Dec 2006)
New Revision: 24068

Modified:
   xfdesktop/trunk/src/xfdesktop-icon.c
Log:
fix some more possible NULL derefs


Modified: xfdesktop/trunk/src/xfdesktop-icon.c
===================================================================
--- xfdesktop/trunk/src/xfdesktop-icon.c	2006-12-08 23:31:41 UTC (rev 24067)
+++ xfdesktop/trunk/src/xfdesktop-icon.c	2006-12-08 23:39:24 UTC (rev 24068)
@@ -214,9 +214,10 @@
 xfdesktop_icon_peek_pixbuf(XfdesktopIcon *icon,
                            gint size)
 {
-    XfdesktopIconClass *klass = XFDESKTOP_ICON_GET_CLASS(icon);
+    XfdesktopIconClass *klass;
     
     g_return_val_if_fail(XFDESKTOP_IS_ICON(icon), NULL);
+    klass = XFDESKTOP_ICON_GET_CLASS(icon);
     g_return_val_if_fail(klass->peek_pixbuf, NULL);
     
     return klass->peek_pixbuf(icon, size);
@@ -226,9 +227,10 @@
 G_CONST_RETURN gchar *
 xfdesktop_icon_peek_label(XfdesktopIcon *icon)
 {
-    XfdesktopIconClass *klass = XFDESKTOP_ICON_GET_CLASS(icon);
+    XfdesktopIconClass *klass;
     
     g_return_val_if_fail(XFDESKTOP_IS_ICON(icon), NULL);
+    klass = XFDESKTOP_ICON_GET_CLASS(icon);
     g_return_val_if_fail(klass->peek_label, NULL);
     
     return klass->peek_label(icon);
@@ -238,9 +240,12 @@
 GdkDragAction
 xfdesktop_icon_get_allowed_drag_actions(XfdesktopIcon *icon)
 {
-    XfdesktopIconClass *klass = XFDESKTOP_ICON_GET_CLASS(icon);
+    XfdesktopIconClass *klass;
     
     g_return_val_if_fail(XFDESKTOP_IS_ICON(icon), FALSE);
+    
+    klass = XFDESKTOP_ICON_GET_CLASS(icon);
+    
     if(!klass->get_allowed_drag_actions)
         return 0;
     
@@ -251,9 +256,12 @@
 GdkDragAction
 xfdesktop_icon_get_allowed_drop_actions(XfdesktopIcon *icon)
 {
-    XfdesktopIconClass *klass = XFDESKTOP_ICON_GET_CLASS(icon);
+    XfdesktopIconClass *klass;
     
     g_return_val_if_fail(XFDESKTOP_IS_ICON(icon), FALSE);
+    
+    klass = XFDESKTOP_ICON_GET_CLASS(icon);
+    
     if(!klass->get_allowed_drop_actions)
         return 0;
     
@@ -266,9 +274,10 @@
                             XfdesktopIcon *src_icon,
                             GdkDragAction action)
 {
-    XfdesktopIconClass *klass = XFDESKTOP_ICON_GET_CLASS(icon);
+    XfdesktopIconClass *klass;
     
     g_return_val_if_fail(XFDESKTOP_IS_ICON(icon), FALSE);
+    klass = XFDESKTOP_ICON_GET_CLASS(icon);    
     g_return_val_if_fail(klass->do_drop_dest, FALSE);
     
     return klass->do_drop_dest(icon, src_icon, action);
@@ -278,10 +287,12 @@
 G_CONST_RETURN gchar *
 xfdesktop_icon_peek_tooltip(XfdesktopIcon *icon)
 {
-    XfdesktopIconClass *klass = XFDESKTOP_ICON_GET_CLASS(icon);
+    XfdesktopIconClass *klass;
     
     g_return_val_if_fail(XFDESKTOP_IS_ICON(icon), NULL);
     
+    klass = XFDESKTOP_ICON_GET_CLASS(icon);
+    
     if(!klass->peek_tooltip)
         return NULL;
     
@@ -292,10 +303,12 @@
 GtkWidget *
 xfdesktop_icon_get_popup_menu(XfdesktopIcon *icon)
 {
-    XfdesktopIconClass *klass = XFDESKTOP_ICON_GET_CLASS(icon);
+    XfdesktopIconClass *klass;
     
     g_return_val_if_fail(XFDESKTOP_IS_ICON(icon), NULL);
     
+    klass = XFDESKTOP_ICON_GET_CLASS(icon);
+    
     if(!klass->get_popup_menu)
         return NULL;