From a91d4d56e4992b7a064532f8a9b07cc5dbba3763 Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Wed, 11 Aug 2010 14:19:57 +0000
Subject: [PATCH] r5074

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/Geany-0_19_1@5136 ea778897-0a13-0410-b9d1-a72fbfd435f5
---
 ChangeLog                 | 2 ++
 tagmanager/get.c          | 4 ++--
 tagmanager/tm_workspace.c | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3365be00c..e2c4a9ef5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
  * src/highlighting.c:
    Re-enable fold.comment for the C lexer - it was disabled to prevent
    //{ explicit folding, but that also disables stream comments /* */.
+ * tagmanager/tm_workspace.c, tagmanager/get.c:
+   Use g_free instead of free (patch by Daniel Marjamäki, thanks).
 
 
 2010-06-18  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
diff --git a/tagmanager/get.c b/tagmanager/get.c
index 89b402baa..e2d79aa31 100644
--- a/tagmanager/get.c
+++ b/tagmanager/get.c
@@ -710,7 +710,7 @@ extern char *getArglistFromBufferPos(int startPosition, const char *tokenName)
 			memcpy(result, &File.fpBuffer[getBufPos()], pos2 - pos1 + 1);
 			result[pos2-pos1+1] = '\0';
 			arglist = getArglistFromStr(result, tokenName);
-			free(result);
+			g_free(result);
 		}
 	}
 	setBufPos (bufferOriginalPosition);
@@ -737,8 +737,8 @@ extern char *getArglistFromFilePos(fpos_t startPosition, const char *tokenName)
 		{
 			result[pos2-pos1+1] = '\0';
 			arglist = getArglistFromStr(result, tokenName);
-			free(result);
 		}
+		g_free(result);
 	}
 	fsetpos(File.fp, &originalPosition);
 	return arglist;
diff --git a/tagmanager/tm_workspace.c b/tagmanager/tm_workspace.c
index 559bdf307..6a1f8490c 100644
--- a/tagmanager/tm_workspace.c
+++ b/tagmanager/tm_workspace.c
@@ -226,7 +226,7 @@ static void write_includes_file(FILE *fp, GList *includes_files)
 		size_t size;
 
 		size = fwrite(str, str_len, 1, fp);
-		free(str);
+		g_free(str);
 		node = g_list_next (node);
 	}
 }
@@ -302,6 +302,7 @@ gboolean tm_workspace_create_global_tags(const char *config_dir, const char *pre
 	{
  		int dirty_len = strlen(includes[idx_inc]);
 		char *clean_path = g_malloc(dirty_len - 1);
+
 		strncpy(clean_path, includes[idx_inc] + 1, dirty_len - 1);
 		clean_path[dirty_len - 2] = 0;
 
@@ -331,7 +332,7 @@ gboolean tm_workspace_create_global_tags(const char *config_dir, const char *pre
 			}
 		}
 		globfree(&globbuf);
-		free(clean_path);
+		g_free(clean_path);
   	}
   	else
 #endif
-- 
2.11.4.GIT