diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-06-01 15:00:38 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-06-01 15:01:03 +0200 |
| commit | 387b55a5c313dfc0f103b76f5cf869b0f0f0dbdb (patch) | |
| tree | e276fe94b2f984ddbca24c7b51cd5ee6afcb7aa8 | |
| parent | 40a6dd2f22c32ec668287d019ef6667c297d17ec (diff) | |
| parent | 4cab51d6e0202eb12ea816358daa4d8dfc873ba4 (diff) | |
| download | network-manager-applet-387b55a5c313dfc0f103b76f5cf869b0f0f0dbdb.tar.gz | |
applet: merge branch 'appindicator-vpn-icons'
https://bugzilla.gnome.org/show_bug.cgi?id=796258
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | icons/22/nm-device-wired-secure.png | bin | 0 -> 945 bytes | |||
| -rw-r--r-- | icons/22/nm-signal-00-secure.png | bin | 0 -> 775 bytes | |||
| -rw-r--r-- | icons/22/nm-signal-100-secure.png | bin | 0 -> 688 bytes | |||
| -rw-r--r-- | icons/22/nm-signal-25-secure.png | bin | 0 -> 779 bytes | |||
| -rw-r--r-- | icons/22/nm-signal-50-secure.png | bin | 0 -> 770 bytes | |||
| -rw-r--r-- | icons/22/nm-signal-75-secure.png | bin | 0 -> 747 bytes | |||
| -rw-r--r-- | icons/meson.build | 6 | ||||
| -rw-r--r-- | src/applet.c | 4 |
9 files changed, 16 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 44c06cdc..16c61c6d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,15 +68,21 @@ icon22dir = $(datadir)/icons/hicolor/22x22/apps icon22_DATA = \ icons/22/nm-adhoc.png \ icons/22/nm-device-wired.png \ + icons/22/nm-device-wired-secure.png \ icons/22/nm-device-wwan.png \ icons/22/nm-mb-roam.png \ icons/22/nm-no-connection.png \ icons/22/nm-secure-lock.png \ icons/22/nm-signal-00.png \ + icons/22/nm-signal-00-secure.png \ icons/22/nm-signal-100.png \ + icons/22/nm-signal-100-secure.png \ icons/22/nm-signal-25.png \ + icons/22/nm-signal-25-secure.png \ icons/22/nm-signal-50.png \ + icons/22/nm-signal-50-secure.png \ icons/22/nm-signal-75.png \ + icons/22/nm-signal-75-secure.png \ icons/22/nm-stage01-connecting01.png \ icons/22/nm-stage01-connecting02.png \ icons/22/nm-stage01-connecting03.png \ diff --git a/icons/22/nm-device-wired-secure.png b/icons/22/nm-device-wired-secure.png Binary files differnew file mode 100644 index 00000000..3bd45129 --- /dev/null +++ b/icons/22/nm-device-wired-secure.png diff --git a/icons/22/nm-signal-00-secure.png b/icons/22/nm-signal-00-secure.png Binary files differnew file mode 100644 index 00000000..11b39af1 --- /dev/null +++ b/icons/22/nm-signal-00-secure.png diff --git a/icons/22/nm-signal-100-secure.png b/icons/22/nm-signal-100-secure.png Binary files differnew file mode 100644 index 00000000..5c2f4140 --- /dev/null +++ b/icons/22/nm-signal-100-secure.png diff --git a/icons/22/nm-signal-25-secure.png b/icons/22/nm-signal-25-secure.png Binary files differnew file mode 100644 index 00000000..cd217424 --- /dev/null +++ b/icons/22/nm-signal-25-secure.png diff --git a/icons/22/nm-signal-50-secure.png b/icons/22/nm-signal-50-secure.png Binary files differnew file mode 100644 index 00000000..cf8213c4 --- /dev/null +++ b/icons/22/nm-signal-50-secure.png diff --git a/icons/22/nm-signal-75-secure.png b/icons/22/nm-signal-75-secure.png Binary files differnew file mode 100644 index 00000000..679dc54d --- /dev/null +++ b/icons/22/nm-signal-75-secure.png diff --git a/icons/meson.build b/icons/meson.build index c06cefa9..54a245a1 100644 --- a/icons/meson.build +++ b/icons/meson.build @@ -7,15 +7,21 @@ icons_16 = [ icons_22 = [ 'nm-adhoc.png', 'nm-device-wired.png', + 'nm-device-wired-secure.png', 'nm-device-wwan.png', 'nm-mb-roam.png', 'nm-no-connection.png', 'nm-secure-lock.png', 'nm-signal-00.png', + 'nm-signal-00-secure.png', 'nm-signal-100.png', + 'nm-signal-100-secure.png', 'nm-signal-25.png', + 'nm-signal-25-secure.png', 'nm-signal-50.png', + 'nm-signal-50-secure.png', 'nm-signal-75.png', + 'nm-signal-75-secure.png', 'nm-stage01-connecting01.png', 'nm-stage01-connecting02.png', 'nm-stage01-connecting03.png', diff --git a/src/applet.c b/src/applet.c index 21e36b60..9985ecbe 100644 --- a/src/applet.c +++ b/src/applet.c @@ -2709,6 +2709,10 @@ applet_update_icon (gpointer user_data) switch (vpn_state) { case NM_VPN_CONNECTION_STATE_ACTIVATED: icon_name = "nm-vpn-active-lock"; +#ifdef WITH_APPINDICATOR + if (with_appindicator) + icon_name = icon_name_free = g_strdup_printf ("%s-secure", app_indicator_get_icon (applet->app_indicator)); +#endif /* WITH_APPINDICATOR */ break; case NM_VPN_CONNECTION_STATE_PREPARE: case NM_VPN_CONNECTION_STATE_NEED_AUTH: |
