SF.net SVN: geany: [984] trunk

[eht16 at users.sourceforge.net]

Revision: 984
          http://svn.sourceforge.net/geany/?rev=984&view=rev
Author:   eht16
Date:     2006-11-10 16:07:49 -0800 (Fri, 10 Nov 2006)

Log Message:
-----------
Probe different versions of libvte.so, not only libvte.so and libvte.so.4.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/vte.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-11-10 12:56:13 UTC (rev 983)
+++ trunk/ChangeLog	2006-11-11 00:07:49 UTC (rev 984)
@@ -1,3 +1,18 @@
+2006-11-11  Enrico Tröger  <enrico.troeger at uvena.de>
+
+ * src/vte.c: Probe different versions of libvte.so, not only libvte.so
+              and libvte.so.4.
+
+
+2006-11-09  Enrico Tröger  <enrico.troeger at uvena.de>
+
+ * src/highlighting.c, data/filetypes.java, data/filetypes.cpp,
+   data/filetypes.ferite, data/filetypes.c, data/filetypes.d,
+   data/filetypes.pascal, data/filetypes.sql, data/filetypes.xml:
+   Changed commentdoc(used for javadoc and Doxygen, /** */) colour to a
+   light blue.
+
+
 2006-11-09  Nick Treleaven  <nick.treleaven at btinternet.com>
 
  * src/keyfile.c, src/main.c:

Modified: trunk/src/vte.c
===================================================================
--- trunk/src/vte.c	2006-11-10 12:56:13 UTC (rev 983)
+++ trunk/src/vte.c	2006-11-11 00:07:49 UTC (rev 984)
@@ -117,14 +117,16 @@
 	else
 	{
 		module = g_module_open("libvte.so", G_MODULE_BIND_LAZY);
-		// try to fallback to libvte.so.4, if it is installed
+		// try to fallback to different versions of libvte.so.x
 		if (module == NULL) module = g_module_open("libvte.so.4", G_MODULE_BIND_LAZY);
+		else if (module == NULL) module = g_module_open("libvte.so.8", G_MODULE_BIND_LAZY);
+		else if (module == NULL) module = g_module_open("libvte.so.9", G_MODULE_BIND_LAZY);
 	}
 
 	if (module == NULL)
 	{
 		vte_info.have_vte = FALSE;
-		geany_debug("Could not load libvte.so.4, terminal support disabled");
+		geany_debug("Could not load libvte.so, terminal support disabled");
 		return;
 	}
 	else


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