Merge pull request #388 from techee/remove_deprecated

Remove deprecated GeanyFunctions
geany · Mar 8, 2016 · a042d1d · a042d1d
2 parents 42afeae + 5267981
commit a042d1d
Show file tree

Hide file tree

Showing 60 changed files with 32 additions and 104 deletions.
diff --git a/autoclose/src/autoclose.c b/autoclose/src/autoclose.c
@@ -41,9 +41,8 @@
 
 GeanyPlugin	*geany_plugin;
 GeanyData	*geany_data;
-GeanyFunctions	*geany_functions;
 
-PLUGIN_VERSION_CHECK(218)
+PLUGIN_VERSION_CHECK(224)
 PLUGIN_SET_TRANSLATABLE_INFO(
 	LOCALEDIR,
 	GETTEXT_PACKAGE,

diff --git a/automark/src/automark.c b/automark/src/automark.c
@@ -39,9 +39,8 @@
 
 GeanyPlugin	*geany_plugin;
 GeanyData	*geany_data;
-GeanyFunctions	*geany_functions;
 
-PLUGIN_VERSION_CHECK(216)
+PLUGIN_VERSION_CHECK(224)
 PLUGIN_SET_TRANSLATABLE_INFO(
 	LOCALEDIR,
 	GETTEXT_PACKAGE,

diff --git a/codenav/src/codenavigation.c b/codenav/src/codenavigation.c
@@ -34,7 +34,7 @@
 
 /* Check that the running Geany supports the plugin API used below, and check
  * for binary compatibility. */
-PLUGIN_VERSION_CHECK(200)
+PLUGIN_VERSION_CHECK(224)
 
 /* All plugins must set name, description, version and author. */
 PLUGIN_SET_TRANSLATABLE_INFO(
@@ -63,7 +63,6 @@ typedef enum
 /* These items are set by Geany before plugin_init() is called. */
 GeanyPlugin		*geany_plugin;
 GeanyData		*geany_data;
-GeanyFunctions	*geany_functions;
 
 static GtkListStore *list_store;	/* for settings dialog */
 

diff --git a/codenav/src/codenavigation.h b/codenav/src/codenavigation.h
@@ -42,7 +42,6 @@
 
 /* Last */
 #include "plugindata.h"		/* this defines the plugin API */
-#include "geanyfunctions.h"	/* this wraps geany_functions function pointers */
 
 /* Debug flag */
 /*#define CODE_NAVIGATION_DEBUG*/
@@ -81,7 +80,6 @@ enum
 /* Items for controlling geany */
 extern GeanyPlugin		*geany_plugin;
 extern GeanyData		*geany_data;
-extern GeanyFunctions	*geany_functions;
 
 extern GeanyKeyGroup *plugin_key_group;
 

diff --git a/commander/src/commander-plugin.c b/commander/src/commander-plugin.c
@@ -34,9 +34,8 @@
 
 GeanyPlugin      *geany_plugin;
 GeanyData        *geany_data;
-GeanyFunctions   *geany_functions;
 
-PLUGIN_VERSION_CHECK(205)
+PLUGIN_VERSION_CHECK(224)
 
 PLUGIN_SET_TRANSLATABLE_INFO (
   LOCALEDIR, GETTEXT_PACKAGE,

diff --git a/debugger/src/breakpoints.c b/debugger/src/breakpoints.c
@@ -28,7 +28,6 @@
 #include <string.h>
 
 #include "geanyplugin.h"
-extern GeanyFunctions	*geany_functions;
 
 #include "breakpoints.h"
 #include "utils.h"

diff --git a/debugger/src/btnpanel.c b/debugger/src/btnpanel.c
@@ -30,7 +30,6 @@
 #endif
 #include <geanyplugin.h>
 
-extern GeanyFunctions	*geany_functions;
 extern GeanyPlugin		*geany_plugin;
 
 #include "gui.h"

diff --git a/debugger/src/callbacks.c b/debugger/src/callbacks.c
@@ -44,7 +44,6 @@
 #include "dconfig.h"
 #include "tabs.h"
 
-extern GeanyFunctions *geany_functions;
 
 /*
  * 	Set breakpoint and stack markers for a file

diff --git a/debugger/src/dbm_gdb.c b/debugger/src/dbm_gdb.c
@@ -33,7 +33,6 @@
 	#include "config.h"
 #endif
 #include <geanyplugin.h>
-extern GeanyFunctions	*geany_functions;
 extern GeanyData		*geany_data;
 
 #include "breakpoint.h"

diff --git a/debugger/src/debug.c b/debugger/src/debug.c
@@ -56,7 +56,6 @@ int grantpt(int fd);
 	#include "config.h"
 #endif
 #include <geanyplugin.h>
-extern GeanyFunctions	*geany_functions;
 extern GeanyData		*geany_data;
 
 #include "tpage.h"

diff --git a/debugger/src/dpaned.c b/debugger/src/dpaned.c
@@ -30,7 +30,6 @@
 #include <string.h>
 
 #include "geanyplugin.h"
-extern GeanyFunctions	*geany_functions;
 extern GeanyData		*geany_data;
 
 #include "dpaned.h"

diff --git a/debugger/src/envtree.c b/debugger/src/envtree.c
@@ -30,7 +30,6 @@
 #endif
 #include <geanyplugin.h>
 
-extern GeanyFunctions	*geany_functions;
 extern GeanyPlugin		*geany_plugin;
 
 #include <gdk/gdkkeysyms.h>

diff --git a/debugger/src/keys.c b/debugger/src/keys.c
@@ -28,7 +28,6 @@
 #endif
 #include <geanyplugin.h>
 
-extern GeanyFunctions	*geany_functions;
 extern GeanyPlugin		*geany_plugin;
 
 #include "keys.h"

diff --git a/debugger/src/markers.c b/debugger/src/markers.c
@@ -26,7 +26,6 @@
 #include <string.h>
 
 #include "geanyplugin.h"
-extern GeanyFunctions	*geany_functions;
 extern GeanyData		*geany_data;
 
 #include "markers.h"

diff --git a/debugger/src/plugin.c b/debugger/src/plugin.c
@@ -44,12 +44,11 @@
 /* These items are set by Geany before plugin_init() is called. */
 GeanyPlugin		*geany_plugin;
 GeanyData			*geany_data;
-GeanyFunctions	*geany_functions;
 
 
 /* Check that the running Geany supports the plugin API version used below, and check
  * for binary compatibility. */
-PLUGIN_VERSION_CHECK(209)
+PLUGIN_VERSION_CHECK(224)
 PLUGIN_SET_TRANSLATABLE_INFO(
 	LOCALEDIR,
 	GETTEXT_PACKAGE,

diff --git a/debugger/src/tabs.c b/debugger/src/tabs.c
@@ -29,7 +29,6 @@
 #endif
 #include <geanyplugin.h>
 
-extern GeanyFunctions	*geany_functions;
 extern GeanyData		*geany_data;
 
 #include "tabs.h"

diff --git a/debugger/src/tpage.c b/debugger/src/tpage.c
@@ -34,7 +34,6 @@
 #endif
 #include "geanyplugin.h"
 
-extern GeanyFunctions	*geany_functions;
 extern GeanyData		*geany_data;
 
 #include "breakpoints.h"

diff --git a/debugger/src/utils.c b/debugger/src/utils.c
@@ -36,7 +36,6 @@
 	#include "config.h"
 #endif
 #include <geanyplugin.h>
-extern GeanyFunctions	*geany_functions;
 
 #include "utils.h"
 

diff --git a/defineformat/src/defineformat.c b/defineformat/src/defineformat.c
@@ -47,9 +47,8 @@
 
 GeanyPlugin		*geany_plugin;
 GeanyData		*geany_data;
-GeanyFunctions		*geany_functions;
 
-PLUGIN_VERSION_CHECK(216)
+PLUGIN_VERSION_CHECK(224)
 PLUGIN_SET_TRANSLATABLE_INFO(
 	LOCALEDIR,
 	GETTEXT_PACKAGE,

diff --git a/devhelp/src/dhp-plugin.c b/devhelp/src/dhp-plugin.c
@@ -36,7 +36,7 @@
 #include "dhp.h"
 
 
-PLUGIN_VERSION_CHECK(200)
+PLUGIN_VERSION_CHECK(224)
 
 PLUGIN_SET_TRANSLATABLE_INFO(
 	LOCALEDIR,
@@ -49,7 +49,6 @@ PLUGIN_SET_TRANSLATABLE_INFO(
 
 GeanyPlugin	 	*geany_plugin;
 GeanyData	   	*geany_data;
-GeanyFunctions 	*geany_functions;
 
 struct PluginData plugin;
 

diff --git a/devhelp/src/dhp-plugin.h b/devhelp/src/dhp-plugin.h
@@ -31,7 +31,6 @@
 
 extern GeanyPlugin	 	*geany_plugin;
 extern GeanyData	   	*geany_data;
-extern GeanyFunctions 	*geany_functions;
 
 
 struct PluginData

diff --git a/geanydoc/src/config.c b/geanydoc/src/config.c
@@ -29,7 +29,6 @@
 #include "geanydoc.h"
 
 extern GeanyData *geany_data;
-extern GeanyFunctions *geany_functions;
 
 const gchar defaults[] =
 	"[C]\n"

diff --git a/geanydoc/src/geanydoc.c b/geanydoc/src/geanydoc.c
@@ -37,15 +37,14 @@
 /* These items are set by Geany before init() is called. */
 PluginFields *plugin_fields;
 GeanyData *geany_data;
-GeanyFunctions *geany_functions;
 
 static GtkWidget *keyb1;
 static GtkWidget *keyb2;
 
 
 /* Check that Geany supports plugin API version 128 or later, and check
  * for binary compatibility. */
-PLUGIN_VERSION_CHECK(128)
+PLUGIN_VERSION_CHECK(224)
 /* All plugins must set name, description, version and author. */
 PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE,
 	_("Doc"), _("Call documentation viewer on current symbol."), VERSION,

diff --git a/geanyextrasel/src/extrasel.c b/geanyextrasel/src/extrasel.c
@@ -27,9 +27,8 @@
 
 GeanyPlugin	*geany_plugin;
 GeanyData	*geany_data;
-GeanyFunctions	*geany_functions;
 
-PLUGIN_VERSION_CHECK(189)
+PLUGIN_VERSION_CHECK(224)
 
 PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE,
 	_("Extra Selection"), _("Column mode, select to line / brace / anchor."),

diff --git a/geanygendoc/src/ggd-plugin.c b/geanygendoc/src/ggd-plugin.c
@@ -47,10 +47,9 @@
 /* These items are set by Geany before plugin_init() is called. */
 GeanyPlugin     *geany_plugin;
 GeanyData       *geany_data;
-GeanyFunctions  *geany_functions;
 
 /* TODO check minimum requierment */
-PLUGIN_VERSION_CHECK (221)
+PLUGIN_VERSION_CHECK (224)
 
 PLUGIN_SET_TRANSLATABLE_INFO (
   LOCALEDIR, GETTEXT_PACKAGE,

diff --git a/geanygendoc/src/ggd-plugin.h b/geanygendoc/src/ggd-plugin.h
@@ -39,7 +39,6 @@ G_BEGIN_DECLS
 /* Note that this cannot be hidden since it is accessed by the Geany instance */
 extern  GeanyPlugin      *geany_plugin;
 extern  GeanyData        *geany_data;
-extern  GeanyFunctions   *geany_functions;
 
 
 /* Begin of the plugin's self API */

diff --git a/geanyinsertnum/src/insertnum.c b/geanyinsertnum/src/insertnum.c
@@ -37,9 +37,8 @@
 
 GeanyPlugin	*geany_plugin;
 GeanyData	*geany_data;
-GeanyFunctions	*geany_functions;
 
-PLUGIN_VERSION_CHECK(189)
+PLUGIN_VERSION_CHECK(224)
 
 PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE,
 	_("Insert Numbers"), _("Insert/Fill columns with numbers."),

diff --git a/geanylatex/src/geanylatex.c b/geanylatex/src/geanylatex.c
@@ -33,7 +33,7 @@
 #include "geanylatex.h"
 #include "ctype.h"
 
-PLUGIN_VERSION_CHECK(217)
+PLUGIN_VERSION_CHECK(224)
 
 PLUGIN_SET_TRANSLATABLE_INFO(
 	LOCALEDIR,
@@ -45,7 +45,6 @@ PLUGIN_SET_TRANSLATABLE_INFO(
 
 GeanyPlugin	 *geany_plugin;
 GeanyData	   *geany_data;
-GeanyFunctions  *geany_functions;
 
 /* Widgets for plugin */
 static GtkWidget *menu_latex = NULL;

diff --git a/geanylatex/src/geanylatex.h b/geanylatex/src/geanylatex.h
@@ -46,7 +46,6 @@ typedef void (*MenuCallback) (G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSE
 
 extern GeanyPlugin	*geany_plugin;
 extern GeanyData	*geany_data;
-extern GeanyFunctions	*geany_functions;
 
 
 #define create_sub_menu(base_menu, menu, item, title) \

diff --git a/geanylipsum/src/geanylipsum.c b/geanylipsum/src/geanylipsum.c
@@ -31,9 +31,8 @@
 
 GeanyPlugin		*geany_plugin;
 GeanyData		*geany_data;
-GeanyFunctions	*geany_functions;
 
-PLUGIN_VERSION_CHECK(188)
+PLUGIN_VERSION_CHECK(224)
 PLUGIN_SET_TRANSLATABLE_INFO(
 	LOCALEDIR,
 	GETTEXT_PACKAGE,

diff --git a/geanymacro/src/geanymacro.c b/geanymacro/src/geanymacro.c
@@ -174,9 +174,8 @@ enum GEANY_MACRO_BUTTON {
 
 GeanyPlugin     *geany_plugin;
 GeanyData       *geany_data;
-GeanyFunctions  *geany_functions;
 
-PLUGIN_VERSION_CHECK(147)
+PLUGIN_VERSION_CHECK(224)
 
 PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE,
                              _("Macros"),_("Macros for Geany"),

diff --git a/geanyminiscript/src/gms.c b/geanyminiscript/src/gms.c
@@ -45,12 +45,11 @@
 
 GeanyPlugin     *geany_plugin;
 GeanyData       *geany_data;
-GeanyFunctions  *geany_functions;
 
 
 /* Check that the running Geany supports the plugin API used below, and check
  * for binary compatibility. */
-PLUGIN_VERSION_CHECK(100)
+PLUGIN_VERSION_CHECK(224)
 
 /* All plugins must set name, description, version and author. */
 PLUGIN_SET_TRANSLATABLE_INFO(

diff --git a/geanyminiscript/src/gms.h b/geanyminiscript/src/gms.h
@@ -27,7 +27,6 @@
 
 extern GeanyPlugin      *geany_plugin;
 extern GeanyData        *geany_data;
-extern GeanyFunctions   *geany_functions;
 
 
 #endif /* GMS_H */
diff --git a/geanynumberedbookmarks/src/geanynumberedbookmarks.c b/geanynumberedbookmarks/src/geanynumberedbookmarks.c
@@ -52,9 +52,8 @@ typedef struct FileData
 
 GeanyPlugin     *geany_plugin;
 GeanyData       *geany_data;
-GeanyFunctions  *geany_functions;
 
-PLUGIN_VERSION_CHECK(147)
+PLUGIN_VERSION_CHECK(224)
 
 PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE,
                              "Numbered Bookmarks",

diff --git a/geanypg/src/geanypg.c b/geanypg/src/geanypg.c
@@ -23,11 +23,10 @@
 /* These items are set by Geany before plugin_init() is called. */
 GeanyPlugin     *geany_plugin;
 GeanyData       *geany_data;
-GeanyFunctions  *geany_functions;
 
 /* Check that the running Geany supports the plugin API version used below, and check
  * for binary compatibility. */
-PLUGIN_VERSION_CHECK(201)
+PLUGIN_VERSION_CHECK(224)
 
 /* All plugins must set name, description, version and author. */
 PLUGIN_SET_TRANSLATABLE_INFO(

diff --git a/geanypg/src/geanypg.h b/geanypg/src/geanypg.h
@@ -54,7 +54,6 @@ typedef struct
 
 extern GeanyPlugin     *geany_plugin;
 extern GeanyData       *geany_data;
-extern GeanyFunctions  *geany_functions;
 
 /* auxiliary functions (helper_functions.c) */
 void geanypg_init_ed(encrypt_data * ed);

diff --git a/geanyprj/src/geanyprj.c b/geanyprj/src/geanyprj.c
@@ -34,13 +34,12 @@
 
 #include "geanyprj.h"
 
-PLUGIN_VERSION_CHECK(221)
+PLUGIN_VERSION_CHECK(224)
 PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE,
 			     "GeanyPrj", _("Alternative project support."), VERSION,
 			     "Yura Siamashka <yurand2@gmail.com>")
 
 GeanyData      *geany_data;
-GeanyFunctions *geany_functions;
 
 
 static gchar    *config_file;