geanylua: Remove deprecated GeanyFunctions (#439)

geany · Dec 17, 2016 · 4fa2e5f · 4fa2e5f
1 parent 65f5446
commit 4fa2e5f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 15 deletions.
diff --git a/geanylua/geanylua.c b/geanylua/geanylua.c
@@ -52,15 +52,12 @@ PLUGIN_VERSION_CHECK(MY_GEANY_API_VER)
 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);
 }
 
 

diff --git a/geanylua/glspi.h b/geanylua/glspi.h
@@ -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 */

diff --git a/geanylua/glspi_init.c b/geanylua/glspi_init.c
@@ -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 =

diff --git a/geanylua/gsdlg.c b/geanylua/gsdlg.c
@@ -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"