gnomemm r2132 - in gconfmm/trunk: . gconf/src

[murrayc svn gnome org]

Author: murrayc
Date: Fri Mar 27 12:07:08 2009
New Revision: 2132
URL: http://svn.gnome.org/viewvc/gnomemm?rev=2132&view=rev

Log:
2009-03-27  Murray Cumming  <murrayc murrayc com>

* gconf/src/client.ccg:
* gconf/src/value.ccg: Add some static g_conf_*_get_type() functions that 
call gconf_*_get_type() to fix the build because gmmproc now guesses the 
prefix wrong, because we made it guess other prefixes better.

Modified:
   gconfmm/trunk/ChangeLog
   gconfmm/trunk/gconf/src/client.ccg
   gconfmm/trunk/gconf/src/value.ccg

Modified: gconfmm/trunk/gconf/src/client.ccg
==============================================================================
--- gconfmm/trunk/gconf/src/client.ccg	(original)
+++ gconfmm/trunk/gconf/src/client.ccg	Fri Mar 27 12:07:08 2009
@@ -27,6 +27,25 @@
 namespace 
 {
 
+
+//gmmproc guesses the gconf prefix wrongly, so we help it:
+inline static GType g_conf_client_error_handling_mode_get_type()
+{
+  return gconf_client_error_handling_mode_get_type();
+}
+
+inline static GType g_conf_error_get_type()
+{
+  return gconf_error_get_type();
+}
+
+inline static GType g_conf_client_preload_type_get_type()
+{
+  return gconf_client_preload_type_get_type();
+}
+
+
+
 using namespace Gnome::Conf;
 
 class PrimitiveHolder 

Modified: gconfmm/trunk/gconf/src/value.ccg
==============================================================================
--- gconfmm/trunk/gconf/src/value.ccg	(original)
+++ gconfmm/trunk/gconf/src/value.ccg	Fri Mar 27 12:07:08 2009
@@ -23,6 +23,22 @@
 #include <gconf/gconf.h>
 #include "gconfmm/schema.h"
 
+namespace
+{
+
+//gmmproc guesses the gconf prefix wrongly, so we help it:
+inline static GType g_conf_value_type_get_type()
+{
+  return gconf_value_type_get_type();
+}
+
+inline static GType g_conf_unset_flags_get_type()
+{
+  return gconf_unset_flags_get_type();
+}
+
+} //anonymous namespace
+
 namespace Gnome
 {