Gio: Remove SettingsBackend.

* gio/src/settingsbackend.[hg|ccg]: Remove these because we do not know yet
if implementing GSettings backends is useful or encouraged, and our wrapper
is unimplemented, requiring an ABI break to fix it when adding the virtual
methods.
* gio/src/filelist.am: Remove mention of the files.
* gio/src/settings.hg: Remove use of SettingsBackend here too. Unfortunately
this might have been slightly useful but we cannot provide this API without
freezing a SettingsBackend API.

6 files changed, 20 insertions, 99 deletions

diff --git a/ChangeLog b/ChangeLog
index 161c9ee7..2b82b432 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,17 @@
-2011-03-24  Murray Cumming  <murrayc@murrayc.com>>
+2011-03-24  Murray Cumming  <murrayc@murrayc.com>
+
+	Gio: Remove SettingsBackend.
+
+	* gio/src/settingsbackend.[hg|ccg]: Remove these because we do not know yet
+	if implementing GSettings backends is useful or encouraged, and our wrapper
+	is unimplemented, requiring an ABI break to fix it when adding the virtual
+	methods.
+	* gio/src/filelist.am: Remove mention of the files.
+	* gio/src/settings.hg: Remove use of SettingsBackend here too. Unfortunately
+	this might have been slightly useful but we cannot provide this API without
+	freezing a SettingsBackend API.
+
+2011-03-24  Murray Cumming  <murrayc@murrayc.com>
 
 	More minor documentation corrections.
 
diff --git a/gio/giomm.h b/gio/giomm.h
index 28a0a866..de8cc270 100644
--- a/gio/giomm.h
+++ b/gio/giomm.h
@@ -1,9 +1,9 @@
 #ifndef _GIOMM_H
 #define _GIOMM_H
 
-/* 
+/*
  * Copyright (C) 2007 The giomm Development Team
- * 
+ *
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -108,4 +108,3 @@
 #include <giomm/volumemonitor.h>
 
 #endif /* #ifndef _GIOMM_H */
-
diff --git a/gio/src/filelist.am b/gio/src/filelist.am
index bf65f863..ecb1bd83 100644
--- a/gio/src/filelist.am
+++ b/gio/src/filelist.am
@@ -78,7 +78,6 @@ giomm_files_any_hg =			\
 	resolver.hg			\
 	seekable.hg			\
 	settings.hg			\
-	settingsbackend.hg			\
 	socket.hg			\
 	socketaddress.hg		\
 	socketaddressenumerator.hg	\
diff --git a/gio/src/settings.hg b/gio/src/settings.hg
index 1d85bbaa..1afb614d 100644
--- a/gio/src/settings.hg
+++ b/gio/src/settings.hg
@@ -17,7 +17,6 @@
 
 #include <glibmm/object.h>
 #include <glibmm/variant.h>
-#include <giomm/settingsbackend.h>
 
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/object_p.h)
@@ -41,14 +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)
-  _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)
+  //TODO: Requires SettingsBackend: _WRAP_CTOR(Settings(const Glib::ustring& schema, const Glib::RefPtr<SettingsBackend>& backend), g_settings_new_with_backend)
+  //TODO: Requires SettingsBackend: _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::RefPtr<SettingsBackend>& backend)
-  _WRAP_CREATE(const Glib::ustring& schema, const Glib::RefPtr<SettingsBackend>& backend, const Glib::ustring& path)
+  //TODO: Requires SettingsBackend: _WRAP_CREATE(const Glib::ustring& schema, const Glib::RefPtr<SettingsBackend>& backend)
+  //TODO: Requires SettingsBackend: _WRAP_CREATE(const Glib::ustring& schema, const Glib::RefPtr<SettingsBackend>& backend, const Glib::ustring& path)
 
   _WRAP_METHOD(bool set_value(const Glib::ustring& key, const Glib::VariantBase& value),  g_settings_set_value)
 
diff --git a/gio/src/settingsbackend.ccg b/gio/src/settingsbackend.ccg
deleted file mode 100644
index 5e094522..00000000
--- a/gio/src/settingsbackend.ccg
+++ /dev/null
@@ -1,23 +0,0 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
-/* Copyright (C) 2007 The giomm Development Team
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-namespace Gio
-{
-
-} //namespace Gio
diff --git a/gio/src/settingsbackend.hg b/gio/src/settingsbackend.hg
deleted file mode 100644
index 81844baa..00000000
--- a/gio/src/settingsbackend.hg
+++ /dev/null
@@ -1,66 +0,0 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
-/* Copyright (C) 2010 The giomm Development Team
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-
-#include <glibmm/interface.h>
-#include <glibmm/object.h>
-
-_DEFS(giomm,gio)
-_PINCLUDE(glibmm/private/interface_p.h)
-
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-//Allow us to use g_settings_backend_get_type.
-//TODO: Find out if we should be able to implement backends outside of gio.
-//And if not, add an option to _CLASS_INTERFACE to avoid using it.
-#define G_SETTINGS_ENABLE_BACKEND 1
-#include <gio/gsettingsbackend.h>
-#include <gio/gio.h>
-#m4 _POP()
-
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-typedef struct _GSettingsBackendClass GSettingsBackendClass;
-#endif /* DOXYGEN_SHOULD_SKIP_THIS */
-
-namespace Gio
-{
-
-/** TODO
- */
-class SettingsBackend : public Glib::Interface
-{
-  _CLASS_INTERFACE(SettingsBackend, GSettingsBackend, G_SETTINGS_BACKEND, GSettingsBackendClass)
-
-public:
-
-  _WRAP_METHOD(void backend_changed(const Glib::ustring& key, gpointer origin_tag), g_settings_backend_changed)
-  _WRAP_METHOD(void path_changed(const Glib::ustring& path, gpointer origin_tag), g_settings_backend_path_changed)
-
-  //TODO: Use an ArrayHandle?
-  //_WRAP_METHOD(void keys_changed(const Glib::ustring& path, gchar const * const *items, gpointer origin_tag), g_settings_backend_keys_changed)
-
-  _WRAP_METHOD(void path_writable_changed(const Glib::ustring& path), g_settings_backend_path_writable_changed)
-  _WRAP_METHOD(void writable_changed(const Glib::ustring& key), g_settings_backend_writable_changed)
-
-  //TODO: Use the glibmm wrapper of GTree:
-  _WRAP_METHOD(void changed_tree(GTree *tree, gpointer origin_tag), g_settings_backend_changed_tree)
-
-    //TODO: Vfuncs?
-};
-
-} // namespace Gio