Update the .defs for signals and properties.

* tools/extra_defs_gen/generate_defs_gio.cc: Mention more GDbus types.
* tools/extra_defs_gen/generate_defs_glib.cc: Mention some types, though
none have properties or signals.
* gio/src/gio_signals.defs: Regenerated, though there are no new properties or
signals.

4 files changed, 46 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 3aa3847b..4f146ec3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2011-02-15  Murray Cumming  <murrayc@murrayc.com>
 
+	Update the .defs for signals and properties.
+
+	* tools/extra_defs_gen/generate_defs_gio.cc: Mention more GDbus types.
+	* tools/extra_defs_gen/generate_defs_glib.cc: Mention some types, though 
+	none have properties or signals.
+	* gio/src/gio_signals.defs: Regenerated, though there are no new properties or 
+	signals.
+
+2011-02-15  Murray Cumming  <murrayc@murrayc.com>
+
 	Regenerate the XML of the C documentation.
 
 	* gio/src/gio_docs.xml:
diff --git a/gio/src/gio_signals.defs b/gio/src/gio_signals.defs
index c52c58dc..2bc8860c 100644
--- a/gio/src/gio_signals.defs
+++ b/gio/src/gio_signals.defs
@@ -1816,6 +1816,22 @@
   (construct-only #t)
 )
 
+;; From GDBusError
+
+;; From GDBusAnnotationInfo
+
+;; From GDBusArgInfo
+
+;; From GDBusMethodInfo
+
+;; From GDBusSignalInfo
+
+;; From GDBusPropertyInfo
+
+;; From GDBusInterfaceInfo
+
+;; From GDBusNodeInfo
+
 ;; From GDBusMessage
 
 (define-property locked
@@ -1827,6 +1843,8 @@
   (construct-only #f)
 )
 
++;; From GDBusMethodInvocation
+
 ;; From GDBusProxy
 
 (define-signal g-properties-changed
diff --git a/tools/extra_defs_gen/generate_defs_gio.cc b/tools/extra_defs_gen/generate_defs_gio.cc
index 1353c93a..c48a17a8 100644
--- a/tools/extra_defs_gen/generate_defs_gio.cc
+++ b/tools/extra_defs_gen/generate_defs_gio.cc
@@ -111,10 +111,19 @@ int main(int, char**)
             << get_defs(G_TYPE_SOCKET_SERVICE)
             << get_defs(G_TYPE_THREADED_SOCKET_SERVICE)
 
-            // DBus classes.
+            // DBus types:
             << get_defs(G_TYPE_DBUS_AUTH_OBSERVER)
             << get_defs(G_TYPE_DBUS_CONNECTION)
+            << get_defs(G_TYPE_DBUS_ERROR)
+            << get_defs(G_TYPE_DBUS_ANNOTATION_INFO)
+            << get_defs(G_TYPE_DBUS_ARG_INFO)
+            << get_defs(G_TYPE_DBUS_METHOD_INFO)
+            << get_defs(G_TYPE_DBUS_SIGNAL_INFO)
+            << get_defs(G_TYPE_DBUS_PROPERTY_INFO)
+            << get_defs(G_TYPE_DBUS_INTERFACE_INFO)
+            << get_defs(G_TYPE_DBUS_NODE_INFO)
             << get_defs(G_TYPE_DBUS_MESSAGE)
+            << get_defs(G_TYPE_DBUS_METHOD_INVOCATION)
             << get_defs(G_TYPE_DBUS_PROXY)
             << get_defs(G_TYPE_DBUS_SERVER)
 
diff --git a/tools/extra_defs_gen/generate_defs_glib.cc b/tools/extra_defs_gen/generate_defs_glib.cc
index 84d93c35..76286bd5 100644
--- a/tools/extra_defs_gen/generate_defs_glib.cc
+++ b/tools/extra_defs_gen/generate_defs_glib.cc
@@ -20,15 +20,17 @@
  */
 
 #include "generate_extra_defs.h"
-//#include <glib/glib.h>
+#include <glib.h>
 
-int main (int, char**)
+int main()
 {
-  //glib_init(&argc, &argv);
+  g_type_init();
 
-  //std::cout << get_defs( ATK_TYPE_HYPERLINK )
-   
-  std::cout << "No glib types were examined.";
+  std::cout << get_defs( G_TYPE_DATE )
+            << get_defs( G_TYPE_IO_CHANNEL )
+            << get_defs( G_TYPE_REGEX )
+            << get_defs( G_TYPE_VARIANT )
+            << std::endl;
 
   return 0;
 }