GNOME.org
 

[glibmm] giomm: Add UnixFDMessage to the build.

commit 096d5957d1575787a5e419dab1b347d0f6ebc752
Author: José Alburquerque <jaalburqu svn gnome org>
Date:   Tue Aug 17 00:52:32 2010 -0400

    	giomm: Add UnixFDMessage to the build.
    
    	* gio/src/unixfdmessage.ccg: Include <gio/gunixfdmessage.h> instead
    	of <gio/gio.h> so that the C API function definitions are correctly
    	included.
    	* gio/src/unixcredentialsmessage.ccg: Correct the include here also,
    	but bug #627013 must be resolved before including
    	UnixCredentialsMessage in the build.
    	* gio/src/filelist.am: Mention the unixfdmessage.hg file so
    	UnixFDMessage is built.  Left a TODO for UnixCredentialsMessage.
    	* tools/extra_defs_gen/generate_defs_gio.cc: Updated so that the tool
    	can be used to generate the signals and properties of GUnixFDMessage.
    	* gio/src/gio_signals.defs: Regenerated to get the properties of
    	GUnixFDMessage.

 ChangeLog                                 |   17 +++
 gio/src/filelist.am                       |    2 +
 gio/src/gio_signals.defs                  |  184 ++++++++++++++++++++++++++++-
 gio/src/unixcredentialsmessage.ccg        |    2 +-
 gio/src/unixfdmessage.ccg                 |    2 +-
 tools/extra_defs_gen/generate_defs_gio.cc |    8 +-
 6 files changed, 210 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index cb35798..42c8e6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2010-08-17  José Alburquerque  <jaalburqu svn gnome org>
+
+	giomm: Add UnixFDMessage to the build.
+
+	* gio/src/unixfdmessage.ccg: Include <gio/gunixfdmessage.h> instead
+	of <gio/gio.h> so that the C API function definitions are correctly
+	included.
+	* gio/src/unixcredentialsmessage.ccg: Correct the include here also,
+	but bug #627013 must be resolved before including
+	UnixCredentialsMessage in the build.
+	* gio/src/filelist.am: Mention the unixfdmessage.hg file so
+	UnixFDMessage is built.  Left a TODO for UnixCredentialsMessage.
+	* tools/extra_defs_gen/generate_defs_gio.cc: Updated so that the tool
+	can be used to generate the signals and properties of GUnixFDMessage.
+	* gio/src/gio_signals.defs: Regenerated to get the properties of
+	GUnixFDMessage.
+
 2010-08-13  José Alburquerque  <jaalburqu svn gnome org>
 
 	Regenerate the docs.
diff --git a/gio/src/filelist.am b/gio/src/filelist.am
index bc4a57d..05591a8 100644
--- a/gio/src/filelist.am
+++ b/gio/src/filelist.am
@@ -79,10 +79,12 @@ giomm_files_any_hg =			\
 	volume.hg			\
 	volumemonitor.hg
 
+#TODO: Include unixcredentialsmessage.hg below when bug #627013 is resolved.
 giomm_files_posix_hg =			\
 	desktopappinfo.hg		\
 	unixconnection.hg		\
 	unixfdlist.hg \
+	unixfdmessage.hg \
 	unixinputstream.hg		\
 	unixoutputstream.hg
 
diff --git a/gio/src/gio_signals.defs b/gio/src/gio_signals.defs
index 491700a..12caf97 100644
--- a/gio/src/gio_signals.defs
+++ b/gio/src/gio_signals.defs
@@ -1,5 +1,90 @@
 ;; From GAsyncResult
 
