[gtk-doc] mkdb: fix issues from wrong rebase conflic handling
- From: Stefan Kost <stefkost src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-doc] mkdb: fix issues from wrong rebase conflic handling
- Date: Wed, 20 Apr 2011 13:46:01 +0000 (UTC)
commit f6ea2b4158c62f7bdb90ae89773e6474ee1754ec
Author: Will Thompson <will thompson collabora co uk>
Date: Wed Apr 20 09:45:10 2011 -0400
mkdb: fix issues from wrong rebase conflic handling
Commit a099085 (â??indent: convert tabs to spaces in perl filesâ??) does not
in fact just convert tabs to spaces in Perl files: it actually includes
code changes and variable renamings. The renaming was not thorough
enough, which made gtkdoc-mkdb fail to compile.
https://bugzilla.gnome.org/show_bug.cgi?id=648289
gtkdoc-mkdb.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in
index e114263..31f51d6 100755
--- a/gtkdoc-mkdb.in
+++ b/gtkdoc-mkdb.in
@@ -1439,7 +1439,7 @@ sub OutputTypedef {
sub OutputStruct {
my ($symbol, $declaration) = @_;
- my $is_object_struct = 0;
+ my $is_gtype = 0;
my $default_to_public = 1;
if (&CheckIsObject ($symbol)) {
#print "Found struct gtype: $symbol\n";
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]