summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Geddes <vgeddes@src.gnome.org>2007-07-11 18:58:34 +0000
committerVincent Geddes <vgeddes@src.gnome.org>2007-07-11 18:58:34 +0000
commit724bd3c83b5c3a3123447b7f65f6f79d92503f98 (patch)
treecc983a3f29671265591eec66171da0c634ab1a92
parenta57836c0609baced1077ef99a005e20f1a4401d2 (diff)
downloadglade-724bd3c83b5c3a3123447b7f65f6f79d92503f98.tar.gz
merge differences from tags/BINDING_BRANCHPOINT to trunk/ Update
* merge differences from tags/BINDING_BRANCHPOINT to trunk/ Update tags/BINDING_BRANCHPOINT svn path=/branches/BINDINGS/; revision=1456
-rw-r--r--ChangeLog2
-rw-r--r--gladeui/glade-widget-adaptor.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3330e4c5..3e430827 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
* gladeui/glade-app.c (glade_app_add_project): Ref project when
adding it to the app.
+
+ * gladeui/glade-widget-adaptor.h: s/GLADE_CREATE_REASON/GLADE_TYPE_CREATE_REASON/.
2007-07-10 Vincent Geddes <vgeddes@gnome.org>
diff --git a/gladeui/glade-widget-adaptor.h b/gladeui/glade-widget-adaptor.h
index 9956bdde..fc149006 100644
--- a/gladeui/glade-widget-adaptor.h
+++ b/gladeui/glade-widget-adaptor.h
@@ -124,7 +124,7 @@ typedef enum
GLADE_CREATE_REASONS
} GladeCreateReason;
-#define GLADE_CREATE_REASON (glade_create_reason_get_type())
+#define GLADE_TYPE_CREATE_REASON (glade_create_reason_get_type())
/**
* GladeSetPropertyFunc: