[network-manager-applet: 6/6] applet: merge branch 'th/applet-icon'

[Thomas Haller <thaller src gnome org>]

commit 32c3afe2d0a9509ead85f90cd7f5737bed17e591
Merge: 25b5f76 cdb3ff9
Author: Thomas Haller <thaller redhat com>
Date:   Sun Mar 13 12:20:13 2016 +0100

    applet: merge branch 'th/applet-icon'
    
    When compiling with --with-appindicator, I got a lot of criticals due
    to missing icons. First, ensure we call nm_icons_reload() as needed.
    Then, better cope with errors loading icons.

 shared/nm-glib.h            |    7 ++++
 shared/nm-macros-internal.h |   44 +++++++++++++++++++++++-
 shared/nm-test-utils.h      |   81 ++++++++++++++++++++++++++++++++----------
 src/ap-menu-item.c          |   34 +++++++++--------
 src/applet.c                |   36 +++++++++----------
 src/mb-menu-item.c          |   14 ++++---
 src/mobile-helpers.c        |   51 +++++++++++++++------------
 7 files changed, 182 insertions(+), 85 deletions(-)
---