[network-manager-applet] applet/indicator: fix build breakage in non-indicator case



commit 36cc562cad33ea3efe5192dfa20a58a17ae1761e
Author: Dan Williams <dcbw redhat com>
Date:   Tue Feb 17 14:46:44 2015 -0600

    applet/indicator: fix build breakage in non-indicator case
    
    'pixbuf' isn't used for indicator+icon-name, but is used for
    indicator+icon-data and non-indicator cases.

 src/mb-menu-item.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/mb-menu-item.c b/src/mb-menu-item.c
index 6a5ffdc..3561bf9 100644
--- a/src/mb-menu-item.c
+++ b/src/mb-menu-item.c
@@ -194,15 +194,15 @@ nm_mb_menu_item_new (const char *connection_name,
        /* And the strength icon, if we have strength information at all */
        if (enabled && strength) {
                const char *icon_name = mobile_helper_get_quality_icon_name (strength);
+               GdkPixbuf *pixbuf = nma_icon_check_and_load (icon_name, applet);
 
 #ifdef ENABLE_INDICATOR
 #ifdef DBUSMENU_PIXMAP_SUPPORT
-               GdkPixbuf *pixbuf = nma_icon_check_and_load (icon_name, applet);
-
                gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), gtk_image_new_from_pixbuf 
(pixbuf));
 #else
                gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
                                               gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU));
+               pixbuf = NULL;
 #endif
                /* For some reason we must always re-set always-show after setting the image */
                gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]