[Xfce4-commits] [xfce/xfdesktop] 02/02: Simplify

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

a   n   d   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfdesktop.

commit 4ece4f38aa94352bdc31d065eea9e26da4105478
Author: Andre Miranda <andreldm at xfce.org>
Date:   Sat Jun 22 08:24:15 2019 -0300

    Simplify
    
    g_build_filename will not return NULL because of "pixmaps".
---
 src/xfdesktop-regular-file-icon.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/xfdesktop-regular-file-icon.c b/src/xfdesktop-regular-file-icon.c
index 73913c3..b1c76f0 100644
--- a/src/xfdesktop-regular-file-icon.c
+++ b/src/xfdesktop-regular-file-icon.c
@@ -447,10 +447,8 @@ xfdesktop_load_icon_from_desktop_file(XfdesktopRegularFileIcon *regular_icon)
     /* maybe it points to a file in the pixmaps folder */
     if(gicon == NULL || is_pixmaps) {
         gchar *filename = g_build_filename("pixmaps", icon_name, NULL);
-        gchar *tmp_name = NULL;
+        gchar *tmp_name = xfce_resource_lookup(XFCE_RESOURCE_DATA, filename);
 
-        if(filename)
-            tmp_name = xfce_resource_lookup(XFCE_RESOURCE_DATA, filename);
 
         if(tmp_name) {
             if(gicon != NULL)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.