SF.net SVN: geany-plugins:[2170] trunk/geany-plugins/debugger

[cesspit at users.sourceforge.net]

Revision: 2170
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2170&view=rev
Author:   cesspit
Date:     2011-08-24 20:34:42 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
debugger: waf build fixed, compiler warnings removed

Modified Paths:
--------------
    trunk/geany-plugins/debugger/src/dconfig.c
    trunk/geany-plugins/debugger/src/debug_module.c
    trunk/geany-plugins/debugger/src/markers.c
    trunk/geany-plugins/debugger/wscript_build

Modified: trunk/geany-plugins/debugger/src/dconfig.c
===================================================================
--- trunk/geany-plugins/debugger/src/dconfig.c	2011-08-24 08:14:32 UTC (rev 2169)
+++ trunk/geany-plugins/debugger/src/dconfig.c	2011-08-24 20:34:42 UTC (rev 2170)
@@ -25,6 +25,7 @@
  */
 
 #include <sys/stat.h>
+#include <memory.h>
 
 #include "geanyplugin.h"
 extern GeanyFunctions	*geany_functions;

Modified: trunk/geany-plugins/debugger/src/debug_module.c
===================================================================
--- trunk/geany-plugins/debugger/src/debug_module.c	2011-08-24 08:14:32 UTC (rev 2169)
+++ trunk/geany-plugins/debugger/src/debug_module.c	2011-08-24 20:34:42 UTC (rev 2170)
@@ -47,7 +47,7 @@
 variable *variable_new2(gchar *name, gchar *internal)
 {
 	variable *var = variable_new(name);
-	g_string_append(var->internal, internal);
+	g_string_assign(var->internal, internal);
 	
 	return var;
 }
@@ -67,6 +67,7 @@
 void variable_reset(variable *var)
 {
 	g_string_assign(var->internal, "");
+	g_string_assign(var->expression, "");
 	g_string_assign(var->type, "");
 	g_string_assign(var->value, "");
 	var->has_children = var->evaluated = FALSE;

Modified: trunk/geany-plugins/debugger/src/markers.c
===================================================================
--- trunk/geany-plugins/debugger/src/markers.c	2011-08-24 08:14:32 UTC (rev 2169)
+++ trunk/geany-plugins/debugger/src/markers.c	2011-08-24 20:34:42 UTC (rev 2170)
@@ -23,6 +23,8 @@
  * 		Contains functions for manipulating margin and background markers.
  */
 
+#include <string.h>
+
 #include "geanyplugin.h"
 extern GeanyFunctions	*geany_functions;
 extern GeanyData		*geany_data;

Modified: trunk/geany-plugins/debugger/wscript_build
===================================================================
--- trunk/geany-plugins/debugger/wscript_build	2011-08-24 08:14:32 UTC (rev 2169)
+++ trunk/geany-plugins/debugger/wscript_build	2011-08-24 20:34:42 UTC (rev 2170)
@@ -22,9 +22,17 @@
 
 from build.wafutils import build_plugin
 
-
 name = 'Debugger'
 includes = ['debugger/src']
 libraries = ['VTE', 'UTIL']
 
-build_plugin(bld, name, includes=includes, libraries=libraries)
+pludin_datadir = conf.env['GEANYPLUGINS_DATADIR'] + '/geany-plugins/debugger'
+
+defines=[ 'DBGPLUG_DATA_DIR="' + pludin_datadir + '"']
+
+build_plugin(bld, name, includes=includes, libraries=libraries, defines=defines)
+
+# Icons
+start_dir = bld.path.find_dir('img')
+bld.install_files(pludin_datadir, start_dir.ant_glob('*.png'), cwd=start_dir)
+bld.install_files(pludin_datadir, start_dir.ant_glob('*.gif'), cwd=start_dir)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.