From 2bfb3eb7d0323e69affca154395f51d8b577414d Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Wed, 6 Apr 2016 00:46:19 +0200
Subject: Imported Upstream version 1.1.93

---
 src/settings/plugins/ifcfg-rh/Makefile.am          |  1 -
 src/settings/plugins/ifcfg-rh/Makefile.in          |  1 -
 .../plugins/ifcfg-rh/nm-ifcfg-connection.c         |  1 +
 src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml      | 50 ++++++++++------------
 src/settings/plugins/ifcfg-rh/tests/Makefile.am    |  1 -
 src/settings/plugins/ifcfg-rh/tests/Makefile.in    |  1 -
 6 files changed, 24 insertions(+), 31 deletions(-)

(limited to 'src/settings/plugins/ifcfg-rh')

diff --git a/src/settings/plugins/ifcfg-rh/Makefile.am b/src/settings/plugins/ifcfg-rh/Makefile.am
index ab96a328..d2899a26 100644
--- a/src/settings/plugins/ifcfg-rh/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/Makefile.am
@@ -48,7 +48,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/libnm-core \
 	-I$(top_builddir)/libnm-core \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 	$(GLIB_CFLAGS) \
 	$(NSS_CFLAGS) \
 	-DG_LOG_DOMAIN=\""NetworkManager-ifcfg-rh"\" \
diff --git a/src/settings/plugins/ifcfg-rh/Makefile.in b/src/settings/plugins/ifcfg-rh/Makefile.in
index 3fc3495a..54a2b805 100644
--- a/src/settings/plugins/ifcfg-rh/Makefile.in
+++ b/src/settings/plugins/ifcfg-rh/Makefile.in
@@ -566,7 +566,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/libnm-core \
 	-I$(top_builddir)/libnm-core \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 	$(GLIB_CFLAGS) \
 	$(NSS_CFLAGS) \
 	-DG_LOG_DOMAIN=\""NetworkManager-ifcfg-rh"\" \
diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
index 2ee5a0b9..b9bbf6d5 100644
--- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
+++ b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
@@ -369,6 +369,7 @@ replace_and_commit (NMSettingsConnection *connection,
 			callback (connection, error, user_data);
 			g_clear_error (&error);
 		}
+		return;
 	}
 
 	NM_SETTINGS_CONNECTION_CLASS (nm_ifcfg_connection_parent_class)->replace_and_commit (connection, new_connection, callback, user_data);
diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml b/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
index c2a6cb34..033fbfaa 100644
--- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
+++ b/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
@@ -1,30 +1,26 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
 
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-    <interface name="com.redhat.ifcfgrh1">
-      <annotation name="org.gtk.GDBus.DocString" value="
-          Utility methods for handling NM integration with standard Red Hat ifcfg files.
-      " />
+  <!--
+      com.redhat.ifcfgrh1:
 
-      <method name="GetIfcfgDetails">
-        <annotation name="org.gtk.GDBus.DocString" value="
-          Given an ifcfg file, return various internal information about it.
-        " />
-        <arg name="ifcfg" type="s" direction="in">
-          <annotation name="org.gtk.GDBus.DocString" value="
-            The full path to an ifcfg file.
-          " />
-        </arg>
-        <arg name="uuid" type="s" direction="out">
-          <annotation name="org.gtk.GDBus.DocString" value="
-            The UUID of the NM connection backed by this ifcfg file.  If the ifcfg file does not contain a UUID tag, this UUID is generated by NM, otherwise the UUID from the ifcfg file is used.
-          " />
-        </arg>
-        <arg name="path" type="o" direction="out">
-          <annotation name="org.gtk.GDBus.DocString" value="
-            The object path of the NM connected backed by this ifcfg file.
-          " />
-        </arg>
-      </method>
-    </interface>
+      Utility methods for handling NM integration with standard Red Hat ifcfg
+      files.
+  -->
+  <interface name="com.redhat.ifcfgrh1">
+
+    <!--
+        GetIfcfgDetails:
+        @ifcfg: The full path to an ifcfg file.
+        @uuid: The UUID of the NM connection backed by this ifcfg file. If the ifcfg file does not contain a UUID tag, this UUID is generated by NM, otherwise the UUID from the ifcfg file is used.
+        @path: The object path of the NM connected backed by this ifcfg file.
+
+        Given an ifcfg file, return various internal information about it.
+    -->
+    <method name="GetIfcfgDetails">
+      <arg name="ifcfg" type="s" direction="in"/>
+      <arg name="uuid" type="s" direction="out"/>
+      <arg name="path" type="o" direction="out"/>
+    </method>
+  </interface>
 </node>
diff --git a/src/settings/plugins/ifcfg-rh/tests/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
index 25d27197..73ddfeef 100644
--- a/src/settings/plugins/ifcfg-rh/tests/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
@@ -17,7 +17,6 @@ AM_CPPFLAGS = \
 	-I$(srcdir)/../ \
 	-DG_LOG_DOMAIN=\""NetworkManager-ifcfg-rh"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 	-DTEST_IFCFG_DIR=\"$(abs_srcdir)\" \
 	-DTEST_SCRATCH_DIR=\"$(abs_builddir)/\" \
 	-DSYSCONFDIR=\"nonexistent\" \
diff --git a/src/settings/plugins/ifcfg-rh/tests/Makefile.in b/src/settings/plugins/ifcfg-rh/tests/Makefile.in
index 00636de9..d822e2e1 100644
--- a/src/settings/plugins/ifcfg-rh/tests/Makefile.in
+++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.in
@@ -721,7 +721,6 @@ with_valgrind = @with_valgrind@
 @ENABLE_TESTS_TRUE@	-I$(srcdir)/../ \
 @ENABLE_TESTS_TRUE@	-DG_LOG_DOMAIN=\""NetworkManager-ifcfg-rh"\" \
 @ENABLE_TESTS_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-@ENABLE_TESTS_TRUE@	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 @ENABLE_TESTS_TRUE@	-DTEST_IFCFG_DIR=\"$(abs_srcdir)\" \
 @ENABLE_TESTS_TRUE@	-DTEST_SCRATCH_DIR=\"$(abs_builddir)/\" \
 @ENABLE_TESTS_TRUE@	-DSYSCONFDIR=\"nonexistent\" \
-- 
cgit 1.3.0-6-gf8a5