anjuta r4735 - in trunk: . plugins/gbf-am plugins/tools/scripts

[sgranjoux svn gnome org]

Author: sgranjoux
Date: Wed Feb 11 20:21:40 2009
New Revision: 4735
URL: http://svn.gnome.org/viewvc/anjuta?rev=4735&view=rev

Log:
	* plugins/tools/scripts/tools-2.xml.in:
	Fixed wrong path of grep command.

	* plugins/gbf-am/gbf-am-parse.in:
	Fixed #571262 â gbf-am: treat tail slash as a package (pkg_check_module)
	
	* plugins/gbf-am/gbf-am-properties.c (add_package_clicked_cb),
	(gbf_am_properties_get_widget):
	Fixed #566991 â list project modules in sorted order


Modified:
   trunk/ChangeLog
   trunk/plugins/gbf-am/gbf-am-parse.in
   trunk/plugins/gbf-am/gbf-am-properties.c
   trunk/plugins/tools/scripts/tools-2.xml.in

Modified: trunk/plugins/gbf-am/gbf-am-parse.in
==============================================================================
--- trunk/plugins/gbf-am/gbf-am-parse.in	(original)
+++ trunk/plugins/gbf-am/gbf-am-parse.in	Wed Feb 11 20:21:40 2009
@@ -532,6 +532,9 @@
 	my @pkgs = split(/\s+/, $packages);
 	my @tmp;
 	foreach my $pkg (@pkgs) {
+	    if ($pkg =~ m/^\\$/) {
+		next;
+	    }
 	    $pkg =~ s/_\$\$_>=_\$\$_/ >= /g;
 	    $pkg =~ s/_\$\$_<=_\$\$_/ <= /g;
 	    $pkg =~ s/_\$\$_==_\$\$_/ == /g;

Modified: trunk/plugins/gbf-am/gbf-am-properties.c
==============================================================================
--- trunk/plugins/gbf-am/gbf-am-properties.c	(original)
+++ trunk/plugins/gbf-am/gbf-am-properties.c	Wed Feb 11 20:21:40 2009
@@ -427,6 +427,7 @@
 							renderer,
 							"text", COL_PKG_PACKAGE,
 							NULL);
+	gtk_tree_view_column_set_sort_column_id (col, COL_PKG_PACKAGE);
 	gtk_tree_view_append_column (GTK_TREE_VIEW (pkg_treeview), col);
 	renderer = gtk_cell_renderer_text_new ();
 	col = gtk_tree_view_column_new_with_attributes (_("Version"),
@@ -914,6 +915,7 @@
 	col = gtk_tree_view_column_new_with_attributes (_("Module/Packages"),
 							renderer,
 							"text", 0, NULL);
+	gtk_tree_view_column_set_sort_column_id (col, 0);
 	gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), col);
 	renderer = gtk_cell_renderer_text_new ();
 	g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL);
@@ -955,6 +957,7 @@
 							renderer,
 							"text", 
 							COL_VAR_NAME, NULL);
+	gtk_tree_view_column_set_sort_column_id (col, COL_VAR_NAME);
 	gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), col);
 	renderer = gtk_cell_renderer_text_new ();
 	g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL);

Modified: trunk/plugins/tools/scripts/tools-2.xml.in
==============================================================================
--- trunk/plugins/tools/scripts/tools-2.xml.in	(original)
+++ trunk/plugins/tools/scripts/tools-2.xml.in	Wed Feb 11 20:21:40 2009
@@ -37,7 +37,7 @@
 		<shortcut></shortcut>
 	</tool>
 	<tool name="Find With Grep">
-		<command>/usr/xpg4/bin/grep -r -e</command>
+		<command>grep -r -e</command>
 		<parameter>$(ask_user_string) .</parameter>
 		<working_dir>$(project_root_directory)</working_dir>
 		<enabled>1</enabled>