This fixes the build with https://bugzilla.gnome.org/show_bug.cgi?id=790697 --- libnm-glib/nm-remote-connection.c | 6 +++--- src/settings/plugins/ibft/nms-ibft-plugin.c | 2 +- src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
From 21d75a518e5feaa18e89f53762478f94fbcef233 Mon Sep 17 00:00:00 2001 From: Colin Walters <[email protected]> Date: Tue, 5 Dec 2017 10:44:12 -0500 Subject: [PATCH] tree-wide: Cast after g_object_ref() for proposed GLib patch This fixes the build with https://bugzilla.gnome.org/show_bug.cgi?id=790697 --- libnm-glib/nm-remote-connection.c | 6 +++--- src/settings/plugins/ibft/nms-ibft-plugin.c | 2 +- src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c index d147365b7..b9abf4c4c 100644 --- a/libnm-glib/nm-remote-connection.c +++ b/libnm-glib/nm-remote-connection.c @@ -479,7 +479,7 @@ updated_get_settings_cb (DBusGProxy *proxy, } else { gs_unref_object NMConnection *self_alive = NULL; - self_alive = g_object_ref (self); + self_alive = (NMConnection*)g_object_ref (self); _nm_connection_replace_settings (NM_CONNECTION (self), new_settings); g_signal_emit (self, signals[UPDATED], 0, new_settings); g_hash_table_destroy (new_settings); @@ -611,7 +611,7 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error) G_TYPE_INVALID)) return FALSE; priv->visible = TRUE; - self_alive = g_object_ref (initable); + self_alive = (NMConnection*)g_object_ref (initable); _nm_connection_replace_settings (NM_CONNECTION (initable), hash); g_signal_emit (initable, signals[UPDATED], 0, hash); g_hash_table_destroy (hash); @@ -687,7 +687,7 @@ init_get_settings_cb (DBusGProxy *proxy, } priv->visible = TRUE; - self_alive = g_object_ref (init_data->connection); + self_alive = (NMConnection*)g_object_ref (init_data->connection); _nm_connection_replace_settings (NM_CONNECTION (init_data->connection), settings); g_signal_emit (init_data->connection, signals[UPDATED], 0, settings); g_hash_table_destroy (settings); diff --git a/src/settings/plugins/ibft/nms-ibft-plugin.c b/src/settings/plugins/ibft/nms-ibft-plugin.c index 9b1f5ccd0..77ed12e96 100644 --- a/src/settings/plugins/ibft/nms-ibft-plugin.c +++ b/src/settings/plugins/ibft/nms-ibft-plugin.c @@ -202,5 +202,5 @@ settings_plugin_interface_init (NMSettingsPluginInterface *plugin_iface) G_MODULE_EXPORT GObject * nm_settings_plugin_factory (void) { - return g_object_ref (nms_ibft_plugin_get ()); + return (GObject*)g_object_ref (nms_ibft_plugin_get ()); } diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c index 1ebdeafa7..0c59f32e1 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c @@ -1079,5 +1079,5 @@ settings_plugin_interface_init (NMSettingsPluginInterface *plugin_iface) G_MODULE_EXPORT GObject * nm_settings_plugin_factory (void) { - return g_object_ref (settings_plugin_ifcfg_get ()); + return (GObject*)g_object_ref (settings_plugin_ifcfg_get ()); } -- 2.14.3
_______________________________________________ networkmanager-list mailing list [email protected] https://mail.gnome.org/mailman/listinfo/networkmanager-list
