Commit 4775cdb6 authored by Sebastien Granjoux's avatar Sebastien Granjoux

Fixed wrong path of grep command.

	* 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

svn path=/trunk/; revision=4735
parent 2d4e4112
2009-02-11 Yang Hong <hongyang@redflag-linux.com>
reviewed by: Sébastien Granjoux <seb.sfo@free.fr>
* 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
2009-02-11 Johannes Schmid <jhs@gnome.org> 2009-02-11 Johannes Schmid <jhs@gnome.org>
* plugins/sourceview/sourceview.c (ilanguage_set_language): * plugins/sourceview/sourceview.c (ilanguage_set_language):
...@@ -15,7 +29,7 @@ ...@@ -15,7 +29,7 @@
* plugins/sourceview/plugin.c (create_style_model): * plugins/sourceview/plugin.c (create_style_model):
#571114 – Crash after clicking on Edit/Preferences with open document #571114 – Crash after clicking on Edit/Preferences with open document
2009-02-10 Yang Hong <hongyang@redflag-linux.com.com> 2009-02-10 Yang Hong <hongyang@redflag-linux.com>
* plugins/message-view/message-view.c (message_view_instance_init): * plugins/message-view/message-view.c (message_view_instance_init):
Align message filters into left. Align message filters into left.
...@@ -532,6 +532,9 @@ sub extract_project_config ...@@ -532,6 +532,9 @@ sub extract_project_config
my @pkgs = split(/\s+/, $packages); my @pkgs = split(/\s+/, $packages);
my @tmp; my @tmp;
foreach my $pkg (@pkgs) { foreach my $pkg (@pkgs) {
if ($pkg =~ m/^\\$/) {
next;
}
$pkg =~ s/_\$\$_>=_\$\$_/ >= /g; $pkg =~ s/_\$\$_>=_\$\$_/ >= /g;
$pkg =~ s/_\$\$_<=_\$\$_/ <= /g; $pkg =~ s/_\$\$_<=_\$\$_/ <= /g;
$pkg =~ s/_\$\$_==_\$\$_/ == /g; $pkg =~ s/_\$\$_==_\$\$_/ == /g;
......
...@@ -427,6 +427,7 @@ add_package_clicked_cb (GtkWidget *button, GbfAmProject *project) ...@@ -427,6 +427,7 @@ add_package_clicked_cb (GtkWidget *button, GbfAmProject *project)
renderer, renderer,
"text", COL_PKG_PACKAGE, "text", COL_PKG_PACKAGE,
NULL); NULL);
gtk_tree_view_column_set_sort_column_id (col, COL_PKG_PACKAGE);
gtk_tree_view_append_column (GTK_TREE_VIEW (pkg_treeview), col); gtk_tree_view_append_column (GTK_TREE_VIEW (pkg_treeview), col);
renderer = gtk_cell_renderer_text_new (); renderer = gtk_cell_renderer_text_new ();
col = gtk_tree_view_column_new_with_attributes (_("Version"), col = gtk_tree_view_column_new_with_attributes (_("Version"),
...@@ -914,6 +915,7 @@ gbf_am_properties_get_widget (GbfAmProject *project, GError **error) ...@@ -914,6 +915,7 @@ gbf_am_properties_get_widget (GbfAmProject *project, GError **error)
col = gtk_tree_view_column_new_with_attributes (_("Module/Packages"), col = gtk_tree_view_column_new_with_attributes (_("Module/Packages"),
renderer, renderer,
"text", 0, NULL); "text", 0, NULL);
gtk_tree_view_column_set_sort_column_id (col, 0);
gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), col); gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), col);
renderer = gtk_cell_renderer_text_new (); renderer = gtk_cell_renderer_text_new ();
g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL); g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL);
...@@ -955,6 +957,7 @@ gbf_am_properties_get_widget (GbfAmProject *project, GError **error) ...@@ -955,6 +957,7 @@ gbf_am_properties_get_widget (GbfAmProject *project, GError **error)
renderer, renderer,
"text", "text",
COL_VAR_NAME, NULL); 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); gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), col);
renderer = gtk_cell_renderer_text_new (); renderer = gtk_cell_renderer_text_new ();
g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL); g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL);
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<shortcut></shortcut> <shortcut></shortcut>
</tool> </tool>
<tool name="Find With Grep"> <tool name="Find With Grep">
<command>/usr/xpg4/bin/grep -r -e</command> <command>grep -r -e</command>
<parameter>$(ask_user_string) .</parameter> <parameter>$(ask_user_string) .</parameter>
<working_dir>$(project_root_directory)</working_dir> <working_dir>$(project_root_directory)</working_dir>
<enabled>1</enabled> <enabled>1</enabled>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment