diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gio/src/settings.ccg | 17 | ||||
| -rw-r--r-- | gio/src/settings.hg | 8 |
3 files changed, 29 insertions, 3 deletions
@@ -1,5 +1,12 @@ 2010-09-14 Murray Cumming <murrayc@murrayc.com> + Settings: Comment out get_destroyed() to avoid a linker error. + + * gio/src/settings.[hg|ccg]: Comment out the use of g_setting_get_destroyed(). + See glib bug https://bugzilla.gnome.org/show_bug.cgi?id=629621 . + +2010-09-14 Murray Cumming <murrayc@murrayc.com> + DBusConnection: Fix some (useful) compilation warnings. * gio/src/dbusconnection.[hg|ccg]: IOStream constructors and create*() diff --git a/gio/src/settings.ccg b/gio/src/settings.ccg index 8174eccb..2af9f32e 100644 --- a/gio/src/settings.ccg +++ b/gio/src/settings.ccg @@ -1,3 +1,20 @@ +/* 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 <gio/gio.h> namespace Gio diff --git a/gio/src/settings.hg b/gio/src/settings.hg index a7360093..838ffd46 100644 --- a/gio/src/settings.hg +++ b/gio/src/settings.hg @@ -53,7 +53,7 @@ public: // FIXME: implement the GVariant stuff _WRAP_METHOD(bool set_value(const Glib::ustring& key, const Glib::VariantBase& value), g_settings_set_value) - + /** TODO: Documentation. */ void get_value(const Glib::ustring& key, Glib::VariantBase& value) const; @@ -77,7 +77,7 @@ public: _WRAP_METHOD(bool get_enum(const Glib::ustring& key, int value), g_settings_set_enum) _WRAP_METHOD(guint get_flags(const Glib::ustring& key) const, g_settings_get_flags) _WRAP_METHOD(bool get_flags(const Glib::ustring& key, guint value), g_settings_set_flags) - + // Ignore varargs functions. _IGNORE(g_settings_get, g_settings_set) @@ -96,7 +96,9 @@ public: _WRAP_METHOD(Glib::StringArrayHandle list_children() const, g_settings_list_children) _WRAP_METHOD(Glib::StringArrayHandle list_keys() const, g_settings_list_keys) - _WRAP_METHOD(bool get_destroyed() const, g_settings_get_destroyed) + + //Not implemented. See https://bugzilla.gnome.org/show_bug.cgi?id=629621 + //_WRAP_METHOD(bool get_destroyed() const, g_settings_get_destroyed) #m4 _CONVERSION(`Glib::ObjectBase*',`gpointer',(gpointer)$3->gobj()) |