From: Juerg Billeter Date: Thu, 22 Nov 2007 20:07:23 +0000 (+0000) Subject: compare complete path X-Git-Tag: VALA_0_1_5~15 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=167431f969d10a83eb459d3d98617b21b2c12c49;p=platform%2Fupstream%2Fvala.git compare complete path 2007-11-22 Juerg Billeter * gobject-introspection/clexer.l, gobject-introspection/gen-introspect.c: compare complete path svn path=/trunk/; revision=706 --- diff --git a/ChangeLog b/ChangeLog index 1630b81..ffcd53d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2007-11-22 Jürg Billeter + * gobject-introspection/clexer.l, + gobject-introspection/gen-introspect.c: compare complete path + +2007-11-22 Jürg Billeter + * vapi/packages/gnome-vfs-2.0/: update to use vala-gen-introspect * vapi/gnome-vfs-2.0.vapi: regenerated diff --git a/gobject-introspection/clexer.l b/gobject-introspection/clexer.l index b7f5c90..b0c9cd6 100644 --- a/gobject-introspection/clexer.l +++ b/gobject-introspection/clexer.l @@ -243,8 +243,7 @@ static void process_directive (void) if (filename_builder->len > 0) { char *filename = g_strcompress (filename_builder->str); g_free (the_igenerator->current_filename); - the_igenerator->current_filename = g_path_get_basename (filename); - g_free (filename); + the_igenerator->current_filename = filename; } g_string_free (filename_builder, TRUE); diff --git a/gobject-introspection/gen-introspect.c b/gobject-introspection/gen-introspect.c index 6d9d4f6..c25c61c 100644 --- a/gobject-introspection/gen-introspect.c +++ b/gobject-introspection/gen-introspect.c @@ -1023,7 +1023,7 @@ void g_igenerator_add_symbol (GIGenerator *igenerator, CSymbol *symbol) gboolean found_filename = FALSE; GList *l; for (l = igenerator->filenames; l != NULL; l = l->next) { - if (strcmp (g_path_get_basename (l->data), g_path_get_basename (igenerator->current_filename)) == 0) { + if (strcmp (l->data, igenerator->current_filename) == 0) { found_filename = TRUE; break; }