Pass --internal to glib-genmarshal

2008-01-07  Alexander Larsson  <alexl@redhat.com>

        * Makefile.am:
	Pass --internal to glib-genmarshal

        * gfilemonitor.c:
        * gmountoperation.c:
        * gio-marshal.list:
	Use better types for signal arguments (#507822)

svn path=/trunk/; revision=6263

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 7348b2a..b3a48c6 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,6 +1,16 @@
 2008-01-07  Alexander Larsson  <alexl@redhat.com>
 
         * Makefile.am:
+       Pass --internal to glib-genmarshal
+       
+        * gfilemonitor.c:
+        * gmountoperation.c:
+        * gio-marshal.list:
+       Use better types for signal arguments (#507822)
+
+2008-01-07  Alexander Larsson  <alexl@redhat.com>
+
+        * Makefile.am:
        Build test subdir after .
        Remove gdirectorymonitor.[ch]
        

diff --git a/gio/Makefile.am b/gio/Makefile.am
index 76cb753..07f6af1 100644 (file)
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -51,12 +51,12 @@ else
 endif
 
 gio-marshal.h: gio-marshal.list
-       $(glib_genmarshal) --prefix=_gio_marshal $(srcdir)/gio-marshal.list --header > $@.tmp && \
+       $(glib_genmarshal) --prefix=_gio_marshal $(srcdir)/gio-marshal.list --header --internal > $@.tmp && \
          mv $@.tmp $@
 
 gio-marshal.c: gio-marshal.h gio-marshal.list
        (echo "#include \"gio-marshal.h\""; \
-       $(glib_genmarshal) --prefix=_gio_marshal $(srcdir)/gio-marshal.list --body) > $@.tmp && \
+       $(glib_genmarshal) --prefix=_gio_marshal $(srcdir)/gio-marshal.list --body --internal) > $@.tmp && \
          mv $@.tmp $@
 
 local_sources = \

diff --git a/gio/gfilemonitor.c b/gio/gfilemonitor.c
index f5d7a49..e481fc1 100644 (file)
--- a/gio/gfilemonitor.c
+++ b/gio/gfilemonitor.c
@@ -25,6 +25,7 @@
 
 #include "gfilemonitor.h"
 #include "gio-marshal.h"
+#include "gioenumtypes.h"
 #include "gvfs.h"
 #include "glibintl.h"
 
@@ -194,9 +195,9 @@ g_file_monitor_class_init (GFileMonitorClass *klass)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GFileMonitorClass, changed),
                  NULL, NULL,
-                 _gio_marshal_VOID__OBJECT_OBJECT_INT,
+                 _gio_marshal_VOID__OBJECT_OBJECT_ENUM,
                  G_TYPE_NONE, 3,
-                 G_TYPE_FILE, G_TYPE_FILE, G_TYPE_INT); 
+                 G_TYPE_FILE, G_TYPE_FILE, G_TYPE_FILE_MONITOR_EVENT);
 
   g_object_class_install_property (object_class,
                                    PROP_RATE_LIMIT,

diff --git a/gio/gio-marshal.list b/gio/gio-marshal.list
index 4c4ae5a..d06467d 100644 (file)
--- a/gio/gio-marshal.list
+++ b/gio/gio-marshal.list
@@ -1,4 +1,4 @@
-BOOLEAN:STRING,STRING,STRING,UINT
-BOOLEAN:STRING,POINTER
+BOOLEAN:STRING,STRING,STRING,FLAGS
+BOOLEAN:STRING,BOXED
 VOID:BOOLEAN,POINTER
-VOID:OBJECT,OBJECT,INT
+VOID:OBJECT,OBJECT,ENUM

diff --git a/gio/gmountoperation.c b/gio/gmountoperation.c
index 44a4269..bdaa7d9 100644 (file)
--- a/gio/gmountoperation.c
+++ b/gio/gmountoperation.c
@@ -257,9 +257,9 @@ g_mount_operation_class_init (GMountOperationClass *klass)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GMountOperationClass, ask_password),
                  boolean_handled_accumulator, NULL,
-                 _gio_marshal_BOOLEAN__STRING_STRING_STRING_UINT,
+                 _gio_marshal_BOOLEAN__STRING_STRING_STRING_FLAGS,
                  G_TYPE_BOOLEAN, 4,
-                 G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT);
+                 G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_ASK_PASSWORD_FLAGS);
                  
   /**
    * GMountOperation::ask-question:
@@ -276,9 +276,9 @@ g_mount_operation_class_init (GMountOperationClass *klass)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GMountOperationClass, ask_question),
                  boolean_handled_accumulator, NULL,
-                 _gio_marshal_BOOLEAN__STRING_POINTER,
+                 _gio_marshal_BOOLEAN__STRING_BOXED,
                  G_TYPE_BOOLEAN, 2,
-                 G_TYPE_STRING, G_TYPE_POINTER);
+                 G_TYPE_STRING, G_TYPE_STRV);
                  
   /**
    * GMountOperation::reply: