02: Add check for valid surface in icon renderer.

noreply Sun, 02 Feb 2020 14:57:25 -0800

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

gottcode pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-whiskermenu-plugin.


commit 7b014c1b608cd758ff90b1af8645b4e7c4f58cb1
Author: Graeme Gott <gra...@gottcode.org>
Date:   Sun Feb 2 17:53:00 2020 -0500

    Add check for valid surface in icon renderer.
---
 panel-plugin/icon-renderer.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/panel-plugin/icon-renderer.cpp b/panel-plugin/icon-renderer.cpp
index 561f773..786b1ec 100644
--- a/panel-plugin/icon-renderer.cpp
+++ b/panel-plugin/icon-renderer.cpp
@@ -100,7 +100,7 @@ static void 
whiskermenu_icon_renderer_render(GtkCellRenderer* renderer, cairo_t*
 {
        WhiskerMenuIconRenderer* icon_renderer = 
WHISKERMENU_ICON_RENDERER(renderer);
 
-       if (icon_renderer->gicon == NULL)
+       if (!icon_renderer->gicon)
        {
                return;
        }
@@ -120,7 +120,7 @@ static void 
whiskermenu_icon_renderer_render(GtkCellRenderer* renderer, cairo_t*
                        scale,
                        GtkIconLookupFlags(GTK_ICON_LOOKUP_USE_BUILTIN | 
GTK_ICON_LOOKUP_FORCE_SIZE));
 
-       if (icon_info == NULL)
+       if (!icon_info)
        {
                icon_info = gtk_icon_theme_lookup_icon_for_scale(icon_theme,
                                icon_renderer->launcher ? 
"application-x-executable" : "applications-other",
@@ -128,7 +128,7 @@ static void 
whiskermenu_icon_renderer_render(GtkCellRenderer* renderer, cairo_t*
                                scale,
                                GtkIconLookupFlags(GTK_ICON_LOOKUP_USE_BUILTIN 
| GTK_ICON_LOOKUP_FORCE_SIZE));
 
-               if (icon_info == NULL)
+               if (!icon_info)
                {
                        return;
                }
@@ -136,6 +136,10 @@ static void 
whiskermenu_icon_renderer_render(GtkCellRenderer* renderer, cairo_t*
 
        cairo_surface_t* surface = gtk_icon_info_load_surface(icon_info, 
gtk_widget_get_window(widget), NULL);
        g_object_unref(icon_info);
+       if (!surface)
+       {
+               return;
+       }
 
        GdkRectangle icon_area;
        icon_area.width = cairo_image_surface_get_width(surface) / scale;
@@ -193,7 +197,7 @@ static void whiskermenu_icon_renderer_set_property(GObject* 
object, guint prop_i
                break;
 
        case PROP_GICON:
-               if (icon_renderer->gicon != NULL)
+               if (icon_renderer->gicon)
                {
                        g_object_unref(icon_renderer->gicon);
                }
@@ -216,7 +220,7 @@ static void whiskermenu_icon_renderer_finalize(GObject* 
object)
 {
        WhiskerMenuIconRenderer* icon_renderer = 
WHISKERMENU_ICON_RENDERER(object);
 
-       if (icon_renderer->gicon != NULL)
+       if (icon_renderer->gicon)
        {
                g_object_unref(icon_renderer->gicon);
        }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 02/02: Add check for valid surface in icon renderer.

Reply via email to