From f408e27bccfacf347605a8d98649975a68f38a17 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 5 May 2015 17:48:57 +0200 Subject: Imported Upstream version 1.0.2 --- libnm/Makefile.in | 36 ++++++++++++++++++++----------- libnm/libnm.pc.in | 2 +- libnm/nm-client.c | 2 +- libnm/nm-dbus-helpers.c | 1 + libnm/nm-dhcp6-config.c | 2 +- libnm/nm-ifcfg-rh-docs.xml | 6 +++++- libnm/nm-manager.c | 2 +- libnm/nm-object.c | 33 +++++++++++++++------------- libnm/nm-property-docs.xml | 28 ++++++++++++------------ libnm/nm-secret-agent-old.c | 2 +- libnm/nm-setting-docs.xml | 28 ++++++++++++------------ libnm/tests/Makefile.am | 8 ++++--- libnm/tests/Makefile.in | 34 ++++++++++++++++++++--------- libnm/tests/test-remote-settings-client.c | 6 +++--- libnm/tests/test-secret-agent.c | 10 ++++----- 15 files changed, 118 insertions(+), 82 deletions(-) (limited to 'libnm') diff --git a/libnm/Makefile.in b/libnm/Makefile.in index 6e1fad47..dd9a5952 100644 --- a/libnm/Makefile.in +++ b/libnm/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -21,7 +21,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -84,10 +94,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/libnm-core/Makefile.libnm-core \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/libnm.pc.in $(top_srcdir)/build-aux/depcomp \ - $(libnminclude_HEADERS) @HAVE_INTROSPECTION_TRUE@am__append_1 = NM-1.0.gir @HAVE_INTROSPECTION_TRUE@am__append_2 = $(gir_DATA) $(typelib_DATA) @BUILD_SETTING_DOCS_TRUE@am__append_3 = $(noinst_DATA) @@ -109,6 +115,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \ $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(libnminclude_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = libnm.pc @@ -251,6 +259,9 @@ am__define_uniq_tagged_files = \ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/libnm.pc.in \ + $(top_srcdir)/build-aux/depcomp \ + $(top_srcdir)/libnm-core/Makefile.libnm-core DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -302,7 +313,6 @@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DBUS_CFLAGS = @DBUS_CFLAGS@ DBUS_GLIB_100_CFLAGS = @DBUS_GLIB_100_CFLAGS@ DBUS_GLIB_100_LIBS = @DBUS_GLIB_100_LIBS@ @@ -337,6 +347,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -806,7 +817,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libnm/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu libnm/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -815,7 +825,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/libnm-core/Makefile.libnm-core: +$(top_srcdir)/libnm-core/Makefile.libnm-core $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -913,14 +923,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1312,6 +1322,8 @@ uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \ uninstall-libLTLIBRARIES uninstall-libnmincludeHEADERS \ uninstall-pkgconfigDATA uninstall-typelibDATA +.PRECIOUS: Makefile + include $(GLIB_MAKEFILE) -include $(INTROSPECTION_MAKEFILE) diff --git a/libnm/libnm.pc.in b/libnm/libnm.pc.in index 6392799a..5fe26b6a 100644 --- a/libnm/libnm.pc.in +++ b/libnm/libnm.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libnm Description: Convenience library for clients of NetworkManager Version: @VERSION@ -Requires: gio-2.0 dbus-glib-1 +Requires: gio-2.0 Cflags: -I${includedir}/libnm Libs: -L${libdir} -lnm diff --git a/libnm/nm-client.c b/libnm/nm-client.c index ef73e329..e0a2a7b4 100644 --- a/libnm/nm-client.c +++ b/libnm/nm-client.c @@ -471,7 +471,7 @@ nm_client_get_permission_result (NMClient *client, NMClientPermission permission NMConnectivityState nm_client_get_connectivity (NMClient *client) { - g_return_val_if_fail (NM_IS_CLIENT (client), NM_STATE_UNKNOWN); + g_return_val_if_fail (NM_IS_CLIENT (client), NM_CONNECTIVITY_UNKNOWN); return nm_manager_get_connectivity (NM_CLIENT_GET_PRIVATE (client)->manager); } diff --git a/libnm/nm-dbus-helpers.c b/libnm/nm-dbus-helpers.c index 7a99e70d..6bfd4bbd 100644 --- a/libnm/nm-dbus-helpers.c +++ b/libnm/nm-dbus-helpers.c @@ -349,6 +349,7 @@ _nm_dbus_bind_properties (gpointer object, gpointer skeleton) skeleton, properties[i]->name, G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); } + g_free (properties); } static char * diff --git a/libnm/nm-dhcp6-config.c b/libnm/nm-dhcp6-config.c index 0bd924c4..3b2e81f8 100644 --- a/libnm/nm-dhcp6-config.c +++ b/libnm/nm-dhcp6-config.c @@ -23,7 +23,7 @@ #include "nm-dhcp6-config.h" #include "nm-object-private.h" -G_DEFINE_TYPE (NMDhcp6Config, nm_dhcp6_config, NM_TYPE_OBJECT) +G_DEFINE_TYPE (NMDhcp6Config, nm_dhcp6_config, NM_TYPE_DHCP_CONFIG) static void nm_dhcp6_config_init (NMDhcp6Config *config) diff --git a/libnm/nm-ifcfg-rh-docs.xml b/libnm/nm-ifcfg-rh-docs.xml index 96ecfde8..438f4b71 100644 --- a/libnm/nm-ifcfg-rh-docs.xml +++ b/libnm/nm-ifcfg-rh-docs.xml @@ -11,7 +11,7 @@ - + @@ -146,6 +146,8 @@ but in route-* file instead."/> should not be assigned the default route. DEFROUTE has the opposite meaning as 'never-default' property."/> + @@ -166,6 +168,8 @@ but in route6-* file instead in the form of command line for 'ip route add& should not be assigned the default IPv6 route. IPV6_DEFROUTE has the opposite meaning as 'never-default' property."/> + diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c index 1abb5130..003d6b87 100644 --- a/libnm/nm-manager.c +++ b/libnm/nm-manager.c @@ -568,7 +568,7 @@ nm_manager_get_permission_result (NMManager *manager, NMClientPermission permiss NMConnectivityState nm_manager_get_connectivity (NMManager *manager) { - g_return_val_if_fail (NM_IS_MANAGER (manager), NM_STATE_UNKNOWN); + g_return_val_if_fail (NM_IS_MANAGER (manager), NM_CONNECTIVITY_UNKNOWN); return NM_MANAGER_GET_PRIVATE (manager)->connectivity; } diff --git a/libnm/nm-object.c b/libnm/nm-object.c index 391166b2..fbdbc1f6 100644 --- a/libnm/nm-object.c +++ b/libnm/nm-object.c @@ -625,7 +625,7 @@ typedef struct { GObject **objects; int length, remaining; - gboolean array; + GPtrArray *array; const char *property_name; } ObjectCreatedData; @@ -671,7 +671,8 @@ object_property_complete (ObjectCreatedData *odata) gboolean different = TRUE; if (odata->array) { - GPtrArray *old = *((GPtrArray **) pi->field); + GPtrArray *pi_old = *((GPtrArray **) pi->field); + GPtrArray *old = odata->array; GPtrArray *new; int i; @@ -684,16 +685,11 @@ object_property_complete (ObjectCreatedData *odata) GPtrArray *added = g_ptr_array_sized_new (3); GPtrArray *removed = g_ptr_array_sized_new (3); - if (old) { - /* Find objects in 'old' that do not exist in 'new' */ - array_diff (old, new, removed); + /* Find objects in 'old' that do not exist in 'new' */ + array_diff (old, new, removed); - /* Find objects in 'new' that do not exist in old */ - array_diff (new, old, added); - } else { - for (i = 0; i < new->len; i++) - g_ptr_array_add (added, g_ptr_array_index (new, i)); - } + /* Find objects in 'new' that do not exist in old */ + array_diff (new, old, added); *((GPtrArray **) pi->field) = new; @@ -726,8 +722,8 @@ object_property_complete (ObjectCreatedData *odata) /* Free old array last since it will release references, thus freeing * any objects in the 'removed' array. */ - if (old) - g_ptr_array_unref (old); + if (pi_old) + g_ptr_array_unref (pi_old); } else { GObject **obj_p = pi->field; @@ -745,6 +741,8 @@ object_property_complete (ObjectCreatedData *odata) g_object_unref (self); g_free (odata->objects); + if (odata->array) + g_ptr_array_unref (odata->array); g_slice_free (ObjectCreatedData, odata); } @@ -781,7 +779,7 @@ handle_object_property (NMObject *self, const char *property_name, GVariant *val odata->pi = pi; odata->objects = g_new (GObject *, 1); odata->length = odata->remaining = 1; - odata->array = FALSE; + odata->array = NULL; odata->property_name = property_name; priv->reload_remaining++; @@ -820,6 +818,7 @@ handle_object_array_property (NMObject *self, const char *property_name, GVarian GPtrArray **array = pi->field; const char *path; ObjectCreatedData *odata; + guint i, len = *array ? (*array)->len : 0; npaths = g_variant_n_children (value); @@ -828,9 +827,13 @@ handle_object_array_property (NMObject *self, const char *property_name, GVarian odata->pi = pi; odata->objects = g_new0 (GObject *, npaths); odata->length = odata->remaining = npaths; - odata->array = TRUE; odata->property_name = property_name; + /* Objects known at this point. */ + odata->array = g_ptr_array_new_full (len, g_object_unref); + for (i = 0; i < len; i++) + g_ptr_array_add (odata->array, g_object_ref (g_ptr_array_index (*array, i))); + priv->reload_remaining++; if (npaths == 0) { diff --git a/libnm/nm-property-docs.xml b/libnm/nm-property-docs.xml index 1520e0f9..5c84b7db 100644 --- a/libnm/nm-property-docs.xml +++ b/libnm/nm-property-docs.xml @@ -55,7 +55,7 @@ - + @@ -106,14 +106,14 @@ - - + + - + - - - + + + @@ -139,7 +139,7 @@ - + @@ -153,10 +153,10 @@ - + - + @@ -170,7 +170,7 @@ - + @@ -231,10 +231,10 @@ - + - + @@ -253,7 +253,7 @@ - + diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c index 606c4099..5da8ef65 100644 --- a/libnm/nm-secret-agent-old.c +++ b/libnm/nm-secret-agent-old.c @@ -556,7 +556,7 @@ nm_secret_agent_old_register (NMSecretAgentOld *self, */ if (nmdbus_agent_manager_call_register_sync (priv->manager_proxy, priv->identifier, - cancellable, NULL)) + cancellable, error)) goto success; /* Failure */ diff --git a/libnm/nm-setting-docs.xml b/libnm/nm-setting-docs.xml index 50acecf1..2e9814f8 100644 --- a/libnm/nm-setting-docs.xml +++ b/libnm/nm-setting-docs.xml @@ -56,7 +56,7 @@ - + @@ -108,14 +108,14 @@ - - + + - + - - - + + + @@ -142,7 +142,7 @@ - + @@ -157,11 +157,11 @@ - + - + @@ -176,7 +176,7 @@ - + @@ -239,10 +239,10 @@ - + - + @@ -261,7 +261,7 @@ - + diff --git a/libnm/tests/Makefile.am b/libnm/tests/Makefile.am index 38449fad..56dd17d5 100644 --- a/libnm/tests/Makefile.am +++ b/libnm/tests/Makefile.am @@ -17,6 +17,11 @@ LDADD = \ noinst_PROGRAMS = $(TESTS) +if WITH_VALGRIND +@VALGRIND_RULES@ --launch-dbus +else +TESTS_ENVIRONMENT = $(srcdir)/libnm-test-launch.sh +endif TESTS = test-nm-client test-remote-settings-client test-secret-agent test_nm_client_SOURCES = \ @@ -33,9 +38,6 @@ test_secret_agent_SOURCES = \ common.c \ common.h \ test-secret-agent.c - -TESTS_ENVIRONMENT = $(srcdir)/libnm-test-launch.sh - endif EXTRA_DIST = libnm-test-launch.sh diff --git a/libnm/tests/Makefile.in b/libnm/tests/Makefile.in index ab5f794c..631e3c53 100644 --- a/libnm/tests/Makefile.in +++ b/libnm/tests/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -83,8 +93,6 @@ host_triplet = @host@ @ENABLE_TESTS_TRUE@ test-remote-settings-client$(EXEEXT) \ @ENABLE_TESTS_TRUE@ test-secret-agent$(EXEEXT) subdir = libnm/tests -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \ $(top_srcdir)/m4/compiler_warnings.m4 \ @@ -101,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \ $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -228,6 +237,8 @@ am__tty_colors = { \ std=''; \ fi; \ } +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -254,7 +265,6 @@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DBUS_CFLAGS = @DBUS_CFLAGS@ DBUS_GLIB_100_CFLAGS = @DBUS_GLIB_100_CFLAGS@ DBUS_GLIB_100_LIBS = @DBUS_GLIB_100_LIBS@ @@ -289,6 +299,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -504,6 +515,7 @@ with_valgrind = @with_valgrind@ @ENABLE_TESTS_TRUE@ $(top_builddir)/libnm/libnm.la \ @ENABLE_TESTS_TRUE@ $(GLIB_LIBS) +@ENABLE_TESTS_TRUE@@WITH_VALGRIND_FALSE@TESTS_ENVIRONMENT = $(srcdir)/libnm-test-launch.sh @ENABLE_TESTS_TRUE@test_nm_client_SOURCES = \ @ENABLE_TESTS_TRUE@ common.c \ @ENABLE_TESTS_TRUE@ common.h \ @@ -519,7 +531,6 @@ with_valgrind = @with_valgrind@ @ENABLE_TESTS_TRUE@ common.h \ @ENABLE_TESTS_TRUE@ test-secret-agent.c -@ENABLE_TESTS_TRUE@TESTS_ENVIRONMENT = $(srcdir)/libnm-test-launch.sh EXTRA_DIST = libnm-test-launch.sh all: all-am @@ -537,7 +548,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libnm/tests/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu libnm/tests/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -593,14 +603,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -912,6 +922,10 @@ uninstall-am: mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + + +@ENABLE_TESTS_TRUE@@WITH_VALGRIND_TRUE@@VALGRIND_RULES@ --launch-dbus # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/libnm/tests/test-remote-settings-client.c b/libnm/tests/test-remote-settings-client.c index 8f9dc27f..15590fac 100644 --- a/libnm/tests/test-remote-settings-client.c +++ b/libnm/tests/test-remote-settings-client.c @@ -370,7 +370,7 @@ add_remove_cb (GObject *s, { NMRemoteConnection *connection; gboolean *done = user_data; - GError *error = NULL; + gs_free_error GError *error = NULL; connection = nm_client_add_connection_finish (client, result, &error); g_assert_error (error, NM_CLIENT_ERROR, NM_CLIENT_ERROR_OBJECT_CREATION_FAILED); @@ -426,7 +426,7 @@ add_bad_cb (GObject *s, gpointer user_data) { gboolean *done = user_data; - GError *error = NULL; + gs_free_error GError *error = NULL; remote = nm_client_add_connection_finish (client, result, &error); g_assert_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY); @@ -469,7 +469,7 @@ save_hostname_cb (GObject *s, gpointer user_data) { gboolean *done = user_data; - GError *error = NULL; + gs_free_error GError *error = NULL; nm_client_save_hostname_finish (client, result, &error); g_assert_no_error (error); diff --git a/libnm/tests/test-secret-agent.c b/libnm/tests/test-secret-agent.c index 0424b74e..037b5a81 100644 --- a/libnm/tests/test-secret-agent.c +++ b/libnm/tests/test-secret-agent.c @@ -354,7 +354,7 @@ connection_activated_none_cb (GObject *c, { TestSecretAgentData *sadata = user_data; NMActiveConnection *ac; - GError *error = NULL; + gs_free_error GError *error = NULL; ac = nm_client_activate_connection_finish (sadata->client, result, &error); g_assert_error (error, NM_AGENT_MANAGER_ERROR, NM_AGENT_MANAGER_ERROR_NO_SECRETS); @@ -399,8 +399,8 @@ connection_activated_no_secrets_cb (GObject *c, gpointer user_data) { TestSecretAgentData *sadata = user_data; - NMActiveConnection *ac; - GError *error = NULL; + gs_unref_object NMActiveConnection *ac = NULL; + gs_free_error GError *error = NULL; ac = nm_client_activate_connection_finish (sadata->client, result, &error); g_assert_error (error, NM_AGENT_MANAGER_ERROR, NM_AGENT_MANAGER_ERROR_NO_SECRETS); @@ -434,8 +434,8 @@ connection_activated_cancel_cb (GObject *c, gpointer user_data) { TestSecretAgentData *sadata = user_data; - NMActiveConnection *ac; - GError *error = NULL; + gs_unref_object NMActiveConnection *ac = NULL; + gs_free_error GError *error = NULL; ac = nm_client_activate_connection_finish (sadata->client, result, &error); g_assert_error (error, NM_AGENT_MANAGER_ERROR, NM_AGENT_MANAGER_ERROR_USER_CANCELED); -- cgit 1.3.0-6-gf8a5