gplugin/gplugin

Clean up some compiler warnings
develop
2018-05-05, Gary Kramlich
aeb671679760
Parents a57060969776
Children 46f92694369c
Clean up some compiler warnings
3 files changed, 13 insertions(+), 9 deletions(-)
  • +2 -2
    gplugin-gtk/gplugin-gtk-plugin-info.c
  • +2 -2
    gplugin/gplugin-manager.c
  • +9 -5
    gplugin/gplugin-plugin.c
    • --- a/gplugin-gtk/gplugin-gtk-plugin-info.c Mon Oct 23 20:45:22 2017 -0500
    +++ b/gplugin-gtk/gplugin-gtk-plugin-info.c Sat May 05 17:22:39 2018 -0500
    @@ -314,7 +314,7 @@
    g_object_unref(G_OBJECT(priv->plugin));
    if(GPLUGIN_IS_PLUGIN(plugin))
    - priv->plugin = g_object_ref(G_OBJECT(plugin));
    + priv->plugin = GPLUGIN_PLUGIN(g_object_ref(G_OBJECT(plugin)));
    else
    priv->plugin = NULL;
    @@ -338,6 +338,6 @@
    priv = GPLUGIN_GTK_PLUGIN_INFO_GET_PRIVATE(info);
    - return (priv->plugin) ? g_object_ref(G_OBJECT(priv->plugin)) : NULL;
    + return (priv->plugin) ? GPLUGIN_PLUGIN(g_object_ref(G_OBJECT(priv->plugin))) : NULL;
    }
    --- a/gplugin/gplugin-manager.c Mon Oct 23 20:45:22 2017 -0500
    +++ b/gplugin/gplugin-manager.c Sat May 05 17:22:39 2018 -0500
    @@ -639,7 +639,7 @@
    * version.
    */
    for(m = matches; m; m = m->next) {
    - GPluginPlugin *dplugin = g_object_ref(G_OBJECT(m->data));
    + GPluginPlugin *dplugin = GPLUGIN_PLUGIN(g_object_ref(G_OBJECT(m->data)));
    gboolean ret = FALSE;
    if(oop && over) {
    @@ -1322,7 +1322,7 @@
    if(plugins_list == NULL)
    return NULL;
    - plugin = g_object_ref(G_OBJECT(plugins_list->data));
    + plugin = GPLUGIN_PLUGIN(g_object_ref(G_OBJECT(plugins_list->data)));
    gplugin_manager_free_plugin_list(plugins_list);
    --- a/gplugin/gplugin-plugin.c Mon Oct 23 20:45:22 2017 -0500
    +++ b/gplugin/gplugin-plugin.c Sat May 05 17:22:39 2018 -0500
    @@ -96,7 +96,7 @@
    g_object_unref(G_OBJECT(priv->loader));
    if(GPLUGIN_IS_LOADER(loader))
    - priv->loader = g_object_ref(G_OBJECT(loader));
    + priv->loader = GPLUGIN_LOADER(g_object_ref(G_OBJECT(loader)));
    else
    priv->loader = NULL;
    }
    @@ -105,10 +105,14 @@
    gplugin_plugin_set_info(GPluginPlugin *plugin, GPluginPluginInfo *info) {
    GPluginPluginPrivate *priv = GPLUGIN_PLUGIN_GET_PRIVATE(plugin);
    - if(priv->info)
    + if(priv->info) {
    g_object_unref(G_OBJECT(priv->info));
    + priv->info = NULL;
    + }
    - priv->info = (info) ? g_object_ref(G_OBJECT(info)) : NULL;
    + if(info) {
    + priv->info = GPLUGIN_PLUGIN_INFO(g_object_ref(G_OBJECT(info)));
    + }
    }
    gchar *
    @@ -332,7 +336,7 @@
    priv = GPLUGIN_PLUGIN_GET_PRIVATE(plugin);
    - return (priv->info) ? g_object_ref(G_OBJECT(priv->loader)) : NULL;
    + return (priv->info) ? GPLUGIN_LOADER(g_object_ref(G_OBJECT(priv->loader))) : NULL;
    }
    /**
    @@ -349,7 +353,7 @@
    priv = GPLUGIN_PLUGIN_GET_PRIVATE(plugin);
    - return (priv->info) ? g_object_ref(G_OBJECT(priv->info)) : NULL;
    + return (priv->info) ? GPLUGIN_PLUGIN_INFO(g_object_ref(G_OBJECT(priv->info))) : NULL;
    }
    /**