(cherry picked from commit 0f393521)

https://bugzilla.redhat.com/show_bug.cgi?id=1199288

(cherry picked from commit 98dc7a76)

Just print a warning and return from the function.

https://bugzilla.redhat.com/show_bug.cgi?id=1205316

(cherry picked from commit ef2d9f5b)

Fixes commit 54d03b5f.

Test case:
1. run nm-connection-editor
2. click "Add" button
3. select "Bridge" in combo box and click "Create..." button
4. delete the text in "Interface name:" entry
5. click "Add" button to add a slave
6. click "Create..." button
7. *** crash ***

(cherry picked from commit 915dc47b)

Mathieu Trudel-Lapierre authored Jan 26, 2015 and Dan Williams committed Feb 02, 2015

Make sure we only ever have one of the "Don't show this again" button that
will trigger disabling notifications. Otherwise we end up with multiple
instances of the same button in notifications because one gets added every
time a new notification stacks on top of an existing one.

(cherry picked from commit 66318200)

Dan Winship authored Jan 22, 2015 and Dan Williams committed Jan 22, 2015

We were setting -DNM_VERSION_MAX_ALLOWED=NM_VERSION_0_9_10, but if you
don't set NM_VERSION_MIN_REQUIRED, it defaults to
NM_VERSION_CUR_STABLE, which meant that we were setting MIN to 1_0 and
MAX to 0_9_10, which clearly won't work. Fix this by setting MIN to
0_9_10 too (since that's still the version we're requiring in
configure).

https://bugzilla.gnome.org/show_bug.cgi?id=743343
(cherry picked from commit 3fa58788)

Now that we've got int64 properties (route metric) let's make sure
the testcases don't fail with them.

(cherry picked from commit 1e6e4ceb)

Allison Karlitskaya authored Nov 22, 2014 and Dan Williams committed Dec 08, 2014

Currently if we have two paired bluetooth devices,
nma_utils_disambiguate_device_names() will disambiguate them by their
hardware address.  This is not very helpful, so detect this case and use
the Bluetooth device name instead.

This function is used by System Settings when showing the list of
network devices.

https://bugzilla.gnome.org/show_bug.cgi?id=740553
(cherry picked from commit 74d110a9)

Jiří Klimeš authored Nov 25, 2014 and Dan Williams committed Dec 08, 2014

It is only used in applet.c.

(cherry picked from commit d63ad671)

Jiří Klimeš authored Nov 25, 2014 and Dan Williams committed Dec 08, 2014

Active VPN connections contain a device of a base connection, but we are
interested in the base active connection itself.

https://bugzilla.gnome.org/show_bug.cgi?id=737585
(cherry picked from commit 64d744e9)

Pavel Šimerda authored Nov 25, 2014 and Dan Williams committed Dec 08, 2014

Remove a redundant parameter that was allways set to -1 by the caller
and the related code.

(cherry picked from commit 995b6800)

Libraries need to include <gi18n-lib.h>, not <gi18n.h>, so that _()
will get defined to "dgettext (GETTEXT_DOMAIN, string)" rather than
"gettext (string)" (which will use the program's default domain, which
works fine for programs in the network-manager-applet tree, but not for
external users). Likewise, we need to call bindtextdomain() so that
gettext can find the translations if the library is installed in a
different prefix from the program using it (and
bind_textdomain_codeset(), so it will know the translations are in
UTF-8 even if the locale isn't).

(based on NM commit 53f5e9afa466b0b1517cbac208ed01ab8f4b6274)

https://bugzilla.gnome.org/show_bug.cgi?id=741215
(cherry picked from commit 078b9458)

libgnome-keyring is marked as deprecated in favour of libsecret.
We only use it for the legacy gconf-helpers. That code will be
removed in the future, so don't bother an just suppress the
deprecation warning.

Signed-off-by: Thomas Haller <thaller@redhat.com>
(cherry picked from commit ad3b90cf)

Signed-off-by: Thomas Haller <thaller@redhat.com>
(cherry picked from commit a6d9842c)

Fixes for compilation with clang and several issues that surfaced
due to new complier warnings.

https://bugzilla.gnome.org/show_bug.cgi?id=739246



Signed-off-by: Thomas Haller <thaller@redhat.com>
(cherry picked from commit b75fc2c6)

Update m4 macro from current NetworkManager master branch;
with one difference: keep also -Wstrict-prototypes (which
NM does not enable).

Signed-off-by: Thomas Haller <thaller@redhat.com>
(cherry picked from commit 50f4b913)

These code paths are now disabled for 6 years since
2a4aed58

 . Just remove them.

Signed-off-by: Thomas Haller <thaller@redhat.com>
(cherry picked from commit e6ed12c0)

clang warns:

    make[4]: Entering directory `./network-manager-applet/src'
      CC       nm_applet-ap-menu-item.o
    ap-menu-item.c:188:7: error: duplicate 'const' declaration specifier [-Werror,-Wduplicate-decl-specifier]
    const const char *
          ^~~~~~

Signed-off-by: Thomas Haller <thaller@redhat.com>
(cherry picked from commit 990afe4f)

This bug has no real consequences as NM_VPN_SERVICE_STATE_UNKNOWN
and NM_VPN_CONNECTION_STATE_UNKNOWN are both numerically zero.

Signed-off-by: Thomas Haller <thaller@redhat.com>
(cherry picked from commit 1006f513)

clang warns:

    make[4]: Entering directory `./network-manager-applet/src'
      CC       nm_applet-applet.o
    In file included from applet.c:88:
    ./applet-vpn-request.h:23:9: error: 'APPLET_VPN_REQEUST_H' is used as a header guard here, followed by #define of a different macro [-Werror,-Wheader-guard]
    #ifndef APPLET_VPN_REQEUST_H
            ^~~~~~~~~~~~~~~~~~~~
    ./applet-vpn-request.h:24:9: note: 'APPLET_VPN_REQUEST_H' is defined here; did you mean 'APPLET_VPN_REQEUST_H'?
    #define APPLET_VPN_REQUEST_H
            ^~~~~~~~~~~~~~~~~~~~
            APPLET_VPN_REQEUST_H

Signed-off-by: Thomas Haller <thaller@redhat.com>
(cherry picked from commit de47edb1)

Fixes: 163a2b41


Signed-off-by: Thomas Haller <thaller@redhat.com>
(cherry picked from commit 91a05942)

Fixes: f22f23dd


Signed-off-by: Thomas Haller <thaller@redhat.com>
(cherry picked from commit a94bab72)

For clang, the defines G_GNUC_BEGIN_IGNORE_DEPRECATIONS and
G_GNUC_END_IGNORE_DEPRECATIONS are not working. Redefine them
for clang in our glib compatibility wrapper.

Signed-off-by: Thomas Haller <thaller@redhat.com>
(cherry picked from commit e119e741)

We need more glib compatibility hacks. Rename the file to
give it a wider use.

Signed-off-by: Thomas Haller <thaller@redhat.com>
(cherry picked from commit 86a5c787)