gplugin/gplugin

merging
develop
2018-05-07, Gary Kramlich
e7100985be3f
Parents 7a1235fb3df0bb4e164f791a
Children 07ba62616ebf
merging
2 files changed, 4 insertions(+), 3 deletions(-)
  • +1 -3
    gplugin/gplugin-manager.c
  • +3 -0
    python/gplugin-python-loader.c
    • --- a/gplugin/gplugin-manager.c Sun May 06 17:06:40 2018 -0500
    +++ b/gplugin/gplugin-manager.c Mon May 07 21:00:13 2018 -0500
    @@ -307,9 +307,7 @@
    for(l = los; l; l = l->next) {
    GPluginLoader *lo = GPLUGIN_LOADER(l->data);
    - if(!GPLUGIN_IS_LOADER(lo))
    - continue;
    -
    + /* check if this is not the loader we're looking for */
    if(G_OBJECT_TYPE(lo) != type)
    continue;
    --- a/python/gplugin-python-loader.c Sun May 06 17:06:40 2018 -0500
    +++ b/python/gplugin-python-loader.c Mon May 07 21:00:13 2018 -0500
    @@ -325,6 +325,9 @@
    len = mbstowcs(argv[0], program, len + 1);
    if(len == (size_t)-1) {
    g_warning("Could not convert program name to wchar_t string.");
    +
    + g_free(argv[0]);
    +
    return FALSE;
    }