diff -r 569f0d81876a -r c96edeed7ea7 libpurple/plugins/pluginpref_example.c --- a/libpurple/plugins/pluginpref_example.c Mon Sep 16 01:48:22 2013 +0530 +++ b/libpurple/plugins/pluginpref_example.c Mon Sep 16 12:30:29 2013 +0530 @@ -107,55 +107,31 @@ return frame; } -static PurplePluginUiInfo prefs_info = { - get_plugin_pref_frame, - 0, /* page_num (Reserved) */ - NULL, /* frame (Reserved) */ - /* Padding */ - NULL, - NULL, - NULL, - NULL -}; - -static PurplePluginInfo info = +static PurplePluginInfo * +plugin_query(GError **error) { - PURPLE_PLUGIN_MAGIC, - PURPLE_MAJOR_VERSION, - PURPLE_MINOR_VERSION, - PURPLE_PLUGIN_STANDARD, /**< type */ - NULL, /**< ui_requirement */ - 0, /**< flags */ - NULL, /**< dependencies */ - PURPLE_PRIORITY_DEFAULT, /**< priority */ + const gchar * const authors[] = { + "Gary Kramlich ", + NULL + }; - "core-pluginpref_example", /**< id */ - "Pluginpref Example", /**< name */ - DISPLAY_VERSION, /**< version */ - /** summary */ - "An example of how to use pluginprefs", - /** description */ - "An example of how to use pluginprefs", - "Gary Kramlich ", /**< author */ - PURPLE_WEBSITE, /**< homepage */ - - NULL, /**< load */ - NULL, /**< unload */ - NULL, /**< destroy */ + return purple_plugin_info_new( + "id", "core-pluginpref_example", + "name", "Pluginpref Example", + "version", DISPLAY_VERSION, + "category", "Example", + "summary", "An example of how to use pluginprefs", + "description", "An example of how to use pluginprefs", + "authors", authors, + "website", PURPLE_WEBSITE, + "abi-version", PURPLE_ABI_VERSION, + "preferences-frame", get_plugin_pref_frame, + NULL + ); +} - NULL, /**< ui_info */ - NULL, /**< extra_info */ - &prefs_info, /**< prefs_info */ - NULL, /**< actions */ - /* padding */ - NULL, - NULL, - NULL, - NULL -}; - -static void -init_plugin(PurplePlugin *plugin) +static gboolean +plugin_load(PurplePlugin *plugin, GError **error) { purple_prefs_add_none("/plugins/core/pluginpref_example"); purple_prefs_add_bool("/plugins/core/pluginpref_example/bool", TRUE); @@ -167,6 +143,14 @@ "max length string"); purple_prefs_add_string("/plugins/core/pluginpref_example/masked_string", "masked"); purple_prefs_add_string("/plugins/core/pluginpref_example/string_choice", "red"); + + return TRUE; } -PURPLE_INIT_PLUGIN(ppexample, init_plugin, info) +static gboolean +plugin_unload(PurplePlugin *plugin, GError **error) +{ + return TRUE; +} + +PURPLE_PLUGIN_INIT(ppexample, plugin_query, plugin_load, plugin_unload);