Improve the use of _IGNORE. Don't use gio_others.defs.

* gio/src/applicationcommandline.hg: Change a _CONVERSION (due to the
exclusion of gio_others.defs).
* gio/src/dbusintrospection.hg:
* gio/src/fileinfo.hg: Add _IGNORE.
* gio/src/fileiostream.hg:
* gio/src/fileoutputstream.hg: Correct an _IGNORE.
* gio/src/gio.defs: Don't include gio_others.defs. One of its entries is
wrong and all of them also exist (in correct form) in gio_methods.defs or
gio_signals.defs.
* glib/src/convert.hg:
* glib/src/regex.hg: Add _IGNORE.
* glib/src/date.hg:
* glib/src/fileutils.hg:
* glib/src/markup.hg:
* glib/src/optionentry.hg:
* glib/src/shell.hg:
* glib/src/spawn.hg:
* glib/src/thread.hg:
* glib/src/threads.hg:
* glib/src/unicode.hg:
* glib/src/uriutils.hg: Remove _IGNORE(g_iconv).
* glib/src/variantiter.hg: Add an _IGNORE. Remove _IGNORE(g_variant_iter_new).

20 files changed, 45 insertions, 35 deletions

diff --git a/ChangeLog b/ChangeLog
index 531370c4..4806be99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,32 @@
 2012-09-18  Kjell Ahlstedt  <kjell.ahlstedt@bredband.net>
 
+	Improve the use of _IGNORE. Don't use gio_others.defs.
+
+	* gio/src/applicationcommandline.hg: Change a _CONVERSION (due to the
+	exclusion of gio_others.defs).
+	* gio/src/dbusintrospection.hg:
+	* gio/src/fileinfo.hg: Add _IGNORE.
+	* gio/src/fileiostream.hg:
+	* gio/src/fileoutputstream.hg: Correct an _IGNORE.
+	* gio/src/gio.defs: Don't include gio_others.defs. One of its entries is
+	wrong and all of them also exist (in correct form) in gio_methods.defs or
+	gio_signals.defs.
+	* glib/src/convert.hg:
+	* glib/src/regex.hg: Add _IGNORE.
+	* glib/src/date.hg:
+	* glib/src/fileutils.hg:
+	* glib/src/markup.hg:
+	* glib/src/optionentry.hg:
+	* glib/src/shell.hg:
+	* glib/src/spawn.hg:
+	* glib/src/thread.hg:
+	* glib/src/threads.hg:
+	* glib/src/unicode.hg:
+	* glib/src/uriutils.hg: Remove _IGNORE(g_iconv).
+	* glib/src/variantiter.hg: Add an _IGNORE. Remove _IGNORE(g_variant_iter_new).
+
+2012-09-18  Kjell Ahlstedt  <kjell.ahlstedt@bredband.net>
+
 	gmmproc: Improve the search for unwrapped methods.
 
 	* tools/pm/GtkDefs.pm: lookup_method_set_weak_mark(): New function.
diff --git a/gio/src/applicationcommandline.hg b/gio/src/applicationcommandline.hg
index 023d27d2..9ec31fec 100644
--- a/gio/src/applicationcommandline.hg
+++ b/gio/src/applicationcommandline.hg
@@ -67,7 +67,7 @@ public:
   _WRAP_METHOD(std::string get_cwd() const, g_application_command_line_get_cwd)
 
   //We use std::string instead of ustring because the C documentation says that it may be non-UTF-8 data:
-#m4 _CONVERSION(`const gchar*const*',`std::vector<std::string>',`Glib::ArrayHandler<std::string>::array_to_vector($3, Glib::OWNERSHIP_NONE)')
+#m4 _CONVERSION(`const gchar* const*',`std::vector<std::string>',`Glib::ArrayHandler<std::string>::array_to_vector($3, Glib::OWNERSHIP_NONE)')
   _WRAP_METHOD(std::vector<std::string> get_environ() const, g_application_command_line_get_environ)
   
   //We use std::string instead of ustring because the C documentation says that it may be non-UTF-8 data:
diff --git a/gio/src/dbusintrospection.hg b/gio/src/dbusintrospection.hg
index 1eb9d637..729b25d0 100644
--- a/gio/src/dbusintrospection.hg
+++ b/gio/src/dbusintrospection.hg
@@ -39,6 +39,7 @@ _WRAP_ENUM(PropertyInfoFlags, GDBusPropertyInfoFlags, s#^DBUS_##, NO_GTYPE)
 class AnnotationInfo
 {
   _CLASS_OPAQUE_REFCOUNTED(AnnotationInfo, GDBusAnnotationInfo, NONE, g_dbus_annotation_info_ref, g_dbus_annotation_info_unref)
+  _IGNORE(g_dbus_annotation_info_ref, g_dbus_annotation_info_unref)
 
 public:
 #m4 _CONVERSION(`const Glib::ArrayHandle< Glib::RefPtr<AnnotationInfo> >&', `GDBusAnnotationInfo**', `const_cast<GDBusAnnotationInfo**>($3.data())')
@@ -54,6 +55,7 @@ public:
 class ArgInfo
 {
   _CLASS_OPAQUE_REFCOUNTED(ArgInfo, GDBusArgInfo, NONE, g_dbus_arg_info_ref, g_dbus_arg_info_unref)
+  _IGNORE(g_dbus_arg_info_ref, g_dbus_arg_info_unref)
 
 public:
 };
@@ -66,6 +68,7 @@ public:
 class MethodInfo
 {
   _CLASS_OPAQUE_REFCOUNTED(MethodInfo, GDBusMethodInfo, NONE, g_dbus_method_info_ref, g_dbus_method_info_unref)
+  _IGNORE(g_dbus_method_info_ref, g_dbus_method_info_unref)
 
 public:
 };
@@ -78,6 +81,7 @@ public:
 class SignalInfo
 {
   _CLASS_OPAQUE_REFCOUNTED(SignalInfo, GDBusSignalInfo, NONE, g_dbus_signal_info_ref, g_dbus_signal_info_unref)
+  _IGNORE(g_dbus_signal_info_ref, g_dbus_signal_info_unref)
 
 public:
 };
@@ -90,6 +94,7 @@ public:
 class PropertyInfo
 {
   _CLASS_OPAQUE_REFCOUNTED(PropertyInfo, GDBusPropertyInfo, NONE, g_dbus_property_info_ref, g_dbus_property_info_unref)
+  _IGNORE(g_dbus_property_info_ref, g_dbus_property_info_unref)
 
 public:
 };
@@ -102,6 +107,7 @@ public:
 class InterfaceInfo
 {
   _CLASS_OPAQUE_REFCOUNTED(InterfaceInfo, GDBusInterfaceInfo, NONE, g_dbus_interface_info_ref, g_dbus_interface_info_unref)
+  _IGNORE(g_dbus_interface_info_ref, g_dbus_interface_info_unref)
 
 public:
   _WRAP_METHOD(Glib::RefPtr<MethodInfo> lookup_method(const Glib::ustring& name), g_dbus_interface_info_lookup_method, refreturn)
@@ -125,6 +131,7 @@ public:
 class NodeInfo
 {
   _CLASS_OPAQUE_REFCOUNTED(NodeInfo, GDBusNodeInfo, NONE, g_dbus_node_info_ref, g_dbus_node_info_unref)
+  _IGNORE(g_dbus_node_info_ref, g_dbus_node_info_unref)
 
 public:
   _WRAP_METHOD_DOCS_ONLY(g_dbus_node_info_new_for_xml)
diff --git a/gio/src/fileinfo.hg b/gio/src/fileinfo.hg
index a6ec7034..f49beabb 100644
--- a/gio/src/fileinfo.hg
+++ b/gio/src/fileinfo.hg
@@ -50,6 +50,7 @@ class FileAttributeMatcher
 {
   _CLASS_OPAQUE_REFCOUNTED(FileAttributeMatcher, GFileAttributeMatcher,
                            NONE, g_file_attribute_matcher_ref, g_file_attribute_matcher_unref)
+  _IGNORE(g_file_attribute_matcher_ref, g_file_attribute_matcher_unref)
 
 public:
   /** Creates a new file attribute matcher, which matches attributes against a given string.
diff --git a/gio/src/fileiostream.hg b/gio/src/fileiostream.hg
index e23f81ce..474dd027 100644
--- a/gio/src/fileiostream.hg
+++ b/gio/src/fileiostream.hg
@@ -68,7 +68,7 @@ public:
    * @return A FileInfo, or an empty RefPtr on error.
    */
   Glib::RefPtr<FileInfo> query_info(const std::string& attributes = "*");
-  _IGNORE(g_file_input_stream_query_info)
+  _IGNORE(g_file_io_stream_query_info)
 
 
   /** Queries the stream information asynchronously. For the synchronous version of this function, see query_info().
diff --git a/gio/src/fileoutputstream.hg b/gio/src/fileoutputstream.hg
index 2c639e3a..4295ea4c 100644
--- a/gio/src/fileoutputstream.hg
+++ b/gio/src/fileoutputstream.hg
@@ -132,7 +132,7 @@ public:
    * @param io_priority The <io-priority of the request.
    */
   void query_info_async(const SlotAsyncReady& slot, const std::string& attributes = "*", int io_priority = Glib::PRIORITY_DEFAULT);
-  _IGNORE(g_file_input_stream_query_info_async)
+  _IGNORE(g_file_output_stream_query_info_async)
 
   _WRAP_METHOD(Glib::RefPtr<FileInfo> query_info_finish(const Glib::RefPtr<AsyncResult>& result),
                g_file_output_stream_query_info_finish,
diff --git a/gio/src/gio.defs b/gio/src/gio.defs
index d2620139..4db096ff 100644
--- a/gio/src/gio.defs
+++ b/gio/src/gio.defs
@@ -1,7 +1,6 @@
 (include gio_methods.defs)
 (include gio_unix_functions.defs)
 (include gio_extra_objects.defs)
-(include gio_others.defs)
 (include gio_enums.defs)
 (include gio_signals.defs)
 (include gio_vfuncs.defs)
diff --git a/glib/src/convert.hg b/glib/src/convert.hg
index 5a1d7522..194b5d94 100644
--- a/glib/src/convert.hg
+++ b/glib/src/convert.hg
@@ -59,12 +59,14 @@ public:
    * @throw Glib::ConvertError
    */
   IConv(const std::string& to_codeset, const std::string& from_codeset);
+  _IGNORE(g_iconv_open)
 
   explicit IConv(GIConv gobject);
 
   /** Close conversion descriptor.
    */
   ~IConv();
+  _IGNORE(g_iconv_close)
 
   /** Same as the standard UNIX routine %iconv(), but may be implemented
    * via libiconv on UNIX flavors that lack a native implementation.  glibmm
diff --git a/glib/src/date.hg b/glib/src/date.hg
index 879a90c6..472dc609 100644
--- a/glib/src/date.hg
+++ b/glib/src/date.hg
@@ -479,7 +479,4 @@ inline bool operator<=(const Date& lhs, const Date& rhs)
 inline bool operator>=(const Date& lhs, const Date& rhs)
   { return (lhs.compare(rhs) >= 0); }
 
-// For some reason gmmproc thinks that g_iconv should be wrapped here.
-_IGNORE(g_iconv)
-
 } // namespace Glib
diff --git a/glib/src/fileutils.hg b/glib/src/fileutils.hg
index a4aa3e80..66d463f6 100644
--- a/glib/src/fileutils.hg
+++ b/glib/src/fileutils.hg
@@ -430,7 +430,4 @@ void file_set_contents (const std::string& filename, const gchar *contents, gssi
  * */
 void file_set_contents (const std::string& filename, const std::string& contents);
 
-// For some reason gmmproc thinks that g_iconv should be wrapped here.
-_IGNORE(g_iconv)
-
 } // namespace Glib
diff --git a/glib/src/markup.hg b/glib/src/markup.hg
index 333be99d..6ad7f517 100644
--- a/glib/src/markup.hg
+++ b/glib/src/markup.hg
@@ -335,7 +335,4 @@ private:
 
 } // namespace Markup
 
-// For some reason gmmproc thinks that g_iconv should be wrapped here.
-_IGNORE(g_iconv)
-
 } // namespace Glib
diff --git a/glib/src/optionentry.hg b/glib/src/optionentry.hg
index 6ea70c91..70b8d658 100644
--- a/glib/src/optionentry.hg
+++ b/glib/src/optionentry.hg
@@ -95,7 +95,4 @@ protected:
   GOptionEntry* gobject_;
 };
 
-// For some reason gmmproc thinks that g_iconv should be wrapped here.
-_IGNORE(g_iconv)
-
 } // namespace Glib
diff --git a/glib/src/regex.hg b/glib/src/regex.hg
index 1ce730b6..b0d788c1 100644
--- a/glib/src/regex.hg
+++ b/glib/src/regex.hg
@@ -212,6 +212,7 @@ public:
 class MatchInfo
 {
   _CLASS_GENERIC(MatchInfo, GMatchInfo)
+  _IGNORE(g_match_info_ref, g_match_info_unref, g_match_info_free)
 
 public:
   /// Default constructor.
diff --git a/glib/src/shell.hg b/glib/src/shell.hg
index eef5ad5b..5b2ec4bc 100644
--- a/glib/src/shell.hg
+++ b/glib/src/shell.hg
@@ -85,7 +85,4 @@ std::string shell_unquote(const std::string& quoted_string);
 
 /** @} group ShellUtils */
 
-// For some reason gmmproc thinks that g_iconv should be wrapped here.
-_IGNORE(g_iconv)
-
 } // namespace Glib
diff --git a/glib/src/spawn.hg b/glib/src/spawn.hg
index 029778b7..d1778339 100644
--- a/glib/src/spawn.hg
+++ b/glib/src/spawn.hg
@@ -404,7 +404,4 @@ void spawn_close_pid(Pid pid);
 
 /** @} group Spawn */
 
-// For some reason gmmproc thinks that g_iconv should be wrapped here.
-_IGNORE(g_iconv)
-
 } // namespace Glib
diff --git a/glib/src/thread.hg b/glib/src/thread.hg
index 3ba75d81..1bc10dce 100644
--- a/glib/src/thread.hg
+++ b/glib/src/thread.hg
@@ -1092,8 +1092,5 @@ void Private<T>::set(T* data)
 
 #endif /* DOXYGEN_SHOULD_SKIP_THIS */
 
-// For some reason gmmproc thinks that g_iconv should be wrapped here.
-_IGNORE(g_iconv)
-
 } // namespace Glib
 
diff --git a/glib/src/threads.hg b/glib/src/threads.hg
index 98174d91..89b8131d 100644
--- a/glib/src/threads.hg
+++ b/glib/src/threads.hg
@@ -811,9 +811,6 @@ void Private<T>::replace(T* data)
 
 #endif /* DOXYGEN_SHOULD_SKIP_THIS */
 
-// For some reason gmmproc thinks that g_iconv should be wrapped here.
-_IGNORE(g_iconv)
-
 } //namespace Threads
 
 } // namespace Glib
diff --git a/glib/src/unicode.hg b/glib/src/unicode.hg
index 0ae5fdb7..b3c50bbd 100644
--- a/glib/src/unicode.hg
+++ b/glib/src/unicode.hg
@@ -139,7 +139,4 @@ _ASCII_FUNC(int, xdigit_value)
 
 /** @} group Unicode */
 
