glib r6263 - trunk/gio

[alexl svn gnome org]

Author: alexl
Date: Mon Jan  7 13:56:10 2008
New Revision: 6263
URL: http://svn.gnome.org/viewvc/glib?rev=6263&view=rev

Log:
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)



Modified:
   trunk/gio/ChangeLog
   trunk/gio/Makefile.am
   trunk/gio/gfilemonitor.c
   trunk/gio/gio-marshal.list
   trunk/gio/gmountoperation.c

Modified: trunk/gio/ChangeLog
==============================================================================
--- trunk/gio/ChangeLog	(original)
+++ trunk/gio/ChangeLog	Mon Jan  7 13:56:10 2008
@@ -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]
 	

Modified: trunk/gio/Makefile.am
==============================================================================
--- trunk/gio/Makefile.am	(original)
+++ trunk/gio/Makefile.am	Mon Jan  7 13:56:10 2008
@@ -51,12 +51,12 @@
 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 = \

Modified: trunk/gio/gfilemonitor.c
==============================================================================
--- trunk/gio/gfilemonitor.c	(original)
+++ trunk/gio/gfilemonitor.c	Mon Jan  7 13:56:10 2008
@@ -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_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,

Modified: trunk/gio/gio-marshal.list
==============================================================================
--- trunk/gio/gio-marshal.list	(original)
+++ trunk/gio/gio-marshal.list	Mon Jan  7 13:56:10 2008
@@ -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

Modified: trunk/gio/gmountoperation.c
==============================================================================
--- trunk/gio/gmountoperation.c	(original)
+++ trunk/gio/gmountoperation.c	Mon Jan  7 13:56:10 2008
@@ -257,9 +257,9 @@
 		  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_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: