[network-manager-openvpn/th/export-bgo764132: 5/27] fixup! properties: refactor export code to properly escape strings

[Thomas Haller <thaller src gnome org>]

commit 59d2f14ac7a54b3c5ff3f5f1580401adbb4eedd2
Author: Thomas Haller <thaller redhat com>
Date:   Fri Mar 25 20:37:10 2016 +0100

    fixup! properties: refactor export code to properly escape strings

 properties/import-export.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/properties/import-export.c b/properties/import-export.c
index 664cc27..06b317a 100644
--- a/properties/import-export.c
+++ b/properties/import-export.c
@@ -1830,12 +1830,9 @@ do_export (const char *path, NMConnection *connection, GError **error)
                                 "remote",
                                 *gw_iter,
                                 tmp_port
-                                    ? tmp_port
-                                    : (tmp_proto
-                                           ? (!strcmp (tmp_proto, "udp")
-                                                  ? "1194"
-                                                  : "443")
-                                           : NULL),
+                                    ?: (tmp_proto
+                                            ? (nm_streq (tmp_proto, "udp") ? "1194" : "443")
+                                            : NULL),
                                 tmp_proto);
        }
        g_strfreev (gw_list);