-// For some reason gmmproc thinks that g_iconv should be wrapped here.
-_IGNORE(g_iconv)
-
 } // namespace Glib
diff --git a/glib/src/uriutils.hg b/glib/src/uriutils.hg
index 69e180a4..6ef99d96 100644
--- a/glib/src/uriutils.hg
+++ b/glib/src/uriutils.hg
@@ -83,7 +83,4 @@ std::string uri_parse_scheme(const std::string& uri);
  */
 std::string uri_escape_string(const std::string& unescaped, const std::string& reserved_chars_allowed = std::string(), bool allow_utf8 = true);
 
-// For some reason gmmproc thinks that g_iconv should be wrapped here.
-_IGNORE(g_iconv)
-
 } // namespace Glib
diff --git a/glib/src/variantiter.hg b/glib/src/variantiter.hg
index 09353e9a..6a6e34b0 100644
--- a/glib/src/variantiter.hg
+++ b/glib/src/variantiter.hg
@@ -33,9 +33,12 @@ class VariantBase;
 class VariantIter
 {
   _CLASS_OPAQUE_COPYABLE(VariantIter, GVariantIter, NONE, g_variant_iter_copy, g_variant_iter_free)
+  _IGNORE(g_variant_iter_copy, g_variant_iter_free)
 public:
   explicit VariantIter(const VariantBase& variant);
-  _IGNORE(g_variant_iter_new)
+  dnl // Don't _IGNORE(g_variant_iter_new). It's listed in glib_functions.defs as
+  dnl // a method of GVariant. Ignoring it would make gmmproc think that this
+  dnl // file wraps GVariant, and it would list all GVariant methods as unwrapped.
 
   _WRAP_METHOD(gsize get_n_children() const, g_variant_iter_n_children)