Branch: refs/heads/master Author: Jiří Techet techet@gmail.com Committer: Frank Lanitz frank@frank.uvena.de Date: Sat, 17 Dec 2016 22:27:13 UTC Commit: 4fa2e5f6b69df05dfe2894c8978b8fba63b41079 https://github.com/geany/geany-plugins/commit/4fa2e5f6b69df05dfe2894c8978b8f...

Log Message: ----------- geanylua: Remove deprecated GeanyFunctions (#439)

Modified Paths: -------------- geanylua/geanylua.c geanylua/glspi.h geanylua/glspi_init.c geanylua/gsdlg.c

Modified: geanylua/geanylua.c 7 lines changed, 2 insertions(+), 5 deletions(-) =================================================================== @@ -53,14 +53,11 @@ PLUGIN_EXPORT PLUGIN_SET_INFO(PLUGIN_NAME, PLUGIN_DESC, PLUGIN_VER, PLUGIN_AUTHOR)

PLUGIN_EXPORT -GeanyFunctions *geany_functions; - -PLUGIN_EXPORT GeanyPlugin *geany_plugin;

-typedef void (*InitFunc) (GeanyData *data, GeanyFunctions *functions, GeanyPlugin *plugin); +typedef void (*InitFunc) (GeanyData *data, GeanyPlugin *plugin); typedef void (*ConfigFunc) (GtkWidget *parent); typedef void (*CleanupFunc) (void);

@@ -213,7 +210,7 @@ void plugin_init(GeanyData *data) g_free(libname); copy_callbacks();

- glspi_init(data, geany_functions, geany_plugin); + glspi_init(data, geany_plugin); }

Modified: geanylua/glspi.h 4 lines changed, 0 insertions(+), 4 deletions(-) =================================================================== @@ -75,10 +75,6 @@ extern GeanyData *glspi_geany_data;

#define geany_data glspi_geany_data

-extern GeanyFunctions *glspi_geany_functions; - -#define geany_functions glspi_geany_functions -

#ifdef NEED_FAIL_ARG_TYPE /* Pushes an error message onto Lua stack if script passes a wrong arg type */

Modified: geanylua/glspi_init.c 4 lines changed, 1 insertions(+), 3 deletions(-) =================================================================== @@ -34,7 +34,6 @@ PLUGIN_EXPORT const guint glspi_abi = GEANY_ABI_VERSION;

GeanyData *glspi_geany_data=NULL; -GeanyFunctions *glspi_geany_functions=NULL; GeanyPlugin *glspi_geany_plugin=NULL;

static struct { @@ -407,10 +406,9 @@ static gchar *get_data_dir(void)

/* Called by Geany to initialize the plugin */ PLUGIN_EXPORT -void glspi_init (GeanyData *data, GeanyFunctions *functions, GeanyPlugin *plugin) +void glspi_init (GeanyData *data, GeanyPlugin *plugin) { glspi_geany_data = data; - glspi_geany_functions = functions; glspi_geany_plugin = plugin;

local_data.script_dir =

Modified: geanylua/gsdlg.c 3 lines changed, 0 insertions(+), 3 deletions(-) =================================================================== @@ -28,9 +28,6 @@ #include <stdlib.h>

#include "geanyplugin.h" -/* we need tm_get_real_path(), and we can't include glspi.h for those, so hack */ -extern GeanyFunctions *glspi_geany_functions; -#define geany_functions glspi_geany_functions

#define TextKey "gsdlg_TextKey_bc4871f4e3478ab5234e28432460a6b8"

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).