diff options
-rw-r--r-- | gio/giomm/Makefile.am | 2 | ||||
-rw-r--r-- | gio/giomm/filelist.am | 2 | ||||
-rw-r--r-- | gio/giomm/slot_async.cc | 2 | ||||
-rw-r--r-- | gio/giomm/slot_async.h | 18 |
4 files changed, 20 insertions, 4 deletions
diff --git a/gio/giomm/Makefile.am b/gio/giomm/Makefile.am index b03256c5..6d997b05 100644 --- a/gio/giomm/Makefile.am +++ b/gio/giomm/Makefile.am @@ -29,8 +29,6 @@ files_extra_ph = $(giomm_files_extra_ph) include $(top_srcdir)/build/compile-binding.am -dist_noinst_HEADERS = slot_async.h - local_includes = -I$(top_builddir)/glib $(if $(srcdir:.=),-I$(top_srcdir)/glib) local_cppflags = $(binding_includes) $(local_includes) $(binding_cppflags) -DGIOMM_BUILD=1 diff --git a/gio/giomm/filelist.am b/gio/giomm/filelist.am index 98c0e645..f2414e5a 100644 --- a/gio/giomm/filelist.am +++ b/gio/giomm/filelist.am @@ -5,7 +5,7 @@ giomm_files_built_h = $(giomm_files_used_hg:.hg=.h) giomm_files_built_ph = $(patsubst %.hg,private/%_p.h,$(giomm_files_used_hg)) giomm_files_extra_cc = contenttype.cc init.cc slot_async.cc socketsource.cc -giomm_files_extra_h = contenttype.h init.h socketsource.h wrap_init.h +giomm_files_extra_h = contenttype.h init.h slot_async.h socketsource.h wrap_init.h giomm_files_extra_ph = giomm_files_all_h = $(giomm_files_hg:.hg=.h) $(giomm_files_extra_h) diff --git a/gio/giomm/slot_async.cc b/gio/giomm/slot_async.cc index 4f2b6e2b..db23dbf5 100644 --- a/gio/giomm/slot_async.cc +++ b/gio/giomm/slot_async.cc @@ -14,9 +14,9 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ -#include "slot_async.h" #include <glibmm/exceptionhandler.h> #include <giomm/asyncresult.h> +#include <giomm/slot_async.h> namespace Gio { diff --git a/gio/giomm/slot_async.h b/gio/giomm/slot_async.h index 228e1c9c..378d9d40 100644 --- a/gio/giomm/slot_async.h +++ b/gio/giomm/slot_async.h @@ -1,3 +1,6 @@ +#ifndef _GIOMM_SLOT_ASYNC_H +#define _GIOMM_SLOT_ASYNC_H + /* Copyright (C) 2007 The gtkmm Development Team * * This library is free software; you can redistribute it and/or @@ -15,9 +18,24 @@ */ #include <gio/gio.h> +#ifndef DOXYGEN_SHOULD_SKIP_THIS + namespace Gio { +/** Callback function, used in combination with Gio::SlotAsyncReady. + * + * Example: + * @code + * _WRAP_METHOD(void acquire_async(const SlotAsyncReady& slot{callback}, + * const Glib::RefPtr<Cancellable>& cancellable{.?}), g_permission_acquire_async, + * slot_name slot, slot_callback SignalProxy_async_callback) + * @endcode + */ void SignalProxy_async_callback(GObject*, GAsyncResult* res, void* data); } // namespace Gio + +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + +#endif /* _GIOMM_SLOT_ASYNC_H */ |