[network-manager-pptp] Fix passing "user" field and add passing "remotename"

[Thomas Haller <thaller src gnome org>]

commit ab6a989f424b84e26167634238392e43d601ff89
Author: Alexander S. Salieff <salieff mail ru>
Date:   Mon Mar 26 15:24:56 2018 +0300

    Fix passing "user" field and add passing "remotename"
    
    https://bugzilla.gnome.org/show_bug.cgi?id=794695
    https://bugzilla.redhat.com/show_bug.cgi?id=1546583

 src/nm-pptp-service.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/src/nm-pptp-service.c b/src/nm-pptp-service.c
index 1710fd9..8865653 100644
--- a/src/nm-pptp-service.c
+++ b/src/nm-pptp-service.c
@@ -497,11 +497,17 @@ construct_pppd_args (NMPptpPlugin *plugin,
        value = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_USER);
        if (!value || !*value)
                value = nm_setting_vpn_get_user_name (s_vpn);
-       if (!value || !*value) {
+       if (value && *value) {
                g_ptr_array_add (args, (gpointer) g_strdup ("user"));
                g_ptr_array_add (args, (gpointer) g_strdup (value));
        }
 
+       value = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_GATEWAY);
+       if (value && *value) {
+               g_ptr_array_add (args, (gpointer) g_strdup ("remotename"));
+               g_ptr_array_add (args, (gpointer) g_strdup (value));
+       }
+
        value = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_REFUSE_EAP);
        if (value && !strcmp (value, "yes"))
                g_ptr_array_add (args, (gpointer) g_strdup ("refuse-eap"));