GNOME.org
 

anjuta r4484 - in trunk: . global-tags plugins plugins/build plugins/editor plugins/gvim plugins/search plugins/sourceview plugins/symbol-browser plugins/symbol-db plugins/symbol-db/images scripts tagmanager

Author: jhs
Date: Fri Dec 26 00:24:00 2008
New Revision: 4484
URL: http://svn.gnome.org/viewvc/anjuta?rev=4484&view=rev

Log:
2008-12-26  Johannes  Schmid <jhs gnome org>

	* Makefile.am:
	* configure.in:
	* global-tags/.cvsignore:
	* global-tags/Makefile.am:
	* global-tags/create_global_tags.sh.in:
	* global-tags/tm_global_tags.c:
	* plugins/Makefile.am:
	* plugins/editor/Makefile.am:
	* plugins/editor/aneditor-calltip.cxx:
	* plugins/editor/aneditor-priv.h:
	* plugins/editor/aneditor.cxx:
	* plugins/editor/text_editor.h:
	* plugins/search/Makefile.am:
	* plugins/search/search-replace.c (save_not_opened_files):
	* plugins/search/search-replace_backend.c
	(file_buffer_new_from_te), (file_buffer_new_from_path),
	(create_search_entries):
	* plugins/sourceview/Makefile.am:
	* plugins/symbol-browser/.cvsignore:
	* plugins/symbol-browser/Makefile.am:
	* plugins/symbol-browser/an_symbol.c:
	* plugins/symbol-browser/an_symbol.h:
	* plugins/symbol-browser/an_symbol_info.c:
	* plugins/symbol-browser/an_symbol_info.h:
	* plugins/symbol-browser/an_symbol_iter.c:
	* plugins/symbol-browser/an_symbol_iter.h:
	* plugins/symbol-browser/an_symbol_prefs.c:
	* plugins/symbol-browser/an_symbol_prefs.h:
	* plugins/symbol-browser/an_symbol_search.c:
	* plugins/symbol-browser/an_symbol_search.h:
	* plugins/symbol-browser/an_symbol_view.c:
	* plugins/symbol-browser/an_symbol_view.h:
	* plugins/symbol-browser/anjuta-symbol-browser-plugin.glade:
	* plugins/symbol-browser/anjuta-symbol-browser-plugin.svg:
	* plugins/symbol-browser/anjuta-symbol-browser-plugin.ui:
	* plugins/symbol-browser/anjuta-symbol-browser.plugin.in:
	* plugins/symbol-browser/anjuta-symbol-locals.c:
	* plugins/symbol-browser/anjuta-symbol-locals.h:
	* plugins/symbol-browser/images/.cvsignore:
	* plugins/symbol-browser/images/Makefile.am:
	* plugins/symbol-browser/images/README:
	* plugins/symbol-browser/plugin.c:
	* plugins/symbol-browser/plugin.h:
	* plugins/symbol-browser/test-class.cpp:
	* plugins/symbol-browser/test-class.h:
	* plugins/symbol-browser/test-symbol-browser.c:
	* plugins/symbol-db/Makefile.am:
	* scripts/Makefile.am:
	* scripts/anjuta_import.sh.in:
	* tagmanager/.cvsignore:
	* tagmanager/Makefile.am:
	* tagmanager/acconfig.h:
	* tagmanager/args.c:
	* tagmanager/args.h:
	* tagmanager/asm.c:
	* tagmanager/asp.c:
	* tagmanager/awk.c:
	* tagmanager/beta.c:
	* tagmanager/c.c:
	* tagmanager/cobol.c:
	* tagmanager/ctags.c:
	* tagmanager/ctags.h:
	* tagmanager/debug.c:
	* tagmanager/debug.h:
	* tagmanager/eiffel.c:
	* tagmanager/entry.c:
	* tagmanager/entry.h:
	* tagmanager/erlang.c:
	* tagmanager/fortran.c:
	* tagmanager/general.h:
	* tagmanager/get.c:
	* tagmanager/get.h:
	* tagmanager/html.c:
	* tagmanager/include/.cvsignore:
	* tagmanager/include/Makefile.am:
	* tagmanager/include/tm_file_entry.h:
	* tagmanager/include/tm_project.h:
	* tagmanager/include/tm_source_file.h:
	* tagmanager/include/tm_symbol.h:
	* tagmanager/include/tm_tag.h:
	* tagmanager/include/tm_tagmanager.h:
	* tagmanager/include/tm_work_object.h:
	* tagmanager/include/tm_workspace.h:
	* tagmanager/jscript.c:
	* tagmanager/keyword.c:
	* tagmanager/keyword.h:
	* tagmanager/lisp.c:
	* tagmanager/lregex.c:
	* tagmanager/lua.c:
	* tagmanager/main.h:
	* tagmanager/make.c:
	* tagmanager/options.c:
	* tagmanager/options.h:
	* tagmanager/parse.c:
	* tagmanager/parse.h:
	* tagmanager/parsers.h:
	* tagmanager/pascal.c:
	* tagmanager/perl.c:
	* tagmanager/php.c:
	* tagmanager/python.c:
	* tagmanager/read.c:
	* tagmanager/read.h:
	* tagmanager/readtags.c:
	* tagmanager/readtags.h:
	* tagmanager/regex.c:
	* tagmanager/rexx.c:
	* tagmanager/routines.c:
	* tagmanager/routines.h:
	* tagmanager/ruby.c:
	* tagmanager/scheme.c:
	* tagmanager/sh.c:
	* tagmanager/slang.c:
	* tagmanager/sml.c:
	* tagmanager/sort.c:
	* tagmanager/sort.h:
	* tagmanager/sql.c:
	* tagmanager/strlist.c:
	* tagmanager/strlist.h:
	* tagmanager/tcl.c:
	* tagmanager/test_tm_buffer.c:
	* tagmanager/tm_file_entry.c:
	* tagmanager/tm_project.c:
	* tagmanager/tm_source_file.c:
	* tagmanager/tm_symbol.c:
	* tagmanager/tm_tag.c:
	* tagmanager/tm_tagmanager.c:
	* tagmanager/tm_work_object.c:
	* tagmanager/tm_workspace.c:
	* tagmanager/verilog.c:
	* tagmanager/vim.c:
	* tagmanager/vstring.c:
	* tagmanager/vstring.h:
	* tagmanager/yacc.c:

	Removed tagmanager/symbol-browser in favour of the nearly stable symbol-db plugin. Commented
	some very old code in scintilla that is probably not used anymore though  some portions can be ported
	to IAnjutaSymbolManager interface such as highlighting of tags. 
	Adapted some other plugins that very using tagmanager for strange things (like search).

	* plugins/build/build_file.c:
	* plugins/build/build_file.h:
	* plugins/build/build_project.c:
	* plugins/build/build_project.h:
	* plugins/build/clean_project.c:
	* plugins/build/clean_project.h:
	* plugins/build/commands.c:
	* plugins/build/commands.h:
	* plugins/build/compile.c:
	* plugins/build/compile.h:
	* plugins/build/compiler_options.c:
	* plugins/build/compiler_options.h:
	* plugins/build/configurer.c:
	* plugins/build/configurer.h:
	* plugins/build/executer.c:
	* plugins/build/executer.h:
	Removed obsolete build plugin. If you really need to have a look check the svn history.

	* plugins/gvim/.cvsignore:
	* plugins/gvim/Makefile.am:
	* plugins/gvim/anjuta-vim.c:
	* plugins/gvim/anjuta-vim.h:
	* plugins/gvim/anjuta-vim.plugin.in:
	* plugins/gvim/gtkvim.c:
	* plugins/gvim/gtkvim.h:
	* plugins/gvim/plugin.c:
	* plugins/gvim/plugin.h:
	Removed gvim plugin. It is replaced by the GSoc vim plugin.

