diff options
author | Steve Frécinaux <code@istique.net> | 2011-03-25 00:03:18 +0100 |
---|---|---|
committer | Steve Frécinaux <code@istique.net> | 2011-03-25 00:05:37 +0100 |
commit | 511ddab967e9f49b49c2ba0609f91b3050733ca1 (patch) | |
tree | e4db4789ed7c714f505d0e9e026fa15c1d757781 | |
parent | e1ed351ebe325fe24dc378bc3c4e1ed6ea898822 (diff) | |
download | libpeas-511ddab967e9f49b49c2ba0609f91b3050733ca1.tar.gz |
Drop IAge support for now.
The API will change for IAge, and nobody really uses it right now, so
better remove it completely for now and add a sensible API later than
having to try and support this API until libpeas 2.0
-rw-r--r-- | docs/reference/libpeas-sections.txt | 1 | ||||
-rw-r--r-- | libpeas/peas-plugin-info-priv.h | 1 | ||||
-rw-r--r-- | libpeas/peas-plugin-info.c | 28 | ||||
-rw-r--r-- | libpeas/peas-plugin-info.h | 2 | ||||
-rw-r--r-- | tests/libpeas/plugin-info.c | 9 | ||||
-rw-r--r-- | tests/libpeas/plugins/Makefile.am | 1 | ||||
-rw-r--r-- | tests/libpeas/plugins/info-missing-iage.plugin | 3 | ||||
-rw-r--r-- | tests/libpeas/testing/testing.c | 2 |
8 files changed, 0 insertions, 47 deletions
diff --git a/docs/reference/libpeas-sections.txt b/docs/reference/libpeas-sections.txt index a001a16..0ee9ab0 100644 --- a/docs/reference/libpeas-sections.txt +++ b/docs/reference/libpeas-sections.txt @@ -212,7 +212,6 @@ peas_plugin_info_get_authors peas_plugin_info_get_website peas_plugin_info_get_copyright peas_plugin_info_get_version -peas_plugin_info_get_iage peas_plugin_info_get_keys <SUBSECTION Standard> PEAS_TYPE_PLUGIN_INFO diff --git a/libpeas/peas-plugin-info-priv.h b/libpeas/peas-plugin-info-priv.h index 610a83c..c16c741 100644 --- a/libpeas/peas-plugin-info-priv.h +++ b/libpeas/peas-plugin-info-priv.h @@ -44,7 +44,6 @@ struct _PeasPluginInfo { gchar *website; gchar *version; gchar *help_uri; - guint iage; GError *error; diff --git a/libpeas/peas-plugin-info.c b/libpeas/peas-plugin-info.c index e06941e..10a59e0 100644 --- a/libpeas/peas-plugin-info.c +++ b/libpeas/peas-plugin-info.c @@ -135,7 +135,6 @@ _peas_plugin_info_new (const gchar *filename, PeasPluginInfo *info; GKeyFile *plugin_file = NULL; gchar *str; - gint integer; gboolean b; GError *error = NULL; @@ -151,15 +150,6 @@ _peas_plugin_info_new (const gchar *filename, goto error; } - if (!g_key_file_has_key (plugin_file, "Plugin", "IAge", NULL)) - { - g_warning ("Could not find 'IAge' in '%s'", filename); - goto error; - } - - integer = g_key_file_get_integer (plugin_file, "Plugin", "IAge", NULL); - info->iage = integer <= 0 ? 0 : integer; - /* Get module name */ str = g_key_file_get_string (plugin_file, "Plugin", "Module", NULL); @@ -647,21 +637,3 @@ peas_plugin_info_get_help_uri (const PeasPluginInfo *info) return info->help_uri; } - -/** - * peas_plugin_info_get_iage: - * @info: A #PeasPluginInfo. - * - * Gets the interface age of the plugin. - * - * The relevant key in the plugin info file is "IAge". - * - * Returns: the interface age of the plugin or %0 if not known. - **/ -gint -peas_plugin_info_get_iage (const PeasPluginInfo *info) -{ - g_return_val_if_fail (info != NULL, 0); - - return info->iage; -} diff --git a/libpeas/peas-plugin-info.h b/libpeas/peas-plugin-info.h index d48778e..075fbb9 100644 --- a/libpeas/peas-plugin-info.h +++ b/libpeas/peas-plugin-info.h @@ -90,8 +90,6 @@ const gchar *peas_plugin_info_get_copyright (const PeasPluginInfo *info); const gchar *peas_plugin_info_get_version (const PeasPluginInfo *info); const gchar *peas_plugin_info_get_help_uri (const PeasPluginInfo *info); -gint peas_plugin_info_get_iage (const PeasPluginInfo *info); - G_END_DECLS #endif /* __PEAS_PLUGIN_INFO_H__ */ diff --git a/tests/libpeas/plugin-info.c b/tests/libpeas/plugin-info.c index fb636a1..6fe6a6b 100644 --- a/tests/libpeas/plugin-info.c +++ b/tests/libpeas/plugin-info.c @@ -86,7 +86,6 @@ test_plugin_info_verify_full_info (PeasEngine *engine) g_assert_cmpstr (peas_plugin_info_get_copyright (info), ==, "Copyright © 2010 Garrett Regier"); g_assert_cmpstr (peas_plugin_info_get_version (info), ==, "1.0"); g_assert_cmpstr (peas_plugin_info_get_help_uri (info), ==, "http://git.gnome.org/browse/libpeas"); - g_assert_cmpint (peas_plugin_info_get_iage (info), ==, 2); authors = peas_plugin_info_get_authors (info); g_assert (authors != NULL && authors[1] == NULL); @@ -119,7 +118,6 @@ test_plugin_info_verify_min_info (PeasEngine *engine) g_assert_cmpstr (peas_plugin_info_get_copyright (info), ==, NULL); g_assert_cmpstr (peas_plugin_info_get_version (info), ==, NULL); g_assert_cmpstr (peas_plugin_info_get_help_uri (info), ==, NULL); - g_assert_cmpint (peas_plugin_info_get_iage (info), ==, 2); g_assert (peas_plugin_info_get_authors (info) == NULL); } @@ -143,12 +141,6 @@ test_plugin_info_has_dep (PeasEngine *engine) } static void -test_plugin_info_missing_iage (PeasEngine *engine) -{ - g_assert (peas_engine_get_plugin_info (engine, "invalid-info-iage") == NULL); -} - -static void test_plugin_info_missing_module (PeasEngine *engine) { g_assert (peas_engine_get_plugin_info (engine, "invalid-info-module") == NULL); @@ -197,7 +189,6 @@ main (int argc, TEST ("has-dep", has_dep); - TEST ("missing-iage", missing_iage); TEST ("missing-module", missing_module); TEST ("missing-name", missing_name); diff --git a/tests/libpeas/plugins/Makefile.am b/tests/libpeas/plugins/Makefile.am index b7c3f3e..0d9037d 100644 --- a/tests/libpeas/plugins/Makefile.am +++ b/tests/libpeas/plugins/Makefile.am @@ -12,7 +12,6 @@ endif noinst_PLUGIN = \ disabled-loader.plugin \ - info-missing-iage.plugin \ info-missing-module.plugin \ info-missing-name.plugin \ invalid.plugin \ diff --git a/tests/libpeas/plugins/info-missing-iage.plugin b/tests/libpeas/plugins/info-missing-iage.plugin deleted file mode 100644 index 77cae33..0000000 --- a/tests/libpeas/plugins/info-missing-iage.plugin +++ /dev/null @@ -1,3 +0,0 @@ -[Plugin] -Module=info-missing-iage -Name=Info Missing IAge diff --git a/tests/libpeas/testing/testing.c b/tests/libpeas/testing/testing.c index da79907..f8b3ac4 100644 --- a/tests/libpeas/testing/testing.c +++ b/tests/libpeas/testing/testing.c @@ -60,10 +60,8 @@ testing_engine_new (void) testing_util_push_log_hook ("*Bad plugin file: *invalid.plugin*"); testing_util_push_log_hook ("*Error loading *invalid.plugin*"); - testing_util_push_log_hook ("*Could not find 'IAge' in *info-missing-iage.plugin*"); testing_util_push_log_hook ("*Could not find 'Module' in *info-missing-module.plugin*"); testing_util_push_log_hook ("*Could not find 'Name' in *info-missing-name.plugin*"); - testing_util_push_log_hook ("*Error loading *info-missing-iage.plugin*"); testing_util_push_log_hook ("*Error loading *info-missing-module.plugin*"); testing_util_push_log_hook ("*Error loading *info-missing-name.plugin*"); |