Menu
▾
▴
[cutter-commit 04444] clear-code/cutter@df781af [master] Add missing "listener_" prefix
|
From: Kouhei S. <nul...@cl...> - 2014-01-19 08:53:14
|
Kouhei Sutou 2014-01-19 17:52:52 +0900 (Sun, 19 Jan 2014) New Revision: df781afc690ccc1aedabadc72c5f856a24fe4e00 https://github.com/clear-code/cutter/commit/df781afc690ccc1aedabadc72c5f856a24fe4e00 Message: Add missing "listener_" prefix Modified files: cutter/cut-contractor.c cutter/cut-contractor.h cutter/cut-main.c test/cutter/test-cut-contractor.c Modified: cutter/cut-contractor.c (+21 -15) =================================================================== --- cutter/cut-contractor.c 2014-01-19 16:23:55 +0900 (758336e) +++ cutter/cut-contractor.c 2014-01-19 17:52:52 +0900 (af304b8) @@ -37,7 +37,7 @@ typedef struct _CutContractorPrivate CutContractorPrivate; struct _CutContractorPrivate { - GList *builders; + GList *listener_builders; }; G_DEFINE_TYPE(CutContractor, cut_contractor, G_TYPE_OBJECT) @@ -57,7 +57,7 @@ cut_contractor_class_init (CutContractorClass *klass) } static GList * -create_default_builders (void) +create_default_listener_builders (void) { GList *list = NULL; @@ -74,7 +74,7 @@ load_ui_factory (CutContractor *contractor) GList *node; CutContractorPrivate *priv = CUT_CONTRACTOR_GET_PRIVATE(contractor); - for (node = priv->builders; node; node = g_list_next(node)) { + for (node = priv->listener_builders; node; node = g_list_next(node)) { const gchar *module_dir, *type_name; CutFactoryBuilder *builder = CUT_FACTORY_BUILDER(node->data); @@ -94,7 +94,7 @@ cut_contractor_init (CutContractor *contractor) CutContractorPrivate *priv = CUT_CONTRACTOR_GET_PRIVATE(contractor); cut_module_factory_init(); - priv->builders = create_default_builders(); + priv->listener_builders = create_default_listener_builders(); load_ui_factory(contractor); } @@ -104,10 +104,15 @@ dispose (GObject *object) { CutContractorPrivate *priv = CUT_CONTRACTOR_GET_PRIVATE(object); - if (priv->builders) { - g_list_foreach(priv->builders, (GFunc)g_object_unref, NULL); - g_list_free(priv->builders); - priv->builders = NULL; + if (priv->listener_builders) { + g_list_foreach(priv->listener_builders, (GFunc)g_object_unref, NULL); + g_list_free(priv->listener_builders); + priv->listener_builders = NULL; + } + + if (priv->loader_customizer_factory_builder) { + g_object_unref(priv->loader_customizer_factory_builder); + priv->loader_customizer_factory_builder = NULL; } cut_module_factory_quit(); @@ -122,12 +127,13 @@ cut_contractor_new (void) } gboolean -cut_contractor_has_builder (CutContractor *contractor, const gchar *type_name) +cut_contractor_has_listener_builder (CutContractor *contractor, + const gchar *type_name) { GList *node; CutContractorPrivate *priv = CUT_CONTRACTOR_GET_PRIVATE(contractor); - for (node = priv->builders; node; node = g_list_next(node)) { + for (node = priv->listener_builders; node; node = g_list_next(node)) { CutFactoryBuilder *builder = CUT_FACTORY_BUILDER(node->data); const gchar *name; name = cut_factory_builder_get_type_name(builder); @@ -139,12 +145,12 @@ cut_contractor_has_builder (CutContractor *contractor, const gchar *type_name) } GList * -cut_contractor_build_factories (CutContractor *contractor) +cut_contractor_build_listener_factories (CutContractor *contractor) { GList *factories = NULL, *node; CutContractorPrivate *priv = CUT_CONTRACTOR_GET_PRIVATE(contractor); - for (node = priv->builders; node; node = g_list_next(node)) { + for (node = priv->listener_builders; node; node = g_list_next(node)) { CutFactoryBuilder *builder = CUT_FACTORY_BUILDER(node->data); factories = g_list_concat(cut_factory_builder_build(builder), factories); } @@ -152,12 +158,12 @@ cut_contractor_build_factories (CutContractor *contractor) } GList * -cut_contractor_build_all_factories (CutContractor *contractor) +cut_contractor_build_all_listener_factories (CutContractor *contractor) { GList *factories = NULL, *node; CutContractorPrivate *priv = CUT_CONTRACTOR_GET_PRIVATE(contractor); - for (node = priv->builders; node; node = g_list_next(node)) { + for (node = priv->listener_builders; node; node = g_list_next(node)) { CutFactoryBuilder *builder = CUT_FACTORY_BUILDER(node->data); factories = g_list_concat(cut_factory_builder_build_all(builder), factories); } @@ -170,7 +176,7 @@ cut_contractor_set_option_context (CutContractor *contractor, GOptionContext *co GList *node; CutContractorPrivate *priv = CUT_CONTRACTOR_GET_PRIVATE(contractor); - for (node = priv->builders; node; node = g_list_next(node)) { + for (node = priv->listener_builders; node; node = g_list_next(node)) { CutFactoryBuilder *builder = CUT_FACTORY_BUILDER(node->data); cut_factory_builder_set_option_context(builder, context); } Modified: cutter/cut-contractor.h (+7 -4) =================================================================== --- cutter/cut-contractor.h 2014-01-19 16:23:55 +0900 (b97d925) +++ cutter/cut-contractor.h 2014-01-19 17:52:52 +0900 (158c6e3) @@ -1,6 +1,6 @@ /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* - * Copyright (C) 2007 Kouhei Sutou <ko...@co...> + * Copyright (C) 2007-2014 Kouhei Sutou <ko...@cl...> * * This library is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -48,9 +48,12 @@ GType cut_contractor_get_type (void) G_GNUC_CONST; CutContractor *cut_contractor_new (void); -GList *cut_contractor_build_factories (CutContractor *contractor); -GList *cut_contractor_build_all_factories(CutContractor *contractor); -gboolean cut_contractor_has_builder (CutContractor *contractor, +GList *cut_contractor_build_listener_factories + (CutContractor *contractor); +GList *cut_contractor_build_all_listener_factories + (CutContractor *contractor); +gboolean cut_contractor_has_listener_builder + (CutContractor *contractor, const gchar *type_name); void cut_contractor_set_option_context (CutContractor *contractor, GOptionContext *context); Modified: cutter/cut-main.c (+7 -6) =================================================================== --- cutter/cut-main.c 2014-01-19 16:23:55 +0900 (eede8fb) +++ cutter/cut-main.c 2014-01-19 17:52:52 +0900 (c3b96df) @@ -1,6 +1,6 @@ /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* - * Copyright (C) 2007-2013 Kouhei Sutou <ko...@cl...> + * Copyright (C) 2007-2014 Kouhei Sutou <ko...@cl...> * * This library is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -85,7 +85,7 @@ static CutOrder test_case_order = CUT_ORDER_NONE_SPECIFIED; static gboolean use_multi_thread = FALSE; static gint max_threads = 10; static gboolean disable_signal_handling = FALSE; -static GList *factories = NULL; +static GList *listener_factories = NULL; static CutContractor *contractor = NULL; static gchar **original_argv = NULL; static gchar *cutter_command_path = NULL; @@ -302,13 +302,14 @@ cut_init (int *argc, char ***argv) for (i = 1; i < *argc; i++) { if (g_str_has_prefix((*argv)[i], "--help-")) { - factories = cut_contractor_build_all_factories(contractor); + listener_factories = + cut_contractor_build_all_listener_factories(contractor); break; } } - if (!factories) - factories = cut_contractor_build_factories(contractor); + if (!listener_factories) + listener_factories = cut_contractor_build_listener_factories(contractor); g_option_context_set_help_enabled(option_context, TRUE); g_option_context_set_ignore_unknown_options(option_context, FALSE); @@ -459,7 +460,7 @@ create_listeners (void) { GList *listeners = NULL, *node; - for (node = factories; node; node = g_list_next(node)) { + for (node = listener_factories; node; node = g_list_next(node)) { GObject *listener; listener = cut_module_factory_create(CUT_MODULE_FACTORY(node->data)); listeners = g_list_prepend(listeners, listener); Modified: test/cutter/test-cut-contractor.c (+5 -5) =================================================================== --- test/cutter/test-cut-contractor.c 2014-01-19 16:23:55 +0900 (6f310bd) +++ test/cutter/test-cut-contractor.c 2014-01-19 17:52:52 +0900 (fda718d) @@ -1,7 +1,7 @@ #include "cutter.h" #include "cut-contractor.h" -void test_has_builder (void); +void test_has_listener_builder (void); static CutContractor *contractor; @@ -19,13 +19,13 @@ cut_teardown (void) } void -test_has_builder (void) +test_has_listener_builder (void) { contractor = cut_contractor_new(); cut_assert(contractor); - cut_assert(cut_contractor_has_builder(contractor, "ui")); - cut_assert(cut_contractor_has_builder(contractor, "report")); - cut_assert(!cut_contractor_has_builder(contractor, "XXX")); + cut_assert(cut_contractor_has_listener_builder(contractor, "ui")); + cut_assert(cut_contractor_has_listener_builder(contractor, "report")); + cut_assert(!cut_contractor_has_listener_builder(contractor, "XXX")); } /* |