+;; From GApplication
+
+(define-signal quit-with-data
+  (of-object "GApplication")
+  (return-type "gboolean")
+  (when "last")
+  (parameters
+    '("GVariant" "p0")
+  )
+)
+
+(define-signal action-with-data
+  (of-object "GApplication")
+  (return-type "void")
+  (when "first")
+  (parameters
+    '("const-gchar*" "p0")
+    '("GVariant" "p1")
+  )
+)
+
+(define-signal prepare-activation
+  (of-object "GApplication")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("GVariant" "p0")
+    '("GVariant" "p1")
+  )
+)
+
+(define-property application-id
+  (of-object "GApplication")
+  (prop-type "GParamString")
+  (docs "Identifier for this application")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property register
+  (of-object "GApplication")
+  (prop-type "GParamBoolean")
+  (docs "If false, do not ")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property default-quit
+  (of-object "GApplication")
+  (prop-type "GParamBoolean")
+  (docs "Exit the process by default")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property is-remote
+  (of-object "GApplication")
+  (prop-type "GParamBoolean")
+  (docs "Whether this application is a proxy for another process")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property argv
+  (of-object "GApplication")
+  (prop-type "GParamVariant")
+  (docs "System argument vector with type signature aay")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property platform-data
+  (of-object "GApplication")
+  (prop-type "GParamVariant")
+  (docs "Environmental data, must have type signature a{sv}")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
 ;; From GCancellable
 
 (define-signal cancelled
@@ -286,6 +371,17 @@
   (construct-only #t)
 )
 
+;; From GUnixFDMessage
+
+(define-property fd-list
+  (of-object "GUnixFDMessage")
+  (prop-type "GParamObject")
+  (docs "The GUnixFDList object to send with the message")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
 ;; From GUnixInputStream
 
 (define-property fd
@@ -509,6 +605,83 @@
 
 ;; From GSeekable
 
+;; From GSettings
+
+(define-signal changed
+  (of-object "GSettings")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("const-gchar*" "p0")
+  )
+)
+
+(define-signal change-event
+  (of-object "GSettings")
+  (return-type "gboolean")
+  (when "last")
+  (parameters
+    '("gpointer" "p0")
+    '("gint" "p1")
+  )
+)
+
+(define-signal writable-changed
+  (of-object "GSettings")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("const-gchar*" "p0")
+  )
+)
+
+(define-signal writable-change-event
+  (of-object "GSettings")
+  (return-type "gboolean")
+  (when "last")
+  (parameters
+    '("guint" "p0")
+  )
+)
+
+(define-property schema
+  (of-object "GSettings")
+  (prop-type "GParamString")
+  (docs "The name of the schema for this settings object")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property backend
+  (of-object "GSettings")
+  (prop-type "GParamObject")
+  (docs "The GSettingsBackend for this settings object")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property path
+  (of-object "GSettings")
+  (prop-type "GParamString")
+  (docs "The path within the backend where the settings are")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property has-unapplied
+  (of-object "GSettings")
+  (prop-type "GParamBoolean")
+  (docs "TRUE if there are outstanding changes to apply()")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+;; From GSettingsBackend
+
 ;; From GSimpleAsyncResult
 
 ;; From GThemedIcon
@@ -725,7 +898,7 @@
 
 (define-property active
   (of-object "GDBusServer")
-  (prop-type "GParamString")
+  (prop-type "GParamBoolean")
   (docs "Whether the server is currently active")
   (readable #t)
   (writable #f)
@@ -1159,6 +1332,15 @@
   (construct-only #f)
 )
 
+(define-property timeout
+  (of-object "GSocketClient")
+  (prop-type "GParamUInt")
+  (docs "The I/O timeout for sockets, or 0 for none")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GSocketConnection
 
 (define-property input-stream
diff --git a/gio/src/unixcredentialsmessage.ccg b/gio/src/unixcredentialsmessage.ccg
index 372e8a1..47a59dd 100644
--- a/gio/src/unixcredentialsmessage.ccg
+++ b/gio/src/unixcredentialsmessage.ccg
@@ -17,7 +17,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gio/gio.h>
+#include <gio/gunixcredentialsmessage.h>
 #include <giomm/credentials.h>
 
 namespace Gio
diff --git a/gio/src/unixfdmessage.ccg b/gio/src/unixfdmessage.ccg
index b6a823b..6ac74d6 100644
--- a/gio/src/unixfdmessage.ccg
+++ b/gio/src/unixfdmessage.ccg
@@ -17,7 +17,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gio/gio.h>
+#include <gio/gunixfdmessage.h>
 #include <giomm/unixfdlist.h>
 
 namespace Gio
diff --git a/tools/extra_defs_gen/generate_defs_gio.cc b/tools/extra_defs_gen/generate_defs_gio.cc
index a468d56..f8a44fc 100644
--- a/tools/extra_defs_gen/generate_defs_gio.cc
+++ b/tools/extra_defs_gen/generate_defs_gio.cc
@@ -25,6 +25,9 @@
 #include <gio/gsettingsbackend.h>
 
 #ifndef G_OS_WIN32
+//TODO: Uncomment when bug #627013 is resolved.
+//#include <gio/gunixcredentialsmessage.h>
+# include <gio/gunixfdmessage.h>
 # include <gio/gunixinputstream.h>
 # include <gio/gunixoutputstream.h>
 # include <gio/gunixconnection.h>
@@ -56,8 +59,9 @@ int main(int, char**)
             << get_defs(G_TYPE_FILTER_OUTPUT_STREAM)
 
 #ifndef G_OS_WIN32
-            // << get_defs(G_TYPE_UNIX_CREDENTIALS_MESSAGE)
-            // << get_defs(G_TYPE_UNIX_FD_MESSAGE)
+            //TODO: Uncomment when bug #627013 is resolved.
+            //<< get_defs(G_TYPE_UNIX_CREDENTIALS_MESSAGE)
+            << get_defs(G_TYPE_UNIX_FD_MESSAGE)
             << get_defs(G_TYPE_UNIX_INPUT_STREAM)
             << get_defs(G_TYPE_UNIX_OUTPUT_STREAM)
 #endif
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]