SF.net SVN: geany:[4352] trunk

[elextr at users.sourceforge.net]

Revision: 4352
          http://geany.svn.sourceforge.net/geany/?rev=4352&view=rev
Author:   elextr
Date:     2009-10-22 09:19:30 +0000 (Thu, 22 Oct 2009)

Log Message:
-----------
Make non-project execute configuration save to filetypes not geany.conf. 
Fix closing of project failing to remove build commands dialog entry.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/geany.txt
    trunk/src/build.c
    trunk/src/project.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-22 00:46:54 UTC (rev 4351)
+++ trunk/ChangeLog	2009-10-22 09:19:30 UTC (rev 4352)
@@ -3,6 +3,9 @@
  * src/build.c, src/build.h, src/filetypes.h:
    Include code for project filetype execute commands and fix bug in
    saving project filetypes list.
+ * src/project.c, src/build.c:
+   Make non-project execute configuration save to filetypes not geany.conf. 
+   Fix closing of project failing to remove build commands dialog entry.
 
 
 2009-10-20  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/doc/geany.txt
===================================================================
--- trunk/doc/geany.txt	2009-10-22 00:46:54 UTC (rev 4351)
+++ trunk/doc/geany.txt	2009-10-22 09:19:30 UTC (rev 4352)
@@ -2587,8 +2587,8 @@
 |              |                     | ~/.config/geany/filedefs | Saves To: as user |                               |
 |              | Saves To:           |                          | preferences left  |                               |
 |              | project file        | Saves To:                |                   |                               |
-|              |                     | geany.conf file in       |                   |                               |
-|              |                     | ~/.config/geany          |                   |                               |
+|              |                     | filetype.xxx file in     |                   |                               |
+|              |                     | ~/.config/geany/filedefs |                   |                               |
 +--------------+---------------------+--------------------------+-------------------+-------------------------------+
 
 The following notes on the table reference cells by coordinate as (group,source):
@@ -2609,9 +2609,9 @@
   non-filetype commands in a filetype file, this provides the ability to
   define filetype dependent default menu items.
 
-* (Execute, Project File) and (Execute, Preferences) - the filetype based execute
-  configuration can only be set by hand editing the appropriate file, see
-  `Preferences File Format` and `Project File Format`.
+* (Execute, Project File) and (Execute, Preferences) - the project filetype based execute 
+  configuration and preferences non-filetype based execute can only be set by hand editing the 
+  appropriate file, see `Preferences File Format` and `Project File Format`.
 
 Build Menu Commands Dialog
 ^^^^^^^^^^^^^^^^^^^^^^^^^^

Modified: trunk/src/build.c
===================================================================
--- trunk/src/build.c	2009-10-22 00:46:54 UTC (rev 4351)
+++ trunk/src/build.c	2009-10-22 09:19:30 UTC (rev 4352)
@@ -2061,16 +2061,17 @@
 	response = gtk_dialog_run(GTK_DIALOG(dialog));
 
 	prefdsts.dst[GEANY_GBG_NON_FT] = &non_ft_pref;
-	prefdsts.dst[GEANY_GBG_EXEC] = &exec_pref;
 	if (ft != NULL)
 	{
 		prefdsts.dst[GEANY_GBG_FT] = &(ft->homefilecmds);
 		prefdsts.fileregexstr = &(ft->homeerror_regex_string);
+		prefdsts.dst[GEANY_GBG_EXEC] = &(ft->homeexeccmds);
 	}
 	else
 	{
 		prefdsts.dst[GEANY_GBG_FT] = NULL;
 		prefdsts.fileregexstr = NULL;
+		prefdsts.dst[GEANY_GBG_EXEC] = NULL;
 	}
 	prefdsts.nonfileregexstr = &regex_pref;
 	if (build_read_commands(&prefdsts, table_data, response) && ft != NULL)

Modified: trunk/src/project.c
===================================================================
--- trunk/src/project.c	2009-10-22 00:46:54 UTC (rev 4351)
+++ trunk/src/project.c	2009-10-22 09:19:30 UTC (rev 4352)
@@ -328,6 +328,7 @@
 	if (ft != NULL)
 	{
 		setptr(ft->projfilecmds, NULL);
+		setptr(ft->projexeccmds, NULL);
 		setptr(ft->projerror_regex_string, NULL);
 		ft->project_list_entry = -1;
 	}


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