SF.net SVN: geany:[5471] trunk

[ntrel at users.sourceforge.net]

Revision: 5471
          http://geany.svn.sourceforge.net/geany/?rev=5471&view=rev
Author:   ntrel
Date:     2010-12-07 13:16:57 +0000 (Tue, 07 Dec 2010)

Log Message:
-----------
Fix some more wrong uses of vte_info.load_vte instead of
vte_info.have_vte.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/build.c
    trunk/src/keyfile.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-12-07 13:02:46 UTC (rev 5470)
+++ trunk/ChangeLog	2010-12-07 13:16:57 UTC (rev 5471)
@@ -4,6 +4,9 @@
    Fix segfaults when using 'Send Selection to Terminal' and the VTE
    is not loaded, and when using Ctrl-A after enabling the 'Load VTE'
    pref (patch by Dimitar Zhekov, thanks).
+ * src/build.c, src/keyfile.c:
+   Fix some more wrong uses of vte_info.load_vte instead of
+   vte_info.have_vte.
 
 
 2010-12-06  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/src/build.c
===================================================================
--- trunk/src/build.c	2010-12-07 13:02:46 UTC (rev 5470)
+++ trunk/src/build.c	2010-12-07 13:16:57 UTC (rev 5471)
@@ -814,7 +814,7 @@
 	}
 
 #ifdef HAVE_VTE
-	if (vte_info.load_vte && vc != NULL && vc->run_in_vte)
+	if (vte_info.have_vte && vc->run_in_vte)
 	{
 		if (vc->skip_run_script)
 		{
@@ -866,7 +866,7 @@
 	run_info[cmdindex].file_type_id = doc->file_type->id;
 
 #ifdef HAVE_VTE
-	if (vte_info.load_vte && vc != NULL && vc->run_in_vte)
+	if (vte_info.have_vte && vc->run_in_vte)
 	{
 		gchar *vte_cmd;
 

Modified: trunk/src/keyfile.c
===================================================================
--- trunk/src/keyfile.c	2010-12-07 13:02:46 UTC (rev 5470)
+++ trunk/src/keyfile.c	2010-12-07 13:16:57 UTC (rev 5471)
@@ -450,7 +450,7 @@
 	/* VTE */
 #ifdef HAVE_VTE
 	g_key_file_set_boolean(config, "VTE", "load_vte", vte_info.load_vte);
-	if (vte_info.load_vte && vc != NULL)
+	if (vte_info.have_vte)
 	{
 		gchar *tmp_string;
 


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