diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2010-06-18 17:52:14 +0200 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2010-06-18 17:52:14 +0200 |
| commit | 858f51add2b4b332fbaf4d53c612a7f28878b2a7 (patch) | |
| tree | 253a85c97e9d2d4bd24dd3d40f00b52d08bed750 /gio/src/settings.hg | |
| parent | c7049cf85b10bace5ba6f0b03f2fa2c4dd4b595b (diff) | |
| download | glibmm-858f51add2b4b332fbaf4d53c612a7f28878b2a7.tar.gz | |
Settings: Fix the build with the latest glib.
* gio/src/settingsbackend.[hg|ccg]: Add this interface. Notice the
comment about the semi-private get_type() function.
* gio/src/filelist.am: Mention the new files.
* gio/src/settings.hg: Adapt to the changed glib API, using
a SettingsBackend backend instead of a string context.
Diffstat (limited to 'gio/src/settings.hg')
| -rw-r--r-- | gio/src/settings.hg | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gio/src/settings.hg b/gio/src/settings.hg index e6a61e56..1a84a845 100644 --- a/gio/src/settings.hg +++ b/gio/src/settings.hg @@ -16,6 +16,7 @@ */ #include <glibmm/object.h> +#include <giomm/settingsbackend.h> _DEFS(giomm,gio) _PINCLUDE(glibmm/private/object_p.h) @@ -39,15 +40,14 @@ class Settings : public Glib::Object protected: _WRAP_CTOR(Settings(const Glib::ustring& schema), g_settings_new) _WRAP_CTOR(Settings(const Glib::ustring& schema, const Glib::ustring& path), g_settings_new_with_path) - // can't wrap both new_with_path and new_with_context since they both have the - // same signature... - _WRAP_CTOR(Settings(const Glib::ustring& schema, const Glib::ustring& context, const Glib::ustring& path), g_settings_new_with_context_and_path) + _WRAP_CTOR(Settings(const Glib::ustring& schema, const Glib::RefPtr<SettingsBackend>& backend), g_settings_new_with_backend) + _WRAP_CTOR(Settings(const Glib::ustring& schema, const Glib::RefPtr<SettingsBackend>& backend, const Glib::ustring& path), g_settings_new_with_backend_and_path) public: _WRAP_CREATE(const Glib::ustring& schema) _WRAP_CREATE(const Glib::ustring& schema, const Glib::ustring& path) - _WRAP_CREATE(const Glib::ustring& schema, const Glib::ustring& context, const Glib::ustring& path) - static Glib::RefPtr<Settings> create_with_context(const Glib::ustring& schema, const Glib::ustring& context); + _WRAP_CREATE(const Glib::ustring& schema, const Glib::RefPtr<SettingsBackend>& backend) + _WRAP_CREATE(const Glib::ustring& schema, const Glib::RefPtr<SettingsBackend>& backend, const Glib::ustring& path) // FIXME: implement the GVariant stuff |