Skip to content

Commit

Permalink
Merge pull request #1406 from kugel-/for-upstream
Browse files Browse the repository at this point in the history
api: new function geany_api_version for dynamic languages checking API version at runtime
  • Loading branch information
elextr committed Mar 3, 2017
2 parents 8001086 + 7b09180 commit cc7f7f7
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/plugindata.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ G_BEGIN_DECLS
* @warning You should not test for values below 200 as previously
* @c GEANY_API_VERSION was defined as an enum value, not a macro.
*/
#define GEANY_API_VERSION 230
#define GEANY_API_VERSION 231

/* hack to have a different ABI when built with GTK3 because loading GTK2-linked plugins
* with GTK3-linked Geany leads to crash */
Expand Down
16 changes: 16 additions & 0 deletions src/pluginutils.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,22 @@ typedef struct
PluginDocDataProxy;


/** Returns the runtime API version Geany was compiled with.
*
* Unlike @ref GEANY_API_VERSION this version is the value of that
* define at the time when Geany itself was compiled. This allows to
* establish soft dependencies which are resolved at runtime depending
* on Geany's API version.
*
* @return Geany's API version
* @since 1.30 (API 231)
**/
GEANY_API_SYMBOL
gint geany_api_version(void)
{
return GEANY_API_VERSION;
}

/** Inserts a toolbar item before the Quit button, or after the previous plugin toolbar item.
* A separator is added on the first call to this function, and will be shown when @a item is
* shown; hidden when @a item is hidden.
Expand Down
1 change: 1 addition & 0 deletions src/pluginutils.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ G_BEGIN_DECLS
struct GeanyPlugin;
struct GeanyDocument;

gint geany_api_version(void);

void plugin_add_toolbar_item(struct GeanyPlugin *plugin, GtkToolItem *item);

Expand Down

0 comments on commit cc7f7f7

Please sign in to comment.