Fixed undefined reference error (based on patch from Enrico Tr?ger

git-svn-id: https://geany-plugins.svn.sourceforge.net/svnroot/geany-plugins/trunk/geany-plugins@925 e8383189-8249-0410-b506-acc975200cbd
DevynCJohnson · Sep 10, 2009 · 755ec6c · 755ec6c
1 parent 43357b2
commit 755ec6c
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 72 deletions.
diff --git a/geanyprj/THANKS b/geanyprj/THANKS
@@ -0,0 +1,7 @@
+What's this file about?
+-----------------------
+This file lists all external people that have contributed to this project.
+
+Testers and contributors:
+-------------------------
+Enrico Troeger <enrico(dot)troeger(at)uvena(dot)de> - Geany IDE author, some patches
diff --git a/geanyprj/src/geanyprj.c b/geanyprj/src/geanyprj.c
@@ -23,24 +23,13 @@
 #include <sys/time.h>
 #include <string.h>
 
-#include "geany.h"
-#include "support.h"
-#include "plugindata.h"
-#include "document.h"
-#include "filetypes.h"
-#include "utils.h"
-#include "ui_utils.h"
-#include "geanyfunctions.h"
-
 #ifdef HAVE_LOCALE_H
 # include <locale.h>
 #endif
 
-#include "project.h"
-
 #include "geanyprj.h"
 
-PLUGIN_VERSION_CHECK(115);
+PLUGIN_VERSION_CHECK(147);
 PLUGIN_SET_INFO(_("Project"), _("Alternative project support."), VERSION,
 		_("Yura Siamashka <[email protected]>"));
 

diff --git a/geanyprj/src/geanyprj.h b/geanyprj/src/geanyprj.h
@@ -20,6 +20,8 @@
 #ifndef __GEANYPRJ_H__
 #define __GEANYPRJ_H__
 
+#include "geanyplugin.h"
+
 #ifdef __GNUC__
 #  ifdef DEBUG
 #    define debug(format, ...) printf((format), __VA_ARGS__)
@@ -62,6 +64,7 @@ struct GeanyPrj
 	GHashTable *tags;	///< project tags
 };
 
+extern GeanyFunctions *geany_functions;
 
 extern const gchar *project_type_string[NEW_PROJECT_TYPE_SIZE];
 extern void *project_type_filter[NEW_PROJECT_TYPE_SIZE];

diff --git a/geanyprj/src/menu.c b/geanyprj/src/menu.c
@@ -21,25 +21,10 @@
 #include <gdk/gdkkeysyms.h>
 #include <glib/gstdio.h>
 
-#include "geany.h"
-#include "support.h"
-#include "prefs.h"
-#include "plugindata.h"
-#include "document.h"
-#include "filetypes.h"
-#include "keybindings.h"
-#include "utils.h"
-#include "ui_utils.h"
-#include "geanyfunctions.h"
-
-#include "project.h"
-
 #include "geanyprj.h"
 
 PluginFields *plugin_fields;
 extern GeanyData *geany_data;
-extern GeanyFunctions *geany_functions;
-
 
 static struct
 {

diff --git a/geanyprj/src/project.c b/geanyprj/src/project.c
@@ -23,17 +23,6 @@
 #include <string.h>
 #include <sys/time.h>
 
-#include "geany.h"
-#include "support.h"
-#include "prefs.h"
-#include "plugindata.h"
-#include "document.h"
-#include "filetypes.h"
-#include "utils.h"
-#include "geanyfunctions.h"
-
-#include "project.h"
-
 #include "geanyprj.h"
 
 extern GeanyData *geany_data;

diff --git a/geanyprj/src/sidebar.c b/geanyprj/src/sidebar.c
@@ -22,19 +22,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
 
-#include "geany.h"
-#include "support.h"
-#include "prefs.h"
-#include "plugindata.h"
-#include "document.h"
-#include "filetypes.h"
-#include "keybindings.h"
-#include "utils.h"
-#include "ui_utils.h"
-#include "geanyfunctions.h"
-
-#include "project.h"
-
 #include "geanyprj.h"
 
 extern GeanyData *geany_data;

diff --git a/geanyprj/src/utils.c b/geanyprj/src/utils.c
@@ -18,10 +18,8 @@
  */
 
 #include <string.h>
-#include <glib.h>
 
-#include "geany.h"
-#include "utils.h"
+#include "geanyprj.h"
 
 gchar *
 find_file_path(const gchar * dir, const gchar * filename)

diff --git a/geanyprj/src/xproject.c b/geanyprj/src/xproject.c
@@ -23,17 +23,6 @@
 #include <string.h>
 #include <sys/time.h>
 
-#include "geany.h"
-#include "support.h"
-#include "prefs.h"
-#include "plugindata.h"
-#include "document.h"
-#include "filetypes.h"
-#include "utils.h"
-#include "geanyfunctions.h"
-
-#include "project.h"
-
 #include "geanyprj.h"
 
 extern GeanyData *geany_data;

diff --git a/geanyprj/tests/unittests.c b/geanyprj/tests/unittests.c
@@ -8,13 +8,7 @@
 #include "geanyprj.h"
 
 
-
-/* FIXME: this function implemented in Geany core, I
-   don't know how to make it available in unittest */
-int utils_write_file(gchar *a, gchar *b)
-{
-	return 0;
-}
+GeanyFunctions *geany_functions = NULL;
 
 
 void