grim/gplugin

Correct manual formatting to new style
develop
2020-02-15, Richard Laager
93144a270d45
Parents 2784a9d26c2f
Children d87c806b1f05
Correct manual formatting to new style
12 files changed, 102 insertions(+), 80 deletions(-)
  • +13 -12
    gplugin-gtk/gplugin-gtk-plugin-info.c
  • +5 -4
    gplugin-gtk/gplugin-gtk-store.c
  • +6 -3
    gplugin-gtk/gplugin-gtk-view.c
  • +9 -8
    gplugin/gplugin-native-loader.c
  • +5 -4
    gplugin/gplugin-plugin-info.h
  • +17 -16
    gplugin/gplugin-query.c
  • +2 -3
    gplugin/reference/native-plugins.xml
  • +19 -8
    gplugin/tests/test-plugin-info.c
  • +7 -6
    lua/gplugin-lua-loader.c
  • +9 -8
    python/gplugin-python-loader.c
  • +2 -1
    tcc/gplugin-tcc-core.c
  • +8 -7
    tcc/gplugin-tcc-loader.c
    • --- a/gplugin-gtk/gplugin-gtk-plugin-info.c Sat Feb 15 19:06:26 2020 -0600
    +++ b/gplugin-gtk/gplugin-gtk-plugin-info.c Sat Feb 15 19:17:01 2020 -0600
    @@ -126,18 +126,19 @@
    }
    /* clang-format off */
    - g_object_get(G_OBJECT(plugin_info),
    - "abi_version", &abi_version_uint,
    - "authors", &authors,
    - "summary", &summary,
    - "description", &description,
    - "id", &id,
    - "internal", &internal,
    - "load-on-query", &loq,
    - "name", &name,
    - "version", &version,
    - "website", &website,
    - NULL);
    + g_object_get(
    + G_OBJECT(plugin_info),
    + "abi_version", &abi_version_uint,
    + "authors", &authors,
    + "summary", &summary,
    + "description", &description,
    + "id", &id,
    + "internal", &internal,
    + "load-on-query", &loq,
    + "name", &name,
    + "version", &version,
    + "website", &website,
    + NULL);
    /* clang-format on */
    /* fanagle the plugin name */
    --- a/gplugin-gtk/gplugin-gtk-store.c Sat Feb 15 19:06:26 2020 -0600
    +++ b/gplugin-gtk/gplugin-gtk-store.c Sat Feb 15 19:17:01 2020 -0600
    @@ -77,10 +77,11 @@
    gchar *name = NULL, *summary = NULL;
    /* clang-format off */
    - g_object_get(G_OBJECT(info),
    - "name", &name,
    - "summary", &summary,
    - NULL);
    + g_object_get(
    + G_OBJECT(info),
    + "name", &name,
    + "summary", &summary,
    + NULL);
    /* clang-format on */
    g_string_append_printf(str, "<b>%s</b>\n",
    --- a/gplugin-gtk/gplugin-gtk-view.c Sat Feb 15 19:06:26 2020 -0600
    +++ b/gplugin-gtk/gplugin-gtk-view.c Sat Feb 15 19:17:01 2020 -0600
    @@ -241,9 +241,12 @@
    GObject *ret = NULL;
    GPluginGtkStore *store = gplugin_gtk_store_new();
    - ret = g_object_new(GPLUGIN_GTK_TYPE_VIEW,
    - "model", GTK_TREE_MODEL(store),
    - NULL);
    + /* clang-format off */
    + ret = g_object_new(
    + GPLUGIN_GTK_TYPE_VIEW,
    + "model", GTK_TREE_MODEL(store),
    + NULL);
    + /* clang-format on */
    return GTK_WIDGET(ret);
    }
    --- a/gplugin/gplugin-native-loader.c Sat Feb 15 19:06:26 2020 -0600
    +++ b/gplugin/gplugin-native-loader.c Sat Feb 15 19:17:01 2020 -0600
    @@ -227,14 +227,15 @@
    /* now create the actual plugin instance */
    /* clang-format off */
    - plugin = g_object_new(GPLUGIN_TYPE_NATIVE_PLUGIN,
    - "module", module,
    - "info", info,
    - "load-func", load,
    - "unload-func", unload,
    - "loader", loader,
    - "filename", filename,
    - NULL);
    + plugin = g_object_new(
    + GPLUGIN_TYPE_NATIVE_PLUGIN,
    + "module", module,
    + "info", info,
    + "load-func", load,
    + "unload-func", unload,
    + "loader", loader,
    + "filename", filename,
    + NULL);
    /* clang-format on */
    /* now that the plugin instance owns the info, remove our ref */
    --- a/gplugin/gplugin-plugin-info.h Sat Feb 15 19:06:26 2020 -0600
    +++ b/gplugin/gplugin-plugin-info.h Sat Feb 15 19:17:01 2020 -0600
    @@ -42,10 +42,11 @@
    /* clang-format off */
    #define gplugin_plugin_info_new(id, abi_version, ...) \
    - GPLUGIN_PLUGIN_INFO(g_object_new(GPLUGIN_TYPE_PLUGIN_INFO, \
    - "id", (id), \
    - "abi-version", (abi_version), \
    - __VA_ARGS__))
    + GPLUGIN_PLUGIN_INFO(g_object_new( \
    + GPLUGIN_TYPE_PLUGIN_INFO, \
    + "id", (id), \
    + "abi-version", (abi_version), \
    + __VA_ARGS__))
    /* clang-format on */
    const gchar *gplugin_plugin_info_get_id(GPluginPluginInfo *info);
    --- a/gplugin/gplugin-query.c Sat Feb 15 19:06:26 2020 -0600
    +++ b/gplugin/gplugin-query.c Sat Feb 15 19:17:01 2020 -0600
    @@ -131,22 +131,23 @@
    }
    /* clang-format off */
    - g_object_get(G_OBJECT(info),
    - "abi-version", &abi_version,
    - "load-on-query", &loq,
    - "name", &name,
    - "version", &version,
    - "license-id", &license_id,
    - "license-text", &license_text,
    - "license-url", &license_url,
    - "icon", &icon,
    - "summary", &summary,
    - "description", &description,
    - "category", &category,
    - "authors", &authors,
    - "website", &website,
    - "dependencies", &dependencies,
    - NULL);
    + g_object_get(
    + G_OBJECT(info),
    + "abi-version", &abi_version,
    + "load-on-query", &loq,
    + "name", &name,
    + "version", &version,
    + "license-id", &license_id,
    + "license-text", &license_text,
    + "license-url", &license_url,
    + "icon", &icon,
    + "summary", &summary,
    + "description", &description,
    + "category", &category,
    + "authors", &authors,
    + "website", &website,
    + "dependencies", &dependencies,
    + NULL);
    /* clang-format on */
    if(!first)
    --- a/gplugin/reference/native-plugins.xml Sat Feb 15 19:06:26 2020 -0600
    +++ b/gplugin/reference/native-plugins.xml Sat Feb 15 19:17:01 2020 -0600
    @@ -51,8 +51,7 @@
    "description", "description",
    "authors", authors,
    "website", "website",
    - NULL
    - );
    + NULL);
    }
    /* gplugin_plugin_load is called by the loader when the plugin should
    @@ -77,4 +76,4 @@
    </programlisting></informalexample>
    </para>
    </simplesect>
    -</chapter>
    \ No newline at end of file
    +</chapter>
    --- a/gplugin/tests/test-plugin-info.c Sat Feb 15 19:06:26 2020 -0600
    +++ b/gplugin/tests/test-plugin-info.c Sat Feb 15 19:17:01 2020 -0600
    @@ -87,7 +87,8 @@
    const gchar * const r_dependencies[] = { "dependency", NULL };
    /* clang-format off */
    - info = g_object_new(GPLUGIN_TYPE_PLUGIN_INFO,
    + info = g_object_new(
    + GPLUGIN_TYPE_PLUGIN_INFO,
    "id", "gplugin-test/plugin-info-test",
    "abi_version", GPLUGIN_NATIVE_PLUGIN_ABI_VERSION,
    "internal", TRUE,
    @@ -111,7 +112,8 @@
    g_assert_true(GPLUGIN_IS_PLUGIN_INFO(info));
    /* clang-format off */
    - g_object_get(G_OBJECT(info),
    + g_object_get(
    + G_OBJECT(info),
    "id", &id,
    "abi_version", &abi_version,
    "internal", &internal,
    @@ -164,10 +166,11 @@
    g_assert_true(GPLUGIN_IS_PLUGIN_INFO(info));
    /* clang-format off */
    - g_object_get(G_OBJECT(info),
    - "id", &id,
    - "abi-version", &abi_version,
    - NULL);
    + g_object_get(
    + G_OBJECT(info),
    + "id", &id,
    + "abi-version", &abi_version,
    + NULL);
    /* clang-format on */
    test_string(id, "empty");
    @@ -214,7 +217,8 @@
    g_assert_true(GPLUGIN_IS_PLUGIN_INFO(info));
    /* clang-format off */
    - g_object_get(G_OBJECT(info),
    + g_object_get(
    + G_OBJECT(info),
    "id", &id,
    "abi_version", &abi_version,
    "internal", &internal,
    @@ -263,11 +267,13 @@
    const gchar * const *g_authors = NULL;
    gint i;
    + /* clang-format off */
    info = gplugin_plugin_info_new(
    "test/single-author",
    GPLUGIN_NATIVE_PLUGIN_ABI_VERSION,
    "authors", authors,
    NULL);
    + /* clang-format on */
    g_authors = gplugin_plugin_info_get_authors(info);
    @@ -284,11 +290,13 @@
    const gchar * const *g_authors = NULL;
    gint i;
    + /* clang-format off */
    info = gplugin_plugin_info_new(
    "test/single-author",
    GPLUGIN_NATIVE_PLUGIN_ABI_VERSION,
    "authors", authors,
    NULL);
    + /* clang-format on */
    g_authors = gplugin_plugin_info_get_authors(info);
    @@ -306,11 +314,13 @@
    const gchar * const *g_dependencies = NULL;
    gint i;
    + /* clang-format off */
    info = gplugin_plugin_info_new(
    "test/single-dependency",
    GPLUGIN_NATIVE_PLUGIN_ABI_VERSION,
    "dependencies", dependencies,
    NULL);
    + /* clang-format on */
    g_dependencies = gplugin_plugin_info_get_dependencies(info);
    @@ -327,12 +337,13 @@
    const gchar * const *g_dependencies = NULL;
    gint i;
    -
    + /* clang-format off */
    info = gplugin_plugin_info_new(
    "test/single-dependencie",
    GPLUGIN_NATIVE_PLUGIN_ABI_VERSION,
    "dependencies", dependencies,
    NULL);
    + /* clang-format on */
    g_dependencies = gplugin_plugin_info_get_dependencies(info);
    --- a/lua/gplugin-lua-loader.c Sat Feb 15 19:06:26 2020 -0600
    +++ b/lua/gplugin-lua-loader.c Sat Feb 15 19:17:01 2020 -0600
    @@ -132,12 +132,13 @@
    lua_pop(L, 1);
    /* clang-format off */
    - plugin = g_object_new(GPLUGIN_LUA_TYPE_PLUGIN,
    - "filename", filename,
    - "loader", loader,
    - "lua-state", L,
    - "info", info,
    - NULL);
    + plugin = g_object_new(
    + GPLUGIN_LUA_TYPE_PLUGIN,
    + "filename", filename,
    + "loader", loader,
    + "lua-state", L,
    + "info", info,
    + NULL);
    /* clang-format on */
    return plugin;
    --- a/python/gplugin-python-loader.c Sat Feb 15 19:06:26 2020 -0600
    +++ b/python/gplugin-python-loader.c Sat Feb 15 19:17:01 2020 -0600
    @@ -170,14 +170,15 @@
    /* now that we have everything, create the plugin */
    /* clang-format off */
    - plugin = g_object_new(GPLUGIN_PYTHON_TYPE_PLUGIN,
    - "filename", filename,
    - "loader", loader,
    - "module", module,
    - "info", info,
    - "load-func", load,
    - "unload-func", unload,
    - NULL);
    + plugin = g_object_new(
    + GPLUGIN_PYTHON_TYPE_PLUGIN,
    + "filename", filename,
    + "loader", loader,
    + "module", module,
    + "info", info,
    + "load-func", load,
    + "unload-func", unload,
    + NULL);
    /* clang-format on */
    Py_DECREF(pyinfo);
    --- a/tcc/gplugin-tcc-core.c Sat Feb 15 19:06:26 2020 -0600
    +++ b/tcc/gplugin-tcc-core.c Sat Feb 15 19:17:01 2020 -0600
    @@ -41,7 +41,8 @@
    "version", GPLUGIN_VERSION,
    "license-id", "LGPL-2.0-or-later",
    "summary", "A plugin that can load C source plugins",
    - "description", "This plugin allows the loading of plugins written in C.",
    + "description", "This plugin allows the loading of plugins written in "
    + "C.",
    "authors", authors,
    "website", GPLUGIN_WEBSITE,
    "category", "loaders",
    --- a/tcc/gplugin-tcc-loader.c Sat Feb 15 19:06:26 2020 -0600
    +++ b/tcc/gplugin-tcc-loader.c Sat Feb 15 19:17:01 2020 -0600
    @@ -99,13 +99,14 @@
    }
    /* clang-format off */
    - plugin = g_object_new(GPLUGIN_TCC_TYPE_PLUGIN,
    - "filename", filename,
    - "loader", loader,
    - "state", s,
    - "memory", memneeded,
    - "info", info,
    - NULL);
    + plugin = g_object_new(
    + GPLUGIN_TCC_TYPE_PLUGIN,
    + "filename", filename,
    + "loader", loader,
    + "state", s,
    + "memory", memneeded,
    + "info", info,
    + NULL);
    /* clang-format on */
    return plugin;