2008-12-25  Jens Georg  <mail jensge org>
 
	Reviewed by: Johannes Schmid <jhs gnome org>
 
	* plugins/search/search-replace_backend.c: 
	* plugins/search/search-replace.c:
	remove usage of std i/o (#565492)


Added:
   trunk/plugins/symbol-db/images/   (props changed)
      - copied from r4483, /trunk/plugins/symbol-browser/images/
Removed:
   trunk/global-tags/
   trunk/plugins/build/
   trunk/plugins/gvim/
   trunk/plugins/symbol-browser/
   trunk/scripts/anjuta_import.sh.in
   trunk/tagmanager/
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in
   trunk/plugins/Makefile.am
   trunk/plugins/editor/Makefile.am
   trunk/plugins/editor/aneditor-calltip.cxx
   trunk/plugins/editor/aneditor-priv.h
   trunk/plugins/editor/aneditor.cxx
   trunk/plugins/editor/text_editor.h
   trunk/plugins/search/Makefile.am
   trunk/plugins/search/search-replace.c
   trunk/plugins/search/search-replace_backend.c
   trunk/plugins/sourceview/Makefile.am
   trunk/plugins/symbol-db/Makefile.am
   trunk/scripts/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Fri Dec 26 00:24:00 2008
@@ -2,7 +2,7 @@
 
 @INTLTOOL_DESKTOP_RULE@
 
-SUBDIRS = tagmanager global-tags \
+SUBDIRS = \
 	pixmaps scripts data \
 	doc libanjuta plugins src manuals mime launcher po
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Dec 26 00:24:00 2008
@@ -45,7 +45,7 @@
 GTKSOURCEVIEW_REQUIRED=2.4.0
 BINUTILS_REQUIRED=2.15.92
 LIBWNCK_REQUIRED=2.12
-GDA_REQUIRED=3.99.6
+GDA_REQUIRED=3.99.7
 
 dnl LIBGTODO_REQUIRED=0.15
 
@@ -352,30 +352,8 @@
 fi
 AM_CONDITIONAL(HAVE_PLUGIN_SCINTILLA, [test x$scintilla = xyes])
 
-dnl Build symbol-db only if we have gda
-dnl -------------------------------------------------------------
-user_disabled_symboldb=1
-AC_ARG_ENABLE(plugin-symbol-db,
-	AC_HELP_STRING([--enable-plugin-symbol-db],[Enable experimental symbol-db plugin]), 
-	[ if test "$enableval" = "yes"; then
-		user_disabled_symboldb=0
-	  fi ],
-	[ user_disabled_symboldb=1 ])
-
-AC_MSG_CHECKING(if symbol-db plugin is disabled)
-if test "$user_disabled_symboldb" = 1; then
-	AC_MSG_RESULT(yes)
-	symboldb="no"
-else
-	AC_MSG_RESULT(no)
-	
-	PKG_CHECK_MODULES(PLUGIN_SYMBOL_DB,
-		[libgda-4.0 >= $GDA_REQUIRED],
-		[symboldb="yes"],
-		[symboldb="no"])
-fi
-
-AM_CONDITIONAL(HAVE_PLUGIN_SYMBOL_DB, [test x$symboldb = xyes])
+PKG_CHECK_MODULES(PLUGIN_SYMBOL_DB,
+		[libgda-4.0 >= $GDA_REQUIRED])
 
 dnl Valgrind plugin
 dnl check for libbfd
@@ -925,9 +903,6 @@
 AC_OUTPUT([
 Makefile
 po/Makefile.in
-tagmanager/Makefile
-tagmanager/include/Makefile
-global-tags/Makefile
 libanjuta/Makefile
 libanjuta/libanjuta-1.0.pc
 libanjuta/anjuta-version.h
@@ -940,7 +915,6 @@
 doc/anjuta_launcher.1
 doc/Makefile
 scripts/Makefile
-scripts/anjuta_import.sh
 launcher/Makefile
 plugins/Makefile
 plugins/sample1/Makefile
@@ -969,8 +943,7 @@
 plugins/build-basic-autotools/Makefile
 plugins/profiler/Makefile
 plugins/project-manager/Makefile
-plugins/symbol-browser/Makefile
-plugins/symbol-browser/images/Makefile
+plugins/symbol-db/images/Makefile
 plugins/symbol-db/Makefile
 plugins/symbol-db/test/Makefile
 plugins/cvs-plugin/Makefile
@@ -1106,12 +1079,6 @@
 else
         echo "Building Scintilla based editor: .......................NO"
 fi
-
-if [ test x$symboldb = xyes ]; then
-        echo "Building new (unstable) Symbol-db plugin: ..............YES"
-else
-        echo "Building new (unstable) Symbol-db plugin: ..............NO"
-fi
 echo "-------------------------------------------------------------------"
 #echo "AM_CFLAGS = $AM_CFLAGS"
 #echo "AM_CXXFLAGS = $AM_CXXFLAGS"

Modified: trunk/plugins/Makefile.am
==============================================================================
--- trunk/plugins/Makefile.am	(original)
+++ trunk/plugins/Makefile.am	Fri Dec 26 00:24:00 2008
@@ -31,7 +31,6 @@
 	profiler \
 	language-manager \
 	symbol-db \
-	symbol-browser \
 	git \
 	sourceview \
 	run-program \

Modified: trunk/plugins/editor/Makefile.am
==============================================================================
--- trunk/plugins/editor/Makefile.am	(original)
+++ trunk/plugins/editor/Makefile.am	Fri Dec 26 00:24:00 2008
@@ -26,8 +26,7 @@
 	$(LIBANJUTA_CFLAGS) \
 	$(GTK_CFLAGS) \
 	$(GNOME_CFLAGS) \
-	-I$(srcdir)/scintilla/include \
-	-I$(top_srcdir)/tagmanager/include
+	-I$(srcdir)/scintilla/include
 
 libanjuta_editor_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
@@ -37,8 +36,7 @@
 	$(GTK_LIBS) \
 	$(GNOME_LIBS) \
 	$(GLADE_LIBS) \
-	scintilla/libanjuta-scintilla.la \
-	$(top_builddir)/tagmanager/libanjuta-ctags.la
+	scintilla/libanjuta-scintilla.la
 
 libanjuta_editor_la_SOURCES= \
 	properties.cxx \

Modified: trunk/plugins/editor/aneditor-calltip.cxx
==============================================================================
--- trunk/plugins/editor/aneditor-calltip.cxx	(original)
+++ trunk/plugins/editor/aneditor-calltip.cxx	Fri Dec 26 00:24:00 2008
@@ -22,6 +22,7 @@
 #include "aneditor-priv.h"
 
 bool AnEditor::StartCallTip_new() {
+#if 0
 	TMTagAttrType attrs[] =
 	{
 		tm_tag_attr_name_t, tm_tag_attr_type_t, tm_tag_attr_none_t
@@ -103,6 +104,7 @@
 		g_free (real_tip);
 		ContinueCallTip_new();
 	}
+#endif
 	return true;
 }
 
@@ -307,6 +309,7 @@
 // them
 
 void AnEditor::CompleteCallTip() {
+#if 0
 	char expr[256];
 	TMTagAttrType attrs[] = {tm_tag_attr_name_t, tm_tag_attr_type_t, tm_tag_attr_none_t};
 	int caret_position = SendEditor(SCI_GETCURRENTPOS);
@@ -342,4 +345,5 @@
 		SendEditorString(SCI_CALLTIPSHOW, caret_position, real_tip);
 		g_free (real_tip);
 	}
+#endif
 }

Modified: trunk/plugins/editor/aneditor-priv.h
==============================================================================
--- trunk/plugins/editor/aneditor-priv.h	(original)
+++ trunk/plugins/editor/aneditor-priv.h	Fri Dec 26 00:24:00 2008
@@ -53,8 +53,6 @@
 
 #include <libanjuta/resources.h>
 
-#include "tm_tagmanager.h"
-
 #include <string>
 #include <memory>
 

Modified: trunk/plugins/editor/aneditor.cxx
==============================================================================
--- trunk/plugins/editor/aneditor.cxx	(original)
+++ trunk/plugins/editor/aneditor.cxx	Fri Dec 26 00:24:00 2008
@@ -2516,6 +2516,8 @@
 	SString kw2 = props->GetNewExpand("keywords3.", fileNameForExtension.c_str());
 	SendEditorString(SCI_SETKEYWORDS, 2, kw2.c_str());
 	/* For C/C++ projects, get list of typedefs for colorizing */
+	/* TODO: Either remove or port to IAnjutaSymbolManager */
+#if 0
 	if (SCLEX_CPP == lexLanguage)
 	{
 		const TMWorkspace *workspace = tm_get_workspace();
@@ -2568,6 +2570,7 @@
 		}
 	}
 	else
+#endif
 	{
 		SString kw1 = props->GetNewExpand("keywords2.", fileNameForExtension.c_str());
 		SendEditorString(SCI_SETKEYWORDS, 1, kw1.c_str());

Modified: trunk/plugins/editor/text_editor.h
==============================================================================
--- trunk/plugins/editor/text_editor.h	(original)
+++ trunk/plugins/editor/text_editor.h	Fri Dec 26 00:24:00 2008
@@ -28,8 +28,6 @@
 
 #include "aneditor.h"
 
-#include "tm_tagmanager.h"
-
 #include <libanjuta/anjuta-status.h>
 #include <libanjuta/anjuta-encodings.h>
 

Modified: trunk/plugins/search/Makefile.am
==============================================================================
--- trunk/plugins/search/Makefile.am	(original)
+++ trunk/plugins/search/Makefile.am	Fri Dec 26 00:24:00 2008
@@ -39,8 +39,7 @@
 	$(GNOME_PRINT_UI_LIBS) \
 	$(GNOME_UI_LIBS) \
 	$(GLADE_LIBS) \
-	$(LIBANJUTA_LIBS) \
-	$(top_builddir)/tagmanager/libanjuta-ctags.la
+	$(LIBANJUTA_LIBS)
 
 libanjuta_search_la_SOURCES= \
 	plugin.c \

Modified: trunk/plugins/search/search-replace.c
==============================================================================
--- trunk/plugins/search/search-replace.c	(original)
+++ trunk/plugins/search/search-replace.c	Fri Dec 26 00:24:00 2008
@@ -699,13 +699,39 @@
 static void
 save_not_opened_files(FileBuffer *fb)
 {
-	FILE *fp;
-
-	fp = fopen(fb->path, "wb");	
-	if (!fp)
-			return;
-	fwrite(fb->buf, fb->len, 1, fp);
-	fclose(fp);
+	GFile *file;
+	GOutputStream *os;
+	gsize written;
+	gsize size;
+	gchar *buffer;
+
+	file = g_file_new_for_uri (fb->uri);
+	os = G_OUTPUT_STREAM (g_file_replace (file, 
+			NULL,
+			FALSE,
+			G_FILE_CREATE_NONE,
+			NULL,
+			NULL));
+	if (os == NULL)
+	{
+		g_object_unref (file);
+		return;
+	}
+
+	buffer = fb->buf;
+	size = fb->len;
+	do
+	{
+		written = g_output_stream_write (os, 
+				buffer, size, NULL, NULL);
+		
+		size -= written;
+		buffer += size;
+	}
+	while (written != -1 && size > 0);
+	g_output_stream_close(os, NULL, NULL);
+	g_object_unref (os);
+	g_object_unref (file);
 }
 
 static gboolean

Modified: trunk/plugins/search/search-replace_backend.c
==============================================================================
--- trunk/plugins/search/search-replace_backend.c	(original)
+++ trunk/plugins/search/search-replace_backend.c	Fri Dec 26 00:24:00 2008
@@ -62,7 +62,6 @@
 */
 
 #include "search-replace_backend.h"
-#include "tm_tagmanager.h"
 
 /* Information about a matched substring */
 typedef struct _MatchSubStr
@@ -130,11 +129,6 @@
 	
 	file = ianjuta_file_get_file(IANJUTA_FILE(te), NULL);
 	path = g_file_get_path (file);
-	if (path)
-	{
-		fb->path = tm_get_real_path(path);
-		g_free (path);
-	}
 	fb->uri = g_file_get_uri (file);
 	fb->len = ianjuta_editor_get_length(te, NULL);
 	fb->buf = ianjuta_editor_get_text_all (fb->te, NULL);
@@ -155,33 +149,29 @@
 	FileBuffer *fb;
 	IAnjutaEditor *te;
 	IAnjutaDocument* doc;
-	char *real_path;
 	GFile* file;
 	char *uri;
 	int i;
 	int lineno;
 
 	g_return_val_if_fail(path, NULL);
-	real_path = tm_get_real_path(path);
 	
 	/* There might be an already open TextEditor with this path */
-	file = g_file_new_for_path (real_path);
+	file = g_file_new_for_path (path);
 	uri = g_file_get_uri (file);
 	doc = ianjuta_document_manager_find_document_with_file (sr->docman,
 														 file, NULL);
-	g_object_unref (file);
-
 	if (doc && IANJUTA_IS_EDITOR (doc))
 	{
 		te = IANJUTA_EDITOR (doc);
-		g_free(real_path);
 		return file_buffer_new_from_te(te);
 	}
 	fb = g_new0(FileBuffer, 1);
 	fb->type = FB_FILE;
-	fb->path = real_path;
+	fb->path = g_file_get_path (file);
 	fb->uri = uri;
 	fb->name = strrchr(path, '/');
+	g_object_unref (file);
 	if (fb->name)
 		++ fb->name;
 	else
@@ -195,37 +185,73 @@
 	}
 	else
 	{
-		struct stat s;
+		GFileInfo *fi;
+		guint64 size;
 
-		if ((0 == stat(fb->path, &s)) && (S_ISREG(s.st_mode)))
-		{
-			if ((fb->len = s.st_size) < 0) return NULL;
-			fb->buf = g_new(char, s.st_size + 1);
-			{
-				int total_bytes = 0, bytes_read, fd;
-				if (0 > (fd = open(fb->path, O_RDONLY)))
-				{
-					perror(fb->path);
-					file_buffer_free(fb);
+		file = g_file_new_for_path (fb->path);
+		fi = g_file_query_info (file,
+				G_FILE_ATTRIBUTE_STANDARD_SIZE ","
+				G_FILE_ATTRIBUTE_STANDARD_TYPE,
+				G_FILE_QUERY_INFO_NONE,
+				NULL, NULL);
+		if (fi != NULL && g_file_info_get_file_type(fi) == G_FILE_TYPE_REGULAR)
+		{
+			size = g_file_info_get_attribute_uint64(fi, G_FILE_ATTRIBUTE_STANDARD_SIZE);
+			g_object_unref (fi);
+			fi = NULL;
+
+			if ((fb->len = size) < 0) return NULL;
+			fb->buf = g_new(char, size + 1);
+			{
+				int total_bytes = 0, bytes_read;
+				GInputStream *is;
+				GError* error = NULL;
+
+				is = G_INPUT_STREAM (g_file_read (file, NULL, &error));
+				if (NULL == is)
+				{
+					DEBUG_PRINT("Error opening file: %s", error->message);
+					g_error_free (error);
+					file_buffer_free (fb);
+					g_object_unref (file);
 					return NULL;
 				}
-				while (total_bytes < s.st_size)
+
+				while (total_bytes < size)
 				{
-					if (0 > (bytes_read = read(fd, fb->buf + total_bytes
-					  , s.st_size - total_bytes)))
+					bytes_read = g_input_stream_read (is,
+							fb->buf + total_bytes,
+							size - total_bytes,
+							NULL,
+							&error);
+					if (bytes_read == -1)
 					{
-						perror(fb->path);
-						close(fd);
-						file_buffer_free(fb);
+						DEBUG_PRINT("Error reading from file: %s", error->message);
+						g_error_free (error);
+						file_buffer_free (fb);
+						g_input_stream_close (is, NULL, NULL);
+						g_object_unref (is);
+						g_object_unref (file);
 						return NULL;
 					}
 					total_bytes += bytes_read;
 				}
-				close(fd);
+
+				g_input_stream_close (is, NULL, NULL);
+				g_object_unref (is);
+				g_object_unref (file);
 				fb->buf[fb->len] = '\0';
 			}
 		}
+		else
+		{
+			if (NULL != fi)
+			{
+				g_object_unref (fi);
+			}
+		}
 	}
+
 	if (!g_utf8_validate (fb->buf, MIN(MAX_VALIDATE, fb->len), NULL))
 	{
 		const AnjutaEncoding *encoding_used = NULL;
@@ -333,26 +359,6 @@
 	return g_strndup (fb->buf + i + 1, length);
 }
 
-/* Generate a list of files to search in. Call with start = TRUE and
-** top_dir = sf->top_dir. This is used when the search range is specified as
-SR_FILES */
-static GList *
-create_search_files_list(SearchFiles *sf, const char *top_dir)
-{
-	TMFileEntry *entry;
-	GList *files;
-
-	g_return_val_if_fail(sf && top_dir, NULL);
-	entry = tm_file_entry_new(top_dir, NULL, sf->recurse, sf->match_files
-	  , sf->ignore_files, sf->match_dirs, sf->ignore_dirs
-	  , sf->ignore_hidden_files, sf->ignore_hidden_dirs);
-	if (!entry)
-		return NULL;
-	files = tm_file_entry_list(entry, NULL);
-	tm_file_entry_free(entry);
-	return files;
-}
-
 /* Get a list of all project files */
 static GList *
 get_project_file_list(void)
@@ -829,10 +835,7 @@
 				dir = g_get_current_dir();
 			}
 
-			if (SR_FILES == s->range.type)
-				files = create_search_files_list(&(s->range.files), dir);
-			else /* if (SR_PROJECT == s->range.type) */
-				files = get_project_file_list();	
+			files = get_project_file_list();	
 			
 			if (files)
 			{

Modified: trunk/plugins/sourceview/Makefile.am
==============================================================================
--- trunk/plugins/sourceview/Makefile.am	(original)
+++ trunk/plugins/sourceview/Makefile.am	Fri Dec 26 00:24:00 2008
@@ -27,8 +27,7 @@
 	$(GNOME_PRINT_UI_CFLAGS) \
 	$(GNOME_VFS_CFLAGS) \
 	$(PLUGIN_SOURCEVIEW_CFLAGS) \
-	$(LIBANJUTA_CFLAGS) \
-	-I$(top_srcdir)/tagmanager/include
+	$(LIBANJUTA_CFLAGS)
 
 # Where to install the plugin
 plugindir = $(anjuta_plugin_dir)
@@ -79,8 +78,7 @@
 	$(GNOME_VFS_LIBS) \
 	$(PLUGIN_SOURCEVIEW_LIBS) \
 	$(GLADE_LIBS) \
-	$(LIBANJUTA_LIBS) \
-	$(top_builddir)/tagmanager/libanjuta-ctags.la
+	$(LIBANJUTA_LIBS)
 
 prefs_glade_files = anjuta-editor-sourceview.glade
 include $(top_srcdir)/scripts/build-schemas.mk

Modified: trunk/plugins/symbol-db/Makefile.am
==============================================================================
--- trunk/plugins/symbol-db/Makefile.am	(original)
+++ trunk/plugins/symbol-db/Makefile.am	Fri Dec 26 00:24:00 2008
@@ -1,6 +1,4 @@
-if HAVE_PLUGIN_SYMBOL_DB
-
-#SUBDIRS = test
+SUBDIRS = images 
 
 symbol_db_datadir = $(anjuta_data_dir)
 symbol_db_data_DATA = tables.sql
@@ -82,8 +80,5 @@
 	$(symbol_db_pixmaps_DATA) \
 	$(symbol_db_data_DATA)
 
-endif
-
-
 
 

Modified: trunk/scripts/Makefile.am
==============================================================================
--- trunk/scripts/Makefile.am	(original)
+++ trunk/scripts/Makefile.am	Fri Dec 26 00:24:00 2008
@@ -1,7 +1,5 @@
 anjuta_datadir = $(anjuta_data_dir)
 
-bin_SCRIPTS = anjuta_import.sh
-
 anjuta_data_DATA = anjuta_project.template
 
 EXTRA_DIST = $(anjuta_data_DATA)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]