diff options
| author | Colin Walters <walters@verbum.org> | 2017-12-05 10:44:12 -0500 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-12-06 10:34:28 +0100 |
| commit | 3f6bef47f33c3422270b569f8d897dc5596e963c (patch) | |
| tree | 76b76ba6dba739398d139f3c39e17b74b2ce2753 | |
| parent | b0de9cd2099ef19814237e6d00cde1ffbc622116 (diff) | |
| download | NetworkManager-3f6bef47f33c3422270b569f8d897dc5596e963c.tar.gz | |
tree-wide: cast after g_object_ref() for proposed GLib patch
This fixes the build with related bug https://bugzilla.gnome.org/show_bug.cgi?id=790697
https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00005.html
| -rw-r--r-- | libnm-glib/nm-remote-connection.c | 6 | ||||
| -rw-r--r-- | src/settings/plugins/ibft/nms-ibft-plugin.c | 2 | ||||
| -rw-r--r-- | 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 d147365b79..b9abf4c4ce 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 9b1f5ccd00..77ed12e964 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 8ad3a53f3d..50146e8e7b 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c @@ -1080,5 +1080,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 ()); } |