From: <nu...@co...> - 2011-12-30 11:31:39
|
Masaaki Aoyagi 2011-12-30 02:58:06 +0900 (Fri, 30 Dec 2011) New Revision: 5ff153ea5999e5568a7c9ab26dc1d7c9ebefb176 Merged d59090b: Merge pull request #92 from masaakiaoyagi/master Log: Change to use conversion macros Modified files: gio2/ext/gio2/rbgio2conversions.h gio2/ext/gio2/rbgioasyncinitable.c gio2/ext/gio2/rbgiobufferedinputstream.c gio2/ext/gio2/rbgiobufferedoutputstream.c gio2/ext/gio2/rbgiocancellable.c gio2/ext/gio2/rbgiocharsetconverter.c gio2/ext/gio2/rbgioconverter.c gio2/ext/gio2/rbgioconverterinputstream.c gio2/ext/gio2/rbgioconverteroutputstream.c gio2/ext/gio2/rbgiodatainputstream.c gio2/ext/gio2/rbgiodataoutputstream.c gio2/ext/gio2/rbgiodesktopappinfo.c gio2/ext/gio2/rbgiodrive.c gio2/ext/gio2/rbgioemblemedicon.c gio2/ext/gio2/rbgiofiledescriptorbased.c gio2/ext/gio2/rbgiofileenumerator.c gio2/ext/gio2/rbgiofileicon.c gio2/ext/gio2/rbgiofileinputstream.c gio2/ext/gio2/rbgiofileiostream.c gio2/ext/gio2/rbgiofilemonitor.c gio2/ext/gio2/rbgiofilenamecompleter.c gio2/ext/gio2/rbgiofileoutputstream.c gio2/ext/gio2/rbgioinitable.c gio2/ext/gio2/rbgioiomodule.c gio2/ext/gio2/rbgioiostream.c gio2/ext/gio2/rbgioloadableicon.c gio2/ext/gio2/rbgiomemoryinputstream.c gio2/ext/gio2/rbgionetworkaddress.c gio2/ext/gio2/rbgionetworkservice.c gio2/ext/gio2/rbgioresolver.c gio2/ext/gio2/rbgioseekable.c gio2/ext/gio2/rbgiosimpleasyncresult.c gio2/ext/gio2/rbgiosocketaddressenumerator.c gio2/ext/gio2/rbgiosocketclient.c gio2/ext/gio2/rbgiosocketconnection.c gio2/ext/gio2/rbgiosocketcontrolmessage.c gio2/ext/gio2/rbgiosocketlistener.c gio2/ext/gio2/rbgiosocketservice.c gio2/ext/gio2/rbgiosrvtarget.c gio2/ext/gio2/rbgiothemedicon.c gio2/ext/gio2/rbgiounixconnection.c gio2/ext/gio2/rbgiounixfdmessage.c gio2/ext/gio2/rbgiounixinputstream.c gio2/ext/gio2/rbgiounixmountmonitor.c gio2/ext/gio2/rbgiounixoutputstream.c gio2/ext/gio2/rbgiounixsocketaddress.c gio2/ext/gio2/rbgiovfs.c gio2/ext/gio2/rbgiovolume.c gio2/ext/gio2/rbgiovolumemonitor.c gio2/ext/gio2/rbgiozlibcompressor.c gio2/ext/gio2/rbgiozlibdecompressor.c Modified: gio2/ext/gio2/rbgio2conversions.h (+2 -0) =================================================================== --- gio2/ext/gio2/rbgio2conversions.h 2011-12-30 02:37:15 +0900 (087e103) +++ gio2/ext/gio2/rbgio2conversions.h 2011-12-30 02:58:06 +0900 (5e067ac) @@ -94,6 +94,8 @@ #define GFILEATTRIBUTEINFOLIST2RVAL(o) (BOXED2RVAL(o, G_TYPE_FILE_ATTRIBUTE_INFO_LIST)) #define RVAL2GFILEATTRIBUTEMATCHER(o) ((GFileAttributeMatcher*)RVAL2BOXED(o, G_TYPE_FILE_ATTRIBUTE_MATCHER)) #define GFILEATTRIBUTEMATCHER2RVAL(o) (BOXED2RVAL(o, G_TYPE_FILE_ATTRIBUTE_MATCHER)) +#define RVAL2GSRVTARGET(o) ((GSrvTarget*)RVAL2BOXED(o, G_TYPE_SRV_TARGET)) +#define GSRVTARGET2RVAL(o) (BOXED2RVAL(o, G_TYPE_SRV_TARGET)) #define RVAL2GDATASTREAMBYTEORDER(o) (RVAL2GENUM(o, G_TYPE_DATA_STREAM_BYTE_ORDER)) #define GDATASTREAMBYTEORDER2RVAL(o) (GENUM2RVAL(o, G_TYPE_DATA_STREAM_BYTE_ORDER)) Modified: gio2/ext/gio2/rbgioasyncinitable.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgioasyncinitable.c 2011-12-30 02:37:15 +0900 (697286e) +++ gio2/ext/gio2/rbgioasyncinitable.c 2011-12-30 02:58:06 +0900 (0f1b7a7) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE mAsyncInitable -#define _SELF(value) G_ASYNC_INITABLE(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GASYNCINITABLE(value) static VALUE rg_init_async(int argc, VALUE *argv, VALUE self) Modified: gio2/ext/gio2/rbgiobufferedinputstream.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiobufferedinputstream.c 2011-12-30 02:37:15 +0900 (f340d68) +++ gio2/ext/gio2/rbgiobufferedinputstream.c 2011-12-30 02:58:06 +0900 (08c962f) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cBufferedInputStream -#define _SELF(value) G_BUFFERED_INPUT_STREAM(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GBUFFEREDINPUTSTREAM(value) static VALUE rg_initialize(int argc, VALUE *argv, VALUE self) Modified: gio2/ext/gio2/rbgiobufferedoutputstream.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiobufferedoutputstream.c 2011-12-30 02:37:15 +0900 (86df12d) +++ gio2/ext/gio2/rbgiobufferedoutputstream.c 2011-12-30 02:58:06 +0900 (4713363) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cBufferedOutputStream -#define _SELF(value) G_BUFFERED_OUTPUT_STREAM(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GBUFFEREDOUTPUTSTREAM(value) static VALUE rg_initialize(int argc, VALUE *argv, VALUE self) Modified: gio2/ext/gio2/rbgiocancellable.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiocancellable.c 2011-12-30 02:37:15 +0900 (a79a04b) +++ gio2/ext/gio2/rbgiocancellable.c 2011-12-30 02:58:06 +0900 (9ff7cee) @@ -63,7 +63,7 @@ rg_make_pollfd(VALUE self) g_cancellable_make_pollfd(cancellable, gfd); - return BOXED2RVAL(gfd, G_TYPE_POLL_FD); + return GPOLLFD2RVAL(gfd); } G_GNUC_NORETURN static VALUE Modified: gio2/ext/gio2/rbgiocharsetconverter.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiocharsetconverter.c 2011-12-30 02:37:15 +0900 (efda2f1) +++ gio2/ext/gio2/rbgiocharsetconverter.c 2011-12-30 02:58:06 +0900 (194ecb7) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cCharsetConverter -#define _SELF(value) G_CHARSET_CONVERTER(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GCHARSETCONVERTER(value) static VALUE rg_initialize(VALUE self, VALUE to, VALUE from) Modified: gio2/ext/gio2/rbgioconverter.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgioconverter.c 2011-12-30 02:37:15 +0900 (791ed33) +++ gio2/ext/gio2/rbgioconverter.c 2011-12-30 02:58:06 +0900 (867d57f) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE mConverter -#define _SELF(value) G_CONVERTER(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GCONVERTER(value) #define RVAL2GCONVERTERFLAGSDEFAULT(value) \ RVAL2TYPE_WITH_DEFAULT((value), \ Modified: gio2/ext/gio2/rbgioconverterinputstream.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgioconverterinputstream.c 2011-12-30 02:37:15 +0900 (1943e5b) +++ gio2/ext/gio2/rbgioconverterinputstream.c 2011-12-30 02:58:06 +0900 (790d105) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cConverterInputStream -#define _SELF(value) G_CONVERTER_INPUT_STREAM(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GCONVERTERINPUTSTREAM(value) static VALUE rg_initialize(VALUE self, VALUE base_stream, VALUE converter) Modified: gio2/ext/gio2/rbgioconverteroutputstream.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgioconverteroutputstream.c 2011-12-30 02:37:15 +0900 (36f8219) +++ gio2/ext/gio2/rbgioconverteroutputstream.c 2011-12-30 02:58:06 +0900 (0bad3ef) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cConverterOutputStream -#define _SELF(value) G_CONVERTER_OUTPUT_STREAM(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GCONVERTEROUTPUTSTREAM(value) static VALUE rg_initialize(VALUE self, VALUE base_stream, VALUE converter) Modified: gio2/ext/gio2/rbgiodatainputstream.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiodatainputstream.c 2011-12-30 02:37:15 +0900 (a1380f7) +++ gio2/ext/gio2/rbgiodatainputstream.c 2011-12-30 02:58:06 +0900 (e08eb07) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cDataInputStream -#define _SELF(value) G_DATA_INPUT_STREAM(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GDATAINPUTSTREAM(value) static VALUE rg_initialize(int argc, VALUE *argv, VALUE self) Modified: gio2/ext/gio2/rbgiodataoutputstream.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiodataoutputstream.c 2011-12-30 02:37:15 +0900 (201b198) +++ gio2/ext/gio2/rbgiodataoutputstream.c 2011-12-30 02:58:06 +0900 (7ed8463) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cDataOutputStream -#define _SELF(value) G_DATA_OUTPUT_STREAM(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GDATAOUTPUTSTREAM(value) static VALUE rg_initialize(int argc, VALUE *argv, VALUE self) Modified: gio2/ext/gio2/rbgiodesktopappinfo.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiodesktopappinfo.c 2011-12-30 02:37:15 +0900 (e0bde73) +++ gio2/ext/gio2/rbgiodesktopappinfo.c 2011-12-30 02:58:06 +0900 (5899328) @@ -25,7 +25,7 @@ #include <gio/gdesktopappinfo.h> #define RG_TARGET_NAMESPACE cDesktopAppInfo -#define _SELF(value) G_DESKTOP_APP_INFO(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GDESKTOPAPPINFO(value) static VALUE rg_s_new_from_filename(G_GNUC_UNUSED VALUE self, VALUE filename) Modified: gio2/ext/gio2/rbgiodrive.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiodrive.c 2011-12-30 02:37:15 +0900 (e9c62c6) +++ gio2/ext/gio2/rbgiodrive.c 2011-12-30 02:58:06 +0900 (d6e2c28) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE mDrive -#define _SELF(value) G_DRIVE(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GDRIVE(value) static VALUE rg_name(VALUE self) Modified: gio2/ext/gio2/rbgioemblemedicon.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgioemblemedicon.c 2011-12-30 02:37:15 +0900 (7d9da41) +++ gio2/ext/gio2/rbgioemblemedicon.c 2011-12-30 02:58:06 +0900 (adb209c) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cEmblemedIcon -#define _SELF(value) G_EMBLEMED_ICON(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GEMBLEMEDICON(value) static VALUE rg_initialize(VALUE self, VALUE icon, VALUE emblem) Modified: gio2/ext/gio2/rbgiofiledescriptorbased.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiofiledescriptorbased.c 2011-12-30 02:37:15 +0900 (1dabc45) +++ gio2/ext/gio2/rbgiofiledescriptorbased.c 2011-12-30 02:58:06 +0900 (3473563) @@ -25,7 +25,7 @@ #include <gio/gfiledescriptorbased.h> #define RG_TARGET_NAMESPACE mFileDescriptorBased -#define _SELF(value) G_FILE_DESCRIPTOR_BASED(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GFILEDESCRIPTORBASED(value) static VALUE rg_fd(VALUE self) Modified: gio2/ext/gio2/rbgiofileenumerator.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiofileenumerator.c 2011-12-30 02:37:15 +0900 (6f745d8) +++ gio2/ext/gio2/rbgiofileenumerator.c 2011-12-30 02:58:06 +0900 (4585174) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cFileEnumerator -#define _SELF(value) G_FILE_ENUMERATOR(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GFILEENUMERATOR(value) static VALUE rg_next_file(int argc, VALUE *argv, VALUE self) Modified: gio2/ext/gio2/rbgiofileicon.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiofileicon.c 2011-12-30 02:37:15 +0900 (7fd453d) +++ gio2/ext/gio2/rbgiofileicon.c 2011-12-30 02:58:06 +0900 (c97fa0f) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cFileIcon -#define _SELF(value) G_FILE_ICON(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GFILEICON(value) static VALUE rg_initialize(VALUE self, VALUE file) Modified: gio2/ext/gio2/rbgiofileinputstream.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiofileinputstream.c 2011-12-30 02:37:15 +0900 (070aa11) +++ gio2/ext/gio2/rbgiofileinputstream.c 2011-12-30 02:58:06 +0900 (b3ced55) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cFileInputStream -#define _SELF(value) G_FILE_INPUT_STREAM(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GFILEINPUTSTREAM(value) static VALUE rg_query_info(int argc, VALUE *argv, VALUE self) Modified: gio2/ext/gio2/rbgiofileiostream.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiofileiostream.c 2011-12-30 02:37:15 +0900 (50bd3cc) +++ gio2/ext/gio2/rbgiofileiostream.c 2011-12-30 02:58:06 +0900 (daf930c) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cFileIOStream -#define _SELF(value) G_FILE_IO_STREAM(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GFILEIOSTREAM(value) static VALUE rg_etag(VALUE self) Modified: gio2/ext/gio2/rbgiofilemonitor.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiofilemonitor.c 2011-12-30 02:37:15 +0900 (f1f1a5d) +++ gio2/ext/gio2/rbgiofilemonitor.c 2011-12-30 02:58:06 +0900 (a89c8a7) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cFileMonitor -#define _SELF(value) G_FILE_MONITOR(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GFILEMONITOR(value) static VALUE rg_cancel(VALUE self) Modified: gio2/ext/gio2/rbgiofilenamecompleter.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiofilenamecompleter.c 2011-12-30 02:37:15 +0900 (1b42fc9) +++ gio2/ext/gio2/rbgiofilenamecompleter.c 2011-12-30 02:58:06 +0900 (de3f16d) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cFilenameCompleter -#define _SELF(value) G_FILENAME_COMPLETER(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GFILENAMECOMPLETER(value) static VALUE rg_initialize(int argc, VALUE *argv, VALUE self) Modified: gio2/ext/gio2/rbgiofileoutputstream.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiofileoutputstream.c 2011-12-30 02:37:15 +0900 (8b272d2) +++ gio2/ext/gio2/rbgiofileoutputstream.c 2011-12-30 02:58:06 +0900 (e23c668) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cFileOutputStream -#define _SELF(value) G_FILE_OUTPUT_STREAM(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GFILEOUTPUTSTREAM(value) static VALUE rg_query_info(int argc, VALUE *argv, VALUE self) Modified: gio2/ext/gio2/rbgioinitable.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgioinitable.c 2011-12-30 02:37:15 +0900 (1ef938e) +++ gio2/ext/gio2/rbgioinitable.c 2011-12-30 02:58:06 +0900 (ad156c4) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE mInitable -#define _SELF(value) G_INITABLE(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GINITABLE(value) static VALUE rg_init(int argc, VALUE *argv, VALUE self) Modified: gio2/ext/gio2/rbgioiomodule.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgioiomodule.c 2011-12-30 02:37:15 +0900 (c2349f1) +++ gio2/ext/gio2/rbgioiomodule.c 2011-12-30 02:58:06 +0900 (b9a5adf) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cIOModule -#define _SELF(value) G_IO_MODULE(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GIOMODULE(value) static VALUE rg_initialize(VALUE self, VALUE filename) Modified: gio2/ext/gio2/rbgioiostream.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgioiostream.c 2011-12-30 02:37:15 +0900 (66e1d4a) +++ gio2/ext/gio2/rbgioiostream.c 2011-12-30 02:58:06 +0900 (376d5e8) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cIOStream -#define _SELF(value) G_IO_STREAM(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GIOSTREAM(value) static VALUE rg_close(VALUE self, VALUE cancellable) Modified: gio2/ext/gio2/rbgioloadableicon.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgioloadableicon.c 2011-12-30 02:37:15 +0900 (7a484f0) +++ gio2/ext/gio2/rbgioloadableicon.c 2011-12-30 02:58:06 +0900 (89c97ff) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE mLoadableIcon -#define _SELF(value) G_LOADABLE_ICON(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GLOADABLEICON(value) static VALUE rg_load(int argc, VALUE *argv, VALUE self) Modified: gio2/ext/gio2/rbgiomemoryinputstream.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiomemoryinputstream.c 2011-12-30 02:37:15 +0900 (44a89eb) +++ gio2/ext/gio2/rbgiomemoryinputstream.c 2011-12-30 02:58:06 +0900 (4a70270) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cMemoryInputStream -#define _SELF(value) G_MEMORY_INPUT_STREAM(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GMEMORYINPUTSTREAM(value) static VALUE rg_initialize(int argc, VALUE *argv, VALUE self) Modified: gio2/ext/gio2/rbgionetworkaddress.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgionetworkaddress.c 2011-12-30 02:37:15 +0900 (867e4ba) +++ gio2/ext/gio2/rbgionetworkaddress.c 2011-12-30 02:58:06 +0900 (f305255) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cNetworkAddress -#define _SELF(value) G_NETWORK_ADDRESS(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GNETWORKADDRESS(value) static VALUE rg_initialize(VALUE self, VALUE hostname, VALUE port) Modified: gio2/ext/gio2/rbgionetworkservice.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgionetworkservice.c 2011-12-30 02:37:15 +0900 (8c79d70) +++ gio2/ext/gio2/rbgionetworkservice.c 2011-12-30 02:58:06 +0900 (025f196) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cNetworkService -#define _SELF(value) G_NETWORK_SERVICE(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GNETWORKSERVICE(value) static VALUE rg_initialize(VALUE self, VALUE service, VALUE protocol, VALUE domain) Modified: gio2/ext/gio2/rbgioresolver.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgioresolver.c 2011-12-30 02:37:15 +0900 (1197d5d) +++ gio2/ext/gio2/rbgioresolver.c 2011-12-30 02:58:06 +0900 (59114c0) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cResolver -#define _SELF(value) G_RESOLVER(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GRESOLVER(value) static VALUE rg_s_default(G_GNUC_UNUSED VALUE self) Modified: gio2/ext/gio2/rbgioseekable.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgioseekable.c 2011-12-30 02:37:15 +0900 (217a502) +++ gio2/ext/gio2/rbgioseekable.c 2011-12-30 02:58:06 +0900 (67c4b6d) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE mSeekable -#define _SELF(value) G_SEEKABLE(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GSEEKABLE(value) #define RVAL2GSEEKTYPEDEFAULT(value) \ RVAL2TYPE_WITH_DEFAULT((value), NUM2INT, G_SEEK_CUR) Modified: gio2/ext/gio2/rbgiosimpleasyncresult.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiosimpleasyncresult.c 2011-12-30 02:37:15 +0900 (198a3c4) +++ gio2/ext/gio2/rbgiosimpleasyncresult.c 2011-12-30 02:58:06 +0900 (876b4aa) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cSimpleAsyncResult -#define _SELF(value) G_SIMPLE_ASYNC_RESULT(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GSIMPLEASYNCRESULT(value) static VALUE rg_initialize(VALUE self, VALUE object) Modified: gio2/ext/gio2/rbgiosocketaddressenumerator.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiosocketaddressenumerator.c 2011-12-30 02:37:15 +0900 (a15ffbe) +++ gio2/ext/gio2/rbgiosocketaddressenumerator.c 2011-12-30 02:58:06 +0900 (cf9d23e) @@ -21,7 +21,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cSocketAddressEnumerator -#define _SELF(value) G_SOCKET_ADDRESS_ENUMERATOR(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GSOCKETADDRESSENUMERATOR(value) static VALUE rg_next(int argc, VALUE *argv, VALUE self) Modified: gio2/ext/gio2/rbgiosocketclient.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiosocketclient.c 2011-12-30 02:37:15 +0900 (b0f7fea) +++ gio2/ext/gio2/rbgiosocketclient.c 2011-12-30 02:58:06 +0900 (f0ad2c8) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cSocketClient -#define _SELF(value) G_SOCKET_CLIENT(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GSOCKETCLIENT(value) static VALUE rg_initialize(VALUE self) Modified: gio2/ext/gio2/rbgiosocketconnection.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiosocketconnection.c 2011-12-30 02:37:15 +0900 (9f04d7a) +++ gio2/ext/gio2/rbgiosocketconnection.c 2011-12-30 02:58:06 +0900 (a11e578) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cSocketConnection -#define _SELF(value) G_SOCKET_CONNECTION(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GSOCKETCONNECTION(value) static VALUE rg_local_address(VALUE self) Modified: gio2/ext/gio2/rbgiosocketcontrolmessage.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiosocketcontrolmessage.c 2011-12-30 02:37:15 +0900 (8ab4329) +++ gio2/ext/gio2/rbgiosocketcontrolmessage.c 2011-12-30 02:58:06 +0900 (628a3ae) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cSocketControlMessage -#define _SELF(value) G_SOCKET_CONTROL_MESSAGE(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GSOCKETCONTROLMESSAGE(value) static VALUE rg_s_deserialize(G_GNUC_UNUSED VALUE self, VALUE level, VALUE type, VALUE data) Modified: gio2/ext/gio2/rbgiosocketlistener.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiosocketlistener.c 2011-12-30 02:37:15 +0900 (a81b2dc) +++ gio2/ext/gio2/rbgiosocketlistener.c 2011-12-30 02:58:06 +0900 (dd79b66) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cSocketListener -#define _SELF(value) G_SOCKET_LISTENER(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GSOCKETLISTENER(value) static VALUE rg_initialize(VALUE self) Modified: gio2/ext/gio2/rbgiosocketservice.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiosocketservice.c 2011-12-30 02:37:15 +0900 (1c4c524) +++ gio2/ext/gio2/rbgiosocketservice.c 2011-12-30 02:58:06 +0900 (e460c25) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cSocketService -#define _SELF(value) G_SOCKET_SERVICE(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GSOCKETSERVICE(value) static VALUE rg_initialize(VALUE self) Modified: gio2/ext/gio2/rbgiosrvtarget.c (+0 -3) =================================================================== --- gio2/ext/gio2/rbgiosrvtarget.c 2011-12-30 02:37:15 +0900 (9f24722) +++ gio2/ext/gio2/rbgiosrvtarget.c 2011-12-30 02:58:06 +0900 (628d998) @@ -21,9 +21,6 @@ #include "rbgio2private.h" -#define RVAL2GSRVTARGET(object) \ - ((GSrvTarget *)(RVAL2BOXED(object, G_TYPE_SRV_TARGET))) - #define RG_TARGET_NAMESPACE cSrvTarget #define _SELF(value) RVAL2GSRVTARGET(value) Modified: gio2/ext/gio2/rbgiothemedicon.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiothemedicon.c 2011-12-30 02:37:15 +0900 (d9d0955) +++ gio2/ext/gio2/rbgiothemedicon.c 2011-12-30 02:58:06 +0900 (69d2692) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE mThemedIcon -#define _SELF(value) G_THEMED_ICON(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GTHEMEDICON(value) /* TODO: Is this unnecessarily complicated? */ static VALUE Modified: gio2/ext/gio2/rbgiounixconnection.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiounixconnection.c 2011-12-30 02:37:15 +0900 (2b972bf) +++ gio2/ext/gio2/rbgiounixconnection.c 2011-12-30 02:58:06 +0900 (2e3683d) @@ -25,7 +25,7 @@ #include <gio/gunixconnection.h> #define RG_TARGET_NAMESPACE cUnixConnection -#define _SELF(value) G_UNIX_CONNECTION(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GUNIXCONNECTION(value) static VALUE rg_receive_fd(int argc, VALUE *argv, VALUE self) Modified: gio2/ext/gio2/rbgiounixfdmessage.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiounixfdmessage.c 2011-12-30 02:37:15 +0900 (d19b1c0) +++ gio2/ext/gio2/rbgiounixfdmessage.c 2011-12-30 02:58:06 +0900 (33adda2) @@ -25,7 +25,7 @@ #include <gio/gunixfdmessage.h> #define RG_TARGET_NAMESPACE cUnixFDMessage -#define _SELF(value) G_UNIX_FD_MESSAGE(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GUNIXFDMESSAGE(value) static VALUE rg_initialize(int argc, VALUE *argv, VALUE self) Modified: gio2/ext/gio2/rbgiounixinputstream.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiounixinputstream.c 2011-12-30 02:37:15 +0900 (94bb1f5) +++ gio2/ext/gio2/rbgiounixinputstream.c 2011-12-30 02:58:06 +0900 (3280732) @@ -25,7 +25,7 @@ #include <gio/gunixinputstream.h> #define RG_TARGET_NAMESPACE cUnixInputStream -#define _SELF(value) G_UNIX_INPUT_STREAM(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GUNIXINPUTSTREAM(value) static VALUE rg_initialize(int argc, VALUE *argv, VALUE self) Modified: gio2/ext/gio2/rbgiounixmountmonitor.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiounixmountmonitor.c 2011-12-30 02:37:15 +0900 (3651cad) +++ gio2/ext/gio2/rbgiounixmountmonitor.c 2011-12-30 02:58:06 +0900 (adc7e2f) @@ -25,7 +25,7 @@ #include <gio/gunixmounts.h> #define RG_TARGET_NAMESPACE cUnixMountMonitor -#define _SELF(value) G_UNIX_MOUNT_MONITOR(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GUNIXMOUNTMONITOR(value) static VALUE rg_initialize(int argc, VALUE *argv, VALUE self) Modified: gio2/ext/gio2/rbgiounixoutputstream.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiounixoutputstream.c 2011-12-30 02:37:15 +0900 (db4ab6c) +++ gio2/ext/gio2/rbgiounixoutputstream.c 2011-12-30 02:58:06 +0900 (70d27cb) @@ -25,7 +25,7 @@ #include <gio/gunixoutputstream.h> #define RG_TARGET_NAMESPACE cUnixOutputStream -#define _SELF(value) G_UNIX_OUTPUT_STREAM(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GUNIXOUTPUTSTREAM(value) static VALUE rg_initialize(int argc, VALUE *argv, VALUE self) Modified: gio2/ext/gio2/rbgiounixsocketaddress.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiounixsocketaddress.c 2011-12-30 02:37:15 +0900 (6494ab9) +++ gio2/ext/gio2/rbgiounixsocketaddress.c 2011-12-30 02:58:06 +0900 (819c71b) @@ -25,7 +25,7 @@ #include <gio/gunixsocketaddress.h> #define RG_TARGET_NAMESPACE cUnixSocketAddress -#define _SELF(value) G_UNIX_SOCKET_ADDRESS(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GUNIXSOCKETADDRESS(value) static VALUE rg_initialize(VALUE self, VALUE path) Modified: gio2/ext/gio2/rbgiovfs.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiovfs.c 2011-12-30 02:37:15 +0900 (01264aa) +++ gio2/ext/gio2/rbgiovfs.c 2011-12-30 02:58:06 +0900 (51fd6e8) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cVfs -#define _SELF(value) G_VFS(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GVFS(value) static VALUE rg_file_for_path(VALUE self, VALUE path) Modified: gio2/ext/gio2/rbgiovolume.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiovolume.c 2011-12-30 02:37:15 +0900 (3408d72) +++ gio2/ext/gio2/rbgiovolume.c 2011-12-30 02:58:06 +0900 (347b702) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE mVolume -#define _SELF(value) G_VOLUME(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GVOLUME(value) static VALUE rg_name(VALUE self) Modified: gio2/ext/gio2/rbgiovolumemonitor.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiovolumemonitor.c 2011-12-30 02:37:15 +0900 (645394a) +++ gio2/ext/gio2/rbgiovolumemonitor.c 2011-12-30 02:58:06 +0900 (2791011) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cVolumeMonitor -#define _SELF(value) G_VOLUME_MONITOR(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GVOLUMEMONITOR(value) static VALUE rg_s_get(G_GNUC_UNUSED VALUE self) Modified: gio2/ext/gio2/rbgiozlibcompressor.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiozlibcompressor.c 2011-12-30 02:37:15 +0900 (0c08880) +++ gio2/ext/gio2/rbgiozlibcompressor.c 2011-12-30 02:58:06 +0900 (038a9b3) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cZlibCompressor -#define _SELF(value) G_ZLIB_COMPRESSOR(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GZLIBCOMPRESSOR(value) #define RVAL2ZLIBCOMPRESSORLEVELDEFAULT(value) \ RVAL2TYPE_WITH_DEFAULT((value), FIX2INT, -1) Modified: gio2/ext/gio2/rbgiozlibdecompressor.c (+1 -1) =================================================================== --- gio2/ext/gio2/rbgiozlibdecompressor.c 2011-12-30 02:37:15 +0900 (c43e854) +++ gio2/ext/gio2/rbgiozlibdecompressor.c 2011-12-30 02:58:06 +0900 (3e91efd) @@ -22,7 +22,7 @@ #include "rbgio2private.h" #define RG_TARGET_NAMESPACE cZlibDecompressor -#define _SELF(value) G_ZLIB_DECOMPRESSOR(RVAL2GOBJ(value)) +#define _SELF(value) RVAL2GZLIBDECOMPRESSOR(value) static VALUE rg_initialize(int argc, VALUE *argv, VALUE self) |