From 978b97194aa591e53bba1a1b1908f39e376ec65b Mon Sep 17 00:00:00 2001 From: sgranjoux Date: Sun, 20 Jul 2008 20:42:54 +0000 Subject: [PATCH] * plugins/build-basic-autotools/build-basic-autotools.c, plugins/build-basic-autotools/configuration-list.c: Fix configuration name not displayed, error when compiling target outside project git-svn-id: http://svn.gnome.org/svn/anjuta/trunk@4094 1dbfb86a-d425-0410-a06b-cb591aac69f6 --- ChangeLog | 7 +++++++ plugins/build-basic-autotools/build-basic-autotools.c | 3 ++- plugins/build-basic-autotools/configuration-list.c | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a657bc9..20f1180e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2008-07-20 Sébastien Granjoux + * plugins/build-basic-autotools/build-basic-autotools.c, + plugins/build-basic-autotools/configuration-list.c: + Fix configuration name not displayed, error when compiling target + outside project + +2008-07-20 Sébastien Granjoux + * plugins/build-basic-autotools/build-basic-autotools.c: Fix #522825: Opening files from shell disable build->compile menu diff --git a/plugins/build-basic-autotools/build-basic-autotools.c b/plugins/build-basic-autotools/build-basic-autotools.c index 1e052478..12c58d46 100644 --- a/plugins/build-basic-autotools/build-basic-autotools.c +++ b/plugins/build-basic-autotools/build-basic-autotools.c @@ -1359,7 +1359,8 @@ target_from_source (BasicAutotoolsPlugin *plugin, const gchar *target) { if ((plugin->project_root_dir == NULL) || (plugin->project_build_dir == NULL) || - (strcmp (plugin->project_root_dir, plugin->project_build_dir) == 0)) + (strcmp (plugin->project_root_dir, plugin->project_build_dir) == 0) || + (strncmp (target, plugin->project_root_dir, strlen (plugin->project_root_dir)) != 0)) { return g_strdup (target); } diff --git a/plugins/build-basic-autotools/configuration-list.c b/plugins/build-basic-autotools/configuration-list.c index ef48bdc2..ec86738d 100644 --- a/plugins/build-basic-autotools/configuration-list.c +++ b/plugins/build-basic-autotools/configuration-list.c @@ -114,7 +114,7 @@ build_unescape_string (const gchar *escaped) if (*escaped == '%') { - *end++ = (g_ascii_xdigit_value (escaped[1]) << 4) | g_ascii_xdigit_value (escaped[0]); + *end++ = (g_ascii_xdigit_value (escaped[1]) << 4) | g_ascii_xdigit_value (escaped[2]); escaped += 2; } else -- 2.11.4.GIT