SF.net SVN: geany-plugins:[1108] trunk/geany-plugins/addons

[eht16 at users.sourceforge.net]

Revision: 1108
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1108&view=rev
Author:   eht16
Date:     2010-01-03 23:23:14 +0000 (Sun, 03 Jan 2010)

Log Message:
-----------
Strip the token from the displayed task description to be closer to the initial implementation (closes #2925003).

Modified Paths:
--------------
    trunk/geany-plugins/addons/ChangeLog
    trunk/geany-plugins/addons/src/ao_tasks.c

Modified: trunk/geany-plugins/addons/ChangeLog
===================================================================
--- trunk/geany-plugins/addons/ChangeLog	2010-01-03 23:22:44 UTC (rev 1107)
+++ trunk/geany-plugins/addons/ChangeLog	2010-01-03 23:23:14 UTC (rev 1108)
@@ -2,6 +2,8 @@
 
  * src/ao_tasks.c:
    Move the code for creating a new task into create_task().
+   Strip the token from the displayed task description to be closer
+   to the initial implementation (closes #2925003).
 
 
 2010-01-01  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/geany-plugins/addons/src/ao_tasks.c
===================================================================
--- trunk/geany-plugins/addons/src/ao_tasks.c	2010-01-03 23:22:44 UTC (rev 1107)
+++ trunk/geany-plugins/addons/src/ao_tasks.c	2010-01-03 23:23:14 UTC (rev 1108)
@@ -513,7 +513,7 @@
 
 
 static void create_task(AoTasks *t, GeanyDocument *doc, gint line,
-						const gchar *line_buf, const gchar *display_name)
+						const gchar *line_buf, const gchar *task_start, const gchar *display_name)
 {
 	AoTasksPrivate *priv = AO_TASKS_GET_PRIVATE(t);
 	gchar *context, *tooltip;
@@ -529,7 +529,7 @@
 		TLIST_COL_FILENAME, DOC_FILENAME(doc),
 		TLIST_COL_DISPLAY_FILENAME, display_name,
 		TLIST_COL_LINE, line + 1,
-		TLIST_COL_NAME, line_buf,
+		TLIST_COL_NAME, task_start,
 		TLIST_COL_TOOLTIP, tooltip,
 		-1);
 	g_free(context);
@@ -540,7 +540,7 @@
 static void update_tasks_for_doc(AoTasks *t, GeanyDocument *doc)
 {
 	guint lines, line;
-	gchar *line_buf, *display_name;
+	gchar *line_buf, *display_name, *task_start;
 	gchar **token;
 	AoTasksPrivate *priv = AO_TASKS_GET_PRIVATE(t);
 
@@ -554,9 +554,17 @@
 			token = priv->tokens;
 			while (*token != NULL)
 			{
-				if (NZV(*token) && strstr(line_buf, *token) != NULL)
+				if (NZV(*token) && (task_start = strstr(line_buf, *token)) != NULL)
 				{
-					create_task(t, doc, line, line_buf, display_name);
+					/* skip the token and additional whitespace */
+					task_start += strlen(*token);
+					while (*task_start == ' ' || *task_start == ':')
+						task_start++;
+					/* reset task_start in case there is no text following */
+					if (! NZV(task_start))
+						task_start = line_buf;
+					/* create the task */
+					create_task(t, doc, line, line_buf, task_start, display_name);
 					/* if we found a token, continue on next line */
 					break;
 				}


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