luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pass --internal to glib-genmarshal

Browse Source 
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
This commit is contained in:
Alexander Larsson 2008-01-07 13:56:10 +00:00 committed by Alexander Larsson
parent e23140cbb4
commit 361e0e9b1c
5 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gio/ChangeLog
View File

@ -1,3 +1,13 @@
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> 2008-01-07 Alexander Larsson <alexl@redhat.com>
* Makefile.am: * Makefile.am:

4
gio/Makefile.am
View File

@ -51,12 +51,12 @@ else
endif endif
gio-marshal.h: gio-marshal.list 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 $@ mv $@.tmp $@
gio-marshal.c: gio-marshal.h gio-marshal.list gio-marshal.c: gio-marshal.h gio-marshal.list
(echo "#include \"gio-marshal.h\""; \ (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 $@ mv $@.tmp $@
local_sources = \ local_sources = \

5
gio/gfilemonitor.c
View File

@ -25,6 +25,7 @@
#include "gfilemonitor.h" #include "gfilemonitor.h"
#include "gio-marshal.h" #include "gio-marshal.h"
#include "gioenumtypes.h"
#include "gvfs.h" #include "gvfs.h"
#include "glibintl.h" #include "glibintl.h"
@ -194,9 +195,9 @@ g_file_monitor_class_init (GFileMonitorClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GFileMonitorClass, changed), G_STRUCT_OFFSET (GFileMonitorClass, changed),
NULL, NULL, NULL, NULL,
_gio_marshal_VOID__OBJECT_OBJECT_INT, _gio_marshal_VOID__OBJECT_OBJECT_ENUM,
G_TYPE_NONE, 3, 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, g_object_class_install_property (object_class,
PROP_RATE_LIMIT, PROP_RATE_LIMIT,

6
gio/gio-marshal.list
View File

@ -1,4 +1,4 @@
BOOLEAN:STRING,STRING,STRING,UINT BOOLEAN:STRING,STRING,STRING,FLAGS
BOOLEAN:STRING,POINTER BOOLEAN:STRING,BOXED
VOID:BOOLEAN,POINTER VOID:BOOLEAN,POINTER
VOID:OBJECT,OBJECT,INT VOID:OBJECT,OBJECT,ENUM

8
gio/gmountoperation.c
View File

@ -257,9 +257,9 @@ g_mount_operation_class_init (GMountOperationClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GMountOperationClass, ask_password), G_STRUCT_OFFSET (GMountOperationClass, ask_password),
boolean_handled_accumulator, NULL, boolean_handled_accumulator, NULL,
_gio_marshal_BOOLEAN__STRING_STRING_STRING_UINT, _gio_marshal_BOOLEAN__STRING_STRING_STRING_FLAGS,
G_TYPE_BOOLEAN, 4, 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: * GMountOperation::ask-question:
@ -276,9 +276,9 @@ g_mount_operation_class_init (GMountOperationClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GMountOperationClass, ask_question), G_STRUCT_OFFSET (GMountOperationClass, ask_question),
boolean_handled_accumulator, NULL, boolean_handled_accumulator, NULL,
_gio_marshal_BOOLEAN__STRING_POINTER, _gio_marshal_BOOLEAN__STRING_BOXED,
G_TYPE_BOOLEAN, 2, G_TYPE_BOOLEAN, 2,
G_TYPE_STRING, G_TYPE_POINTER); G_TYPE_STRING, G_TYPE_STRV);
/** /**
* GMountOperation::reply: * GMountOperation::reply: