diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | NEWS | 24 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | gio/src/file.ccg | 32 | ||||
| -rw-r--r-- | gio/src/file.hg | 39 | ||||
| -rw-r--r-- | gio/src/gio_methods.defs | 48 | ||||
| -rw-r--r-- | gio/src/themedicon.hg | 3 |
7 files changed, 158 insertions, 3 deletions
@@ -1,3 +1,14 @@ +2.15.7: + +2008-02-26 Murray Cumming <murrayc@murrayc.com> + + * gio/src/gio_methods.defs: Regenerated. + * gio/src/file.ccg: + * gio/src/file.hg: Added query_filesystem_info_async() and + query_filesystem_info_finish() because these were added to the C API. + * gio/src/themedicon.hg: Added append_name() because this was added to + the C API. + 2008-02-25 Jonathon Jongsma <jjongsma@gnome.org> * docs/reference/Doxyfile.in: 'upgraded' the doxygen config file since @@ -1,4 +1,26 @@ -2.15.6 (unstable) +2.15.7 (unstable): + +* File: + - Added query_filesystem_info_async() and + query_filesystem_info_finish() because these were added to the C API. + (Murray Cumming) + - Renamed contains_file() to file_has_prefix() because this was changed in the + C API. + (Wouter Bolsterlee) +* ThemedIcon: Added append_name() because this was added to the C API. + (Murray Cumming) + +Glib: +* Renamed uri_get_scheme() to uri_parse_scheme() because this was changed + in the C API. + (Wouter Bolsterlee) + +Documentation: +* Corrections to the .devhelp file generation. + (Jonathon Jongsma. Bug #518673) + + +2.15.6 (unstable): Gio: * Removed most vfuncs, because they are not useful to application developers, diff --git a/configure.in b/configure.in index bb327389..fbd1734a 100644 --- a/configure.in +++ b/configure.in @@ -14,7 +14,7 @@ pushdef([GLIBMM_MAJOR_VERSION], [2]) pushdef([GLIBMM_MINOR_VERSION], [15]) -pushdef([GLIBMM_MICRO_VERSION], [6]) +pushdef([GLIBMM_MICRO_VERSION], [7]) pushdef([GLIBMM_EXTRA_VERSION], []) pushdef([GLIBMM_VERSION], GLIBMM_MAJOR_VERSION.GLIBMM_MINOR_VERSION.GLIBMM_MICRO_VERSION[]GLIBMM_EXTRA_VERSION) @@ -131,7 +131,7 @@ AC_CHECK_FUNCS([flockfile funlockfile getc_unlocked mkfifo]) # Dependancy checks ######################################################################### gtkmm_min_sigc_version=2.0.0 -gtkmm_min_glib_version=2.15.5 +gtkmm_min_glib_version=2.15.6 PKG_CHECK_MODULES(GLIBMM, sigc++-2.0 >= ${gtkmm_min_sigc_version} glib-2.0 >= ${gtkmm_min_glib_version} gobject-2.0 >= ${gtkmm_min_glib_version} gmodule-2.0 >= ${gtkmm_min_glib_version}) AC_SUBST(GLIBMM_CFLAGS) diff --git a/gio/src/file.ccg b/gio/src/file.ccg index 1a7424ac..6692789d 100644 --- a/gio/src/file.ccg +++ b/gio/src/file.ccg @@ -395,6 +395,38 @@ Glib::RefPtr<FileInfo> File::query_filesystem_info(const std::string& attributes return retvalue; } +void +File::query_filesystem_info_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, const std::string& attributes, int io_priority) const +{ + // Create a copy of the slot. + // A pointer to it will be passed through the callback's data parameter + // and deleted in the callback. + SlotAsyncReady* slot_copy = new SlotAsyncReady(slot); + + g_file_query_filesystem_info_async(const_cast<GFile*>(gobj()), + attributes.c_str(), + io_priority, + cancellable->gobj(), + &SignalProxy_async_callback, + slot_copy); +} + +void +File::query_filesystem_info_async(const SlotAsyncReady& slot, const std::string& attributes, int io_priority) const +{ + // Create a copy of the slot. + // A pointer to it will be passed through the callback's data parameter + // and deleted in the callback. + SlotAsyncReady* slot_copy = new SlotAsyncReady(slot); + + g_file_query_filesystem_info_async(const_cast<GFile*>(gobj()), + attributes.c_str(), + io_priority, + NULL, // cancellable + &SignalProxy_async_callback, + slot_copy); +} + #ifdef GLIBMM_EXCEPTIONS_ENABLED Glib::RefPtr<FileEnumerator> File::enumerate_children(const Glib::RefPtr<Cancellable>& cancellable, const std::string& attributes, FileQueryInfoFlags flags) #else diff --git a/gio/src/file.hg b/gio/src/file.hg index b7a7e44e..9d99feb1 100644 --- a/gio/src/file.hg +++ b/gio/src/file.hg @@ -690,6 +690,45 @@ public: _WRAP_METHOD(Glib::RefPtr<Mount> find_enclosing_mount(const Glib::RefPtr<Cancellable>& cancellable), g_file_find_enclosing_mount, retreturn, errthrow) + + /** Asynchronously gets the requested information about the filesystem + * that the file is on. The result is a FileInfo object + * that contains key-value attributes (such as type or size for the + * file). + * + * For more details, see query_filesystem_info() which is the synchronous version of this call. + * + * When the operation is finished, @a slot will be called. You can then call query_filesystem_info_finish() to get the result of the operation. + * + * @param slot A callback slot which will be called when the request is satisfied. + * @param cancellable A Cancellable object which can be used to cancel the operation. + * @param attributes An attribute query string. + * @param io_priority The I/O priority of the request. + */ + void query_filesystem_info_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, const std::string& attributes = "*", int io_priority = Glib::PRIORITY_DEFAULT) const; + + /** Asynchronously gets the requested information about the filesystem + * that the file is on. The result is a FileInfo object + * that contains key-value attributes (such as type or size for the + * file). + * + * For more details, see query_filesystem_info() which is the synchronous version of this call. + * + * When the operation is finished, @a slot will be called. You can then call query_filesystem_info_finish() to get the result of the operation. + * + * @param slot A callback slot which will be called when the request is satisfied. + * @param attributes An attribute query string. + * @param io_priority The I/O priority of the request. + */ + void query_filesystem_info_async(const SlotAsyncReady& slot, const std::string& attributes = "*", int io_priority = Glib::PRIORITY_DEFAULT) const; + _IGNORE(g_file_query_filesystem_info_async) + + + _WRAP_METHOD(Glib::RefPtr<FileInfo> query_filesystem_info_finish(const Glib::RefPtr<AsyncResult>& result), + g_file_query_filesystem_info_finish, + refreturn, errthrow) + + /** Gets a Mount for the File. * * If the FileIface for the file does not have a mount (e.g. possibly a diff --git a/gio/src/gio_methods.defs b/gio/src/gio_methods.defs index dc5140b8..0809fe4c 100644 --- a/gio/src/gio_methods.defs +++ b/gio/src/gio_methods.defs @@ -381,6 +381,17 @@ ) ) +(define-enum PreviewType + (in-module "GFilesystem") + (c-name "GFilesystemPreviewType") + (gtype-id "G_TYPE_FILESYSTEM_PREVIEW_TYPE") + (values + '("if-always" "G_FILESYSTEM_PREVIEW_TYPE_IF_ALWAYS") + '("if-local" "G_FILESYSTEM_PREVIEW_TYPE_IF_LOCAL") + '("never" "G_FILESYSTEM_PREVIEW_TYPE_NEVER") + ) +) + (define-enum MonitorEvent (in-module "GFile") (c-name "GFileMonitorEvent") @@ -1995,6 +2006,29 @@ ) ) +(define-method query_filesystem_info_async + (of-object "GFile") + (c-name "g_file_query_filesystem_info_async") + (return-type "none") + (parameters + '("const-char*" "attributes") + '("int" "io_priority") + '("GCancellable*" "cancellable") + '("GAsyncReadyCallback" "callback") + '("gpointer" "user_data") + ) +) + +(define-method query_filesystem_info_finish + (of-object "GFile") + (c-name "g_file_query_filesystem_info_finish") + (return-type "GFileInfo*") + (parameters + '("GAsyncResult*" "res") + '("GError**" "error") + ) +) + (define-method find_enclosing_mount (of-object "GFile") (c-name "g_file_find_enclosing_mount") @@ -3585,6 +3619,11 @@ (return-type "GType") ) +(define-function g_filesystem_preview_type_get_type + (c-name "g_filesystem_preview_type_get_type") + (return-type "GType") +) + (define-function g_file_monitor_event_get_type (c-name "g_file_monitor_event_get_type") (return-type "GType") @@ -4683,6 +4722,15 @@ ) ) +(define-method append_name + (of-object "GThemedIcon") + (c-name "g_themed_icon_append_name") + (return-type "none") + (parameters + '("const-char*" "iconname") + ) +) + ;; From gunionvolumemonitor.h diff --git a/gio/src/themedicon.hg b/gio/src/themedicon.hg index a8090ea7..2616aad6 100644 --- a/gio/src/themedicon.hg +++ b/gio/src/themedicon.hg @@ -56,10 +56,13 @@ public: //TODO: GIcon *g_themed_icon_new_with_default_fallbacks (const char *iconname); //TODO: GIcon *g_themed_icon_new_from_names (char **iconnames, int len); + _WRAP_METHOD(void append_name(const std::string& iconname), g_themed_icon_append_name) + #m4 _CONVERSION(`const char*const*',`Glib::StringArrayHandle',`Glib::StringArrayHandle($3, Glib::OWNERSHIP_DEEP)') //TODO: gmmproc complains about the wrong number of arguments, but I can't see why. murrayc. //_WRAP_METHOD(Glib::StringArrayHandle get_names() const, g_themed_icon_get_names) + //There are no signals or properties. }; |