anjuta r4049 - in trunk: . global-tags plugins/language-support-cpp-java plugins/symbol-browser

[jhs svn gnome org]

Author: jhs
Date: Fri Jul  4 18:45:57 2008
New Revision: 4049
URL: http://svn.gnome.org/viewvc/anjuta?rev=4049&view=rev

Log:
2008-07-04  Johannes Schmid  <jhs gnome org>

	Patch from Arun Chaganty:
	* configure.in:
	* plugins/symbol-browser/an_symbol_prefs.c
	(on_create_tags_clicked):
	#515954 â create_global_tags.sh: wrong anjuta-tags path

	* global-tags/create_global_tags.sh.in:
	Use #!/bin/bash instead of #!/bin/sh as the script does not work with dash

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/global-tags/create_global_tags.sh.in
   trunk/plugins/language-support-cpp-java/cpp-java-assist.c
   trunk/plugins/symbol-browser/an_symbol_prefs.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Jul  4 18:45:57 2008
@@ -557,7 +557,7 @@
 
 dnl Setup Anjuta Library flags
 dnl --------------------------
-LIBANJUTA_CFLAGS='$(GNOME_UI_CFLAGS) $(GLADE_CFLAGS) -I$(top_srcdir) -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)\"" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"'
+LIBANJUTA_CFLAGS='$(GNOME_UI_CFLAGS) $(GLADE_CFLAGS) -I$(top_srcdir) -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"'
 LIBANJUTA_LIBS='$(top_builddir)/libanjuta/libanjuta.la'
 AC_SUBST(LIBANJUTA_CFLAGS)
 AC_SUBST(LIBANJUTA_LIBS)

Modified: trunk/global-tags/create_global_tags.sh.in
==============================================================================
--- trunk/global-tags/create_global_tags.sh.in	(original)
+++ trunk/global-tags/create_global_tags.sh.in	Fri Jul  4 18:45:57 2008
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 function anjuta_tags {
 

Modified: trunk/plugins/language-support-cpp-java/cpp-java-assist.c
==============================================================================
--- trunk/plugins/language-support-cpp-java/cpp-java-assist.c	(original)
+++ trunk/plugins/language-support-cpp-java/cpp-java-assist.c	Fri Jul  4 18:45:57 2008
@@ -363,7 +363,7 @@
 									    TRUE,
 										IANJUTA_SYMBOL_FIELD_SIMPLE|IANJUTA_SYMBOL_FIELD_TYPE,
 										pre_word, TRUE, FALSE, FALSE, max_completions, -1, NULL);
-
+	
 	IAnjutaIterable* iter_globals = 
 		ianjuta_symbol_manager_search (assist->priv->isymbol_manager,
 										IANJUTA_SYMBOL_TYPE_MAX,
@@ -382,7 +382,7 @@
 	{
 		DEBUG_PRINT ("cpp_java_assist_create_word_completion_cache () 2");
 		completion = create_completion (assist->priv->iassist, iter_globals, completion);
-		g_object_unref (iter_globals);		
+		g_object_unref (iter_globals);
 	}
 	
 	editor_completions = ianjuta_editor_assist_get_suggestions (assist->priv->iassist,

Modified: trunk/plugins/symbol-browser/an_symbol_prefs.c
==============================================================================
--- trunk/plugins/symbol-browser/an_symbol_prefs.c	(original)
+++ trunk/plugins/symbol-browser/an_symbol_prefs.c	Fri Jul  4 18:45:57 2008
@@ -485,7 +485,7 @@
 		/* Execute anjuta-tags to create tags for the given files */
 		if ((pid = fork()) == 0)
 		{
-			execvp (g_build_filename (PACKAGE_DATA_DIR, "scripts",
+			execvp (g_build_filename (PACKAGE_LIB_DIR,
 									  "anjuta-tags", NULL), argv);
 			perror ("Could not execute anjuta-tags");
 		}