diff options
| author | Murray Cumming <murrayc@src.gnome.org> | 2007-06-10 15:46:02 +0000 |
|---|---|---|
| committer | Murray Cumming <murrayc@src.gnome.org> | 2007-06-10 15:46:02 +0000 |
| commit | df43547c1f3e49fcfec3a0ce0bbf8ff6e45d5ace (patch) | |
| tree | 326a6a7593f6aacef4ee6855328f2d4a56bc31bc | |
| parent | bce656de020e27f6e1b09024ed26b834a222d628 (diff) | |
| download | glibmm-df43547c1f3e49fcfec3a0ce0bbf8ff6e45d5ace.tar.gz | |
+2007-06-10 Kalle Vahlman <zuh@iki.fi>
+
+ * glib/glibmm/propertyproxy_base.cc: Move PropertyProxyConnectionNode
+ out of the ifdef to avoid a linker error when disabling properties.
+ The other branches already had this fix.
+ Bug #441766.
svn path=/branches/glibmm-2-12/; revision=416
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | glib/glibmm/propertyproxy_base.cc | 7 |
4 files changed, 19 insertions, 4 deletions
@@ -1,3 +1,12 @@ +2.12.10: + +2007-06-10 Kalle Vahlman <zuh@iki.fi> + + * glib/glibmm/propertyproxy_base.cc: Move PropertyProxyConnectionNode + out of the ifdef to avoid a linker error when disabling properties. + The other branches already had this fix. + Bug #441766. + 2.12.9: 2007-04-30 Johannes Schmid <johannes.schmid@openismus.com> @@ -1,3 +1,8 @@ +2.12.10: + +* Fix the build when properties are disabled. + (Kalle Vahlman) + 2.12.9: * Correctly ifdef-out initialization of deprecated classes. diff --git a/configure.in b/configure.in index 91ba3aa8..2828ebc2 100644 --- a/configure.in +++ b/configure.in @@ -19,7 +19,7 @@ AC_PREREQ(2.50) ######################################################################### GLIBMM_MAJOR_VERSION=2 GLIBMM_MINOR_VERSION=12 -GLIBMM_MICRO_VERSION=9 +GLIBMM_MICRO_VERSION=10 GLIBMM_VERSION=$GLIBMM_MAJOR_VERSION.$GLIBMM_MINOR_VERSION.$GLIBMM_MICRO_VERSION GLIBMM_RELEASE=$GLIBMM_MAJOR_VERSION.$GLIBMM_MINOR_VERSION AC_DEFINE_UNQUOTED([GLIBMM_MAJOR_VERSION], $GLIBMM_MAJOR_VERSION, [Major Version]) diff --git a/glib/glibmm/propertyproxy_base.cc b/glib/glibmm/propertyproxy_base.cc index 66bd763c..c7950cd0 100644 --- a/glib/glibmm/propertyproxy_base.cc +++ b/glib/glibmm/propertyproxy_base.cc @@ -22,8 +22,6 @@ #include <glibmm/propertyproxy_base.h> -#ifdef GLIBMM_PROPERTIES_ENABLED - #include <glibmm/signalproxy_connectionnode.h> #include <glibmm/object.h> #include <glibmm/private/object_p.h> @@ -45,6 +43,8 @@ void PropertyProxyConnectionNode::callback(GObject*, GParamSpec* pspec, gpointer } } +#ifdef GLIBMM_PROPERTIES_ENABLED + //SignalProxyProperty implementation: SignalProxyProperty::SignalProxyProperty(Glib::ObjectBase* obj, const gchar* property_name) @@ -124,6 +124,7 @@ void PropertyProxy_Base::reset_property_() g_object_set_property(obj_->gobj(), property_name_, value.gobj()); } +#endif //GLIBMM_PROPERTIES_ENABLED + } // namespace Glib -#endif //GLIBMM_PROPERTIES_ENABLED |