diff options
| author | Jeremy Bicha <jbicha@ubuntu.com> | 2018-05-11 19:02:28 -0400 |
|---|---|---|
| committer | Jeremy Bicha <jbicha@ubuntu.com> | 2018-05-11 19:02:28 -0400 |
| commit | ee7f1100500dc431a6e8bf1e6efb2d41445fd28f (patch) | |
| tree | 3eef32d0e8412f4d2126a9be5820c85d387e313c /shared | |
| parent | 01bf2f7e474588126875a29125a1e248d7ae18db (diff) | |
| parent | 680d3db45106e7a18665a366e1b57e58cef61506 (diff) | |
Merge tag 'debian/1.10.8-1' into cosmic
network-manager Debian release 1.10.8-1
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/nm-utils/nm-dedup-multi.c | 4 | ||||
| -rw-r--r-- | shared/nm-utils/nm-dedup-multi.h | 2 | ||||
| -rw-r--r-- | shared/nm-utils/nm-udev-utils.c | 2 | ||||
| -rw-r--r-- | shared/nm-version-macros.h | 7 | ||||
| -rw-r--r-- | shared/nm-version-macros.h.in | 5 |
5 files changed, 10 insertions, 10 deletions
diff --git a/shared/nm-utils/nm-dedup-multi.c b/shared/nm-utils/nm-dedup-multi.c index ee310a7b..59b647ed 100644 --- a/shared/nm-utils/nm-dedup-multi.c +++ b/shared/nm-utils/nm-dedup-multi.c @@ -877,7 +877,7 @@ nm_dedup_multi_index_obj_intern (NMDedupMultiIndex *self, return obj_new; } -const NMDedupMultiObj * +void nm_dedup_multi_obj_unref (const NMDedupMultiObj *obj) { if (obj) { @@ -899,8 +899,6 @@ again: obj->klass->obj_destroy ((NMDedupMultiObj *) obj); } } - - return NULL; } gboolean diff --git a/shared/nm-utils/nm-dedup-multi.h b/shared/nm-utils/nm-dedup-multi.h index bebfe43d..6286d6a4 100644 --- a/shared/nm-utils/nm-dedup-multi.h +++ b/shared/nm-utils/nm-dedup-multi.h @@ -97,7 +97,7 @@ nm_dedup_multi_obj_ref (const NMDedupMultiObj *obj) return obj; } -const NMDedupMultiObj *nm_dedup_multi_obj_unref (const NMDedupMultiObj *obj); +void nm_dedup_multi_obj_unref (const NMDedupMultiObj *obj); const NMDedupMultiObj *nm_dedup_multi_obj_clone (const NMDedupMultiObj *obj); gboolean nm_dedup_multi_obj_needs_clone (const NMDedupMultiObj *obj); diff --git a/shared/nm-utils/nm-udev-utils.c b/shared/nm-utils/nm-udev-utils.c index 79d4426d..709f7590 100644 --- a/shared/nm-utils/nm-udev-utils.c +++ b/shared/nm-utils/nm-udev-utils.c @@ -257,7 +257,7 @@ nm_udev_client_new (const char *const*subsystems, channel = g_io_channel_unix_new (udev_monitor_get_fd (self->monitor)); self->watch_source = g_io_create_watch (channel, G_IO_IN); g_io_channel_unref (channel); - g_source_set_callback (self->watch_source, (GSourceFunc) monitor_event, self, NULL); + g_source_set_callback (self->watch_source, (GSourceFunc)(void (*) (void)) monitor_event, self, NULL); g_source_attach (self->watch_source, g_main_context_get_thread_default ()); g_source_unref (self->watch_source); } diff --git a/shared/nm-version-macros.h b/shared/nm-version-macros.h index b309997c..2ef9960b 100644 --- a/shared/nm-version-macros.h +++ b/shared/nm-version-macros.h @@ -45,7 +45,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (6) +#define NM_MICRO_VERSION (8) /** * NM_CHECK_VERSION: @@ -75,9 +75,10 @@ #define NM_VERSION_1_10_2 (NM_ENCODE_VERSION (1, 10, 2)) #define NM_VERSION_1_10_4 (NM_ENCODE_VERSION (1, 10, 4)) #define NM_VERSION_1_10_6 (NM_ENCODE_VERSION (1, 10, 6)) +#define NM_VERSION_1_10_8 (NM_ENCODE_VERSION (1, 10, 8)) -#define NM_VERSION_CUR_STABLE NM_VERSION_1_10_6 -#define NM_VERSION_NEXT_STABLE NM_VERSION_1_10_6 +#define NM_VERSION_CUR_STABLE NM_VERSION_1_10_8 +#define NM_VERSION_NEXT_STABLE NM_VERSION_1_10_8 #define NM_VERSION NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION, NM_MICRO_VERSION) diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in index f92bed82..cb1d545a 100644 --- a/shared/nm-version-macros.h.in +++ b/shared/nm-version-macros.h.in @@ -75,9 +75,10 @@ #define NM_VERSION_1_10_2 (NM_ENCODE_VERSION (1, 10, 2)) #define NM_VERSION_1_10_4 (NM_ENCODE_VERSION (1, 10, 4)) #define NM_VERSION_1_10_6 (NM_ENCODE_VERSION (1, 10, 6)) +#define NM_VERSION_1_10_8 (NM_ENCODE_VERSION (1, 10, 8)) -#define NM_VERSION_CUR_STABLE NM_VERSION_1_10_6 -#define NM_VERSION_NEXT_STABLE NM_VERSION_1_10_6 +#define NM_VERSION_CUR_STABLE NM_VERSION_1_10_8 +#define NM_VERSION_NEXT_STABLE NM_VERSION_1_10_8 #define NM_VERSION NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION, NM_MICRO_VERSION) |