mirror of
				https://gitlab.gnome.org/GNOME/glib.git
				synced 2025-11-04 01:58:54 +01:00 
			
		
		
		
	various: add GLIB_AVAILABLE_IN_ALL everywhere else
Add the GLIB_AVAILABLE_IN_ALL annotation to all old functions (that haven't already been annotated with the GLIB_AVAILABLE_IN_* macros or a deprecation macro). If we discover in the future that we cannot use only one macro on Windows, it will be an easy sed patch to fix that. https://bugzilla.gnome.org/show_bug.cgi?id=688681
This commit is contained in:
		@@ -61,16 +61,24 @@ struct _GActionInterface
 | 
				
			|||||||
GLIB_AVAILABLE_IN_2_30
 | 
					GLIB_AVAILABLE_IN_2_30
 | 
				
			||||||
GType                   g_action_get_type                               (void) G_GNUC_CONST;
 | 
					GType                   g_action_get_type                               (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar *           g_action_get_name                               (GAction            *action);
 | 
					const gchar *           g_action_get_name                               (GAction            *action);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const GVariantType *    g_action_get_parameter_type                     (GAction            *action);
 | 
					const GVariantType *    g_action_get_parameter_type                     (GAction            *action);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const GVariantType *    g_action_get_state_type                         (GAction            *action);
 | 
					const GVariantType *    g_action_get_state_type                         (GAction            *action);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GVariant *              g_action_get_state_hint                         (GAction            *action);
 | 
					GVariant *              g_action_get_state_hint                         (GAction            *action);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_action_get_enabled                            (GAction            *action);
 | 
					gboolean                g_action_get_enabled                            (GAction            *action);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GVariant *              g_action_get_state                              (GAction            *action);
 | 
					GVariant *              g_action_get_state                              (GAction            *action);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_action_change_state                           (GAction            *action,
 | 
					void                    g_action_change_state                           (GAction            *action,
 | 
				
			||||||
                                                                         GVariant           *value);
 | 
					                                                                         GVariant           *value);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_action_activate                               (GAction            *action,
 | 
					void                    g_action_activate                               (GAction            *action,
 | 
				
			||||||
                                                                         GVariant           *parameter);
 | 
					                                                                         GVariant           *parameter);
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -96,41 +96,55 @@ struct _GActionGroupInterface
 | 
				
			|||||||
                                                        GVariant           **state);
 | 
					                                                        GVariant           **state);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                   g_action_group_get_type                         (void) G_GNUC_CONST;
 | 
					GType                   g_action_group_get_type                         (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_action_group_has_action                       (GActionGroup *action_group,
 | 
					gboolean                g_action_group_has_action                       (GActionGroup *action_group,
 | 
				
			||||||
                                                                         const gchar  *action_name);
 | 
					                                                                         const gchar  *action_name);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar **                g_action_group_list_actions                     (GActionGroup *action_group);
 | 
					gchar **                g_action_group_list_actions                     (GActionGroup *action_group);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const GVariantType *    g_action_group_get_action_parameter_type        (GActionGroup *action_group,
 | 
					const GVariantType *    g_action_group_get_action_parameter_type        (GActionGroup *action_group,
 | 
				
			||||||
                                                                         const gchar  *action_name);
 | 
					                                                                         const gchar  *action_name);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const GVariantType *    g_action_group_get_action_state_type            (GActionGroup *action_group,
 | 
					const GVariantType *    g_action_group_get_action_state_type            (GActionGroup *action_group,
 | 
				
			||||||
                                                                         const gchar  *action_name);
 | 
					                                                                         const gchar  *action_name);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GVariant *              g_action_group_get_action_state_hint            (GActionGroup *action_group,
 | 
					GVariant *              g_action_group_get_action_state_hint            (GActionGroup *action_group,
 | 
				
			||||||
                                                                         const gchar  *action_name);
 | 
					                                                                         const gchar  *action_name);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_action_group_get_action_enabled               (GActionGroup *action_group,
 | 
					gboolean                g_action_group_get_action_enabled               (GActionGroup *action_group,
 | 
				
			||||||
                                                                         const gchar  *action_name);
 | 
					                                                                         const gchar  *action_name);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GVariant *              g_action_group_get_action_state                 (GActionGroup *action_group,
 | 
					GVariant *              g_action_group_get_action_state                 (GActionGroup *action_group,
 | 
				
			||||||
                                                                         const gchar  *action_name);
 | 
					                                                                         const gchar  *action_name);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_action_group_change_action_state              (GActionGroup *action_group,
 | 
					void                    g_action_group_change_action_state              (GActionGroup *action_group,
 | 
				
			||||||
                                                                         const gchar  *action_name,
 | 
					                                                                         const gchar  *action_name,
 | 
				
			||||||
                                                                         GVariant     *value);
 | 
					                                                                         GVariant     *value);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_action_group_activate_action                  (GActionGroup *action_group,
 | 
					void                    g_action_group_activate_action                  (GActionGroup *action_group,
 | 
				
			||||||
                                                                         const gchar  *action_name,
 | 
					                                                                         const gchar  *action_name,
 | 
				
			||||||
                                                                         GVariant     *parameter);
 | 
					                                                                         GVariant     *parameter);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* signals */
 | 
					/* signals */
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_action_group_action_added                     (GActionGroup *action_group,
 | 
					void                    g_action_group_action_added                     (GActionGroup *action_group,
 | 
				
			||||||
                                                                         const gchar  *action_name);
 | 
					                                                                         const gchar  *action_name);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_action_group_action_removed                   (GActionGroup *action_group,
 | 
					void                    g_action_group_action_removed                   (GActionGroup *action_group,
 | 
				
			||||||
                                                                         const gchar  *action_name);
 | 
					                                                                         const gchar  *action_name);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_action_group_action_enabled_changed           (GActionGroup *action_group,
 | 
					void                    g_action_group_action_enabled_changed           (GActionGroup *action_group,
 | 
				
			||||||
                                                                         const gchar  *action_name,
 | 
					                                                                         const gchar  *action_name,
 | 
				
			||||||
                                                                         gboolean      enabled);
 | 
					                                                                         gboolean      enabled);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_action_group_action_state_changed             (GActionGroup *action_group,
 | 
					void                    g_action_group_action_state_changed             (GActionGroup *action_group,
 | 
				
			||||||
                                                                         const gchar  *action_name,
 | 
					                                                                         const gchar  *action_name,
 | 
				
			||||||
                                                                         GVariant     *state);
 | 
					                                                                         GVariant     *state);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -135,66 +135,98 @@ struct _GAppInfoIface
 | 
				
			|||||||
  const char ** (* get_supported_types)         (GAppInfo           *appinfo);
 | 
					  const char ** (* get_supported_types)         (GAppInfo           *appinfo);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType       g_app_info_get_type                     (void) G_GNUC_CONST;
 | 
					GType       g_app_info_get_type                     (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GAppInfo *  g_app_info_create_from_commandline      (const char           *commandline,
 | 
					GAppInfo *  g_app_info_create_from_commandline      (const char           *commandline,
 | 
				
			||||||
                                                     const char           *application_name,
 | 
					                                                     const char           *application_name,
 | 
				
			||||||
                                                     GAppInfoCreateFlags   flags,
 | 
					                                                     GAppInfoCreateFlags   flags,
 | 
				
			||||||
                                                     GError              **error);
 | 
					                                                     GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GAppInfo *  g_app_info_dup                          (GAppInfo             *appinfo);
 | 
					GAppInfo *  g_app_info_dup                          (GAppInfo             *appinfo);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean    g_app_info_equal                        (GAppInfo             *appinfo1,
 | 
					gboolean    g_app_info_equal                        (GAppInfo             *appinfo1,
 | 
				
			||||||
                                                     GAppInfo             *appinfo2);
 | 
					                                                     GAppInfo             *appinfo2);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const char *g_app_info_get_id                       (GAppInfo             *appinfo);
 | 
					const char *g_app_info_get_id                       (GAppInfo             *appinfo);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const char *g_app_info_get_name                     (GAppInfo             *appinfo);
 | 
					const char *g_app_info_get_name                     (GAppInfo             *appinfo);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const char *g_app_info_get_display_name             (GAppInfo             *appinfo);
 | 
					const char *g_app_info_get_display_name             (GAppInfo             *appinfo);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const char *g_app_info_get_description              (GAppInfo             *appinfo);
 | 
					const char *g_app_info_get_description              (GAppInfo             *appinfo);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const char *g_app_info_get_executable               (GAppInfo             *appinfo);
 | 
					const char *g_app_info_get_executable               (GAppInfo             *appinfo);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const char *g_app_info_get_commandline              (GAppInfo             *appinfo);
 | 
					const char *g_app_info_get_commandline              (GAppInfo             *appinfo);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIcon *     g_app_info_get_icon                     (GAppInfo             *appinfo);
 | 
					GIcon *     g_app_info_get_icon                     (GAppInfo             *appinfo);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean    g_app_info_launch                       (GAppInfo             *appinfo,
 | 
					gboolean    g_app_info_launch                       (GAppInfo             *appinfo,
 | 
				
			||||||
                                                     GList                *files,
 | 
					                                                     GList                *files,
 | 
				
			||||||
                                                     GAppLaunchContext    *launch_context,
 | 
					                                                     GAppLaunchContext    *launch_context,
 | 
				
			||||||
                                                     GError              **error);
 | 
					                                                     GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean    g_app_info_supports_uris                (GAppInfo             *appinfo);
 | 
					gboolean    g_app_info_supports_uris                (GAppInfo             *appinfo);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean    g_app_info_supports_files               (GAppInfo             *appinfo);
 | 
					gboolean    g_app_info_supports_files               (GAppInfo             *appinfo);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean    g_app_info_launch_uris                  (GAppInfo             *appinfo,
 | 
					gboolean    g_app_info_launch_uris                  (GAppInfo             *appinfo,
 | 
				
			||||||
                                                     GList                *uris,
 | 
					                                                     GList                *uris,
 | 
				
			||||||
                                                     GAppLaunchContext    *launch_context,
 | 
					                                                     GAppLaunchContext    *launch_context,
 | 
				
			||||||
                                                     GError              **error);
 | 
					                                                     GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean    g_app_info_should_show                  (GAppInfo             *appinfo);
 | 
					gboolean    g_app_info_should_show                  (GAppInfo             *appinfo);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean    g_app_info_set_as_default_for_type      (GAppInfo             *appinfo,
 | 
					gboolean    g_app_info_set_as_default_for_type      (GAppInfo             *appinfo,
 | 
				
			||||||
                                                     const char           *content_type,
 | 
					                                                     const char           *content_type,
 | 
				
			||||||
                                                     GError              **error);
 | 
					                                                     GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean    g_app_info_set_as_default_for_extension (GAppInfo             *appinfo,
 | 
					gboolean    g_app_info_set_as_default_for_extension (GAppInfo             *appinfo,
 | 
				
			||||||
                                                     const char           *extension,
 | 
					                                                     const char           *extension,
 | 
				
			||||||
                                                     GError              **error);
 | 
					                                                     GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean    g_app_info_add_supports_type            (GAppInfo             *appinfo,
 | 
					gboolean    g_app_info_add_supports_type            (GAppInfo             *appinfo,
 | 
				
			||||||
                                                     const char           *content_type,
 | 
					                                                     const char           *content_type,
 | 
				
			||||||
                                                     GError              **error);
 | 
					                                                     GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean    g_app_info_can_remove_supports_type     (GAppInfo             *appinfo);
 | 
					gboolean    g_app_info_can_remove_supports_type     (GAppInfo             *appinfo);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean    g_app_info_remove_supports_type         (GAppInfo             *appinfo,
 | 
					gboolean    g_app_info_remove_supports_type         (GAppInfo             *appinfo,
 | 
				
			||||||
                                                     const char           *content_type,
 | 
					                                                     const char           *content_type,
 | 
				
			||||||
                                                     GError              **error);
 | 
					                                                     GError              **error);
 | 
				
			||||||
GLIB_AVAILABLE_IN_2_34
 | 
					GLIB_AVAILABLE_IN_2_34
 | 
				
			||||||
const char **g_app_info_get_supported_types         (GAppInfo             *appinfo);
 | 
					const char **g_app_info_get_supported_types         (GAppInfo             *appinfo);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean    g_app_info_can_delete                   (GAppInfo   *appinfo);
 | 
					gboolean    g_app_info_can_delete                   (GAppInfo   *appinfo);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean    g_app_info_delete                       (GAppInfo   *appinfo);
 | 
					gboolean    g_app_info_delete                       (GAppInfo   *appinfo);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean    g_app_info_set_as_last_used_for_type    (GAppInfo             *appinfo,
 | 
					gboolean    g_app_info_set_as_last_used_for_type    (GAppInfo             *appinfo,
 | 
				
			||||||
                                                     const char           *content_type,
 | 
					                                                     const char           *content_type,
 | 
				
			||||||
                                                     GError              **error);
 | 
					                                                     GError              **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GList *   g_app_info_get_all                     (void);
 | 
					GList *   g_app_info_get_all                     (void);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GList *   g_app_info_get_all_for_type            (const char  *content_type);
 | 
					GList *   g_app_info_get_all_for_type            (const char  *content_type);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GList *   g_app_info_get_recommended_for_type    (const gchar *content_type);
 | 
					GList *   g_app_info_get_recommended_for_type    (const gchar *content_type);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GList *   g_app_info_get_fallback_for_type       (const gchar *content_type);
 | 
					GList *   g_app_info_get_fallback_for_type       (const gchar *content_type);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void      g_app_info_reset_type_associations     (const char  *content_type);
 | 
					void      g_app_info_reset_type_associations     (const char  *content_type);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GAppInfo *g_app_info_get_default_for_type        (const char  *content_type,
 | 
					GAppInfo *g_app_info_get_default_for_type        (const char  *content_type,
 | 
				
			||||||
                                                  gboolean     must_support_uris);
 | 
					                                                  gboolean     must_support_uris);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GAppInfo *g_app_info_get_default_for_uri_scheme  (const char  *uri_scheme);
 | 
					GAppInfo *g_app_info_get_default_for_uri_scheme  (const char  *uri_scheme);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean  g_app_info_launch_default_for_uri      (const char              *uri,
 | 
					gboolean  g_app_info_launch_default_for_uri      (const char              *uri,
 | 
				
			||||||
                                                  GAppLaunchContext       *launch_context,
 | 
					                                                  GAppLaunchContext       *launch_context,
 | 
				
			||||||
                                                  GError                 **error);
 | 
					                                                  GError                 **error);
 | 
				
			||||||
@@ -237,7 +269,9 @@ struct _GAppLaunchContextClass
 | 
				
			|||||||
  void (*_g_reserved4) (void);
 | 
					  void (*_g_reserved4) (void);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType              g_app_launch_context_get_type              (void) G_GNUC_CONST;
 | 
					GType              g_app_launch_context_get_type              (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GAppLaunchContext *g_app_launch_context_new                   (void);
 | 
					GAppLaunchContext *g_app_launch_context_new                   (void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GLIB_AVAILABLE_IN_2_32
 | 
					GLIB_AVAILABLE_IN_2_32
 | 
				
			||||||
@@ -250,12 +284,15 @@ void               g_app_launch_context_unsetenv              (GAppLaunchContext
 | 
				
			|||||||
GLIB_AVAILABLE_IN_2_32
 | 
					GLIB_AVAILABLE_IN_2_32
 | 
				
			||||||
char **            g_app_launch_context_get_environment       (GAppLaunchContext *context);
 | 
					char **            g_app_launch_context_get_environment       (GAppLaunchContext *context);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char *             g_app_launch_context_get_display           (GAppLaunchContext *context,
 | 
					char *             g_app_launch_context_get_display           (GAppLaunchContext *context,
 | 
				
			||||||
                                                               GAppInfo          *info,
 | 
					                                                               GAppInfo          *info,
 | 
				
			||||||
                                                               GList             *files);
 | 
					                                                               GList             *files);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char *             g_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
 | 
					char *             g_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
 | 
				
			||||||
                                                               GAppInfo          *info,
 | 
					                                                               GAppInfo          *info,
 | 
				
			||||||
                                                               GList             *files);
 | 
					                                                               GList             *files);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void               g_app_launch_context_launch_failed         (GAppLaunchContext *context,
 | 
					void               g_app_launch_context_launch_failed         (GAppLaunchContext *context,
 | 
				
			||||||
                                                               const char *       startup_notify_id);
 | 
					                                                               const char *       startup_notify_id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -122,14 +122,19 @@ struct _GApplicationClass
 | 
				
			|||||||
  gpointer padding[9];
 | 
					  gpointer padding[9];
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                   g_application_get_type                          (void) G_GNUC_CONST;
 | 
					GType                   g_application_get_type                          (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_application_id_is_valid                       (const gchar              *application_id);
 | 
					gboolean                g_application_id_is_valid                       (const gchar              *application_id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GApplication *          g_application_new                               (const gchar              *application_id,
 | 
					GApplication *          g_application_new                               (const gchar              *application_id,
 | 
				
			||||||
                                                                         GApplicationFlags         flags);
 | 
					                                                                         GApplicationFlags         flags);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar *           g_application_get_application_id                (GApplication             *application);
 | 
					const gchar *           g_application_get_application_id                (GApplication             *application);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_application_set_application_id                (GApplication             *application,
 | 
					void                    g_application_set_application_id                (GApplication             *application,
 | 
				
			||||||
                                                                         const gchar              *application_id);
 | 
					                                                                         const gchar              *application_id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -138,11 +143,15 @@ GDBusConnection *       g_application_get_dbus_connection               (GApplic
 | 
				
			|||||||
GLIB_AVAILABLE_IN_2_34
 | 
					GLIB_AVAILABLE_IN_2_34
 | 
				
			||||||
const gchar *           g_application_get_dbus_object_path              (GApplication             *application);
 | 
					const gchar *           g_application_get_dbus_object_path              (GApplication             *application);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint                   g_application_get_inactivity_timeout            (GApplication             *application);
 | 
					guint                   g_application_get_inactivity_timeout            (GApplication             *application);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_application_set_inactivity_timeout            (GApplication             *application,
 | 
					void                    g_application_set_inactivity_timeout            (GApplication             *application,
 | 
				
			||||||
                                                                         guint                     inactivity_timeout);
 | 
					                                                                         guint                     inactivity_timeout);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GApplicationFlags       g_application_get_flags                         (GApplication             *application);
 | 
					GApplicationFlags       g_application_get_flags                         (GApplication             *application);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_application_set_flags                         (GApplication             *application,
 | 
					void                    g_application_set_flags                         (GApplication             *application,
 | 
				
			||||||
                                                                         GApplicationFlags         flags);
 | 
					                                                                         GApplicationFlags         flags);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -150,23 +159,31 @@ GLIB_DEPRECATED
 | 
				
			|||||||
void                    g_application_set_action_group                  (GApplication             *application,
 | 
					void                    g_application_set_action_group                  (GApplication             *application,
 | 
				
			||||||
                                                                         GActionGroup             *action_group);
 | 
					                                                                         GActionGroup             *action_group);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_application_get_is_registered                 (GApplication             *application);
 | 
					gboolean                g_application_get_is_registered                 (GApplication             *application);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_application_get_is_remote                     (GApplication             *application);
 | 
					gboolean                g_application_get_is_remote                     (GApplication             *application);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_application_register                          (GApplication             *application,
 | 
					gboolean                g_application_register                          (GApplication             *application,
 | 
				
			||||||
                                                                         GCancellable             *cancellable,
 | 
					                                                                         GCancellable             *cancellable,
 | 
				
			||||||
                                                                         GError                  **error);
 | 
					                                                                         GError                  **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_application_hold                              (GApplication             *application);
 | 
					void                    g_application_hold                              (GApplication             *application);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_application_release                           (GApplication             *application);
 | 
					void                    g_application_release                           (GApplication             *application);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_application_activate                          (GApplication             *application);
 | 
					void                    g_application_activate                          (GApplication             *application);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_application_open                              (GApplication             *application,
 | 
					void                    g_application_open                              (GApplication             *application,
 | 
				
			||||||
                                                                         GFile                   **files,
 | 
					                                                                         GFile                   **files,
 | 
				
			||||||
                                                                         gint                      n_files,
 | 
					                                                                         gint                      n_files,
 | 
				
			||||||
                                                                         const gchar              *hint);
 | 
					                                                                         const gchar              *hint);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
int                     g_application_run                               (GApplication             *application,
 | 
					int                     g_application_run                               (GApplication             *application,
 | 
				
			||||||
                                                                         int                       argc,
 | 
					                                                                         int                       argc,
 | 
				
			||||||
                                                                         char                    **argv);
 | 
					                                                                         char                    **argv);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -71,33 +71,44 @@ struct _GApplicationCommandLineClass
 | 
				
			|||||||
  gpointer padding[11];
 | 
					  gpointer padding[11];
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                   g_application_command_line_get_type             (void) G_GNUC_CONST;
 | 
					GType                   g_application_command_line_get_type             (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar **                g_application_command_line_get_arguments        (GApplicationCommandLine   *cmdline,
 | 
					gchar **                g_application_command_line_get_arguments        (GApplicationCommandLine   *cmdline,
 | 
				
			||||||
                                                                         int                       *argc);
 | 
					                                                                         int                       *argc);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GInputStream *          g_application_command_line_get_stdin            (GApplicationCommandLine   *cmdline);
 | 
					GInputStream *          g_application_command_line_get_stdin            (GApplicationCommandLine   *cmdline);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar * const *   g_application_command_line_get_environ          (GApplicationCommandLine   *cmdline);
 | 
					const gchar * const *   g_application_command_line_get_environ          (GApplicationCommandLine   *cmdline);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar *           g_application_command_line_getenv               (GApplicationCommandLine   *cmdline,
 | 
					const gchar *           g_application_command_line_getenv               (GApplicationCommandLine   *cmdline,
 | 
				
			||||||
                                                                         const gchar               *name);
 | 
					                                                                         const gchar               *name);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar *           g_application_command_line_get_cwd              (GApplicationCommandLine   *cmdline);
 | 
					const gchar *           g_application_command_line_get_cwd              (GApplicationCommandLine   *cmdline);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_application_command_line_get_is_remote        (GApplicationCommandLine   *cmdline);
 | 
					gboolean                g_application_command_line_get_is_remote        (GApplicationCommandLine   *cmdline);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_application_command_line_print                (GApplicationCommandLine   *cmdline,
 | 
					void                    g_application_command_line_print                (GApplicationCommandLine   *cmdline,
 | 
				
			||||||
                                                                         const gchar               *format,
 | 
					                                                                         const gchar               *format,
 | 
				
			||||||
                                                                         ...) G_GNUC_PRINTF(2, 3);
 | 
					                                                                         ...) G_GNUC_PRINTF(2, 3);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_application_command_line_printerr             (GApplicationCommandLine   *cmdline,
 | 
					void                    g_application_command_line_printerr             (GApplicationCommandLine   *cmdline,
 | 
				
			||||||
                                                                         const gchar               *format,
 | 
					                                                                         const gchar               *format,
 | 
				
			||||||
                                                                         ...) G_GNUC_PRINTF(2, 3);
 | 
					                                                                         ...) G_GNUC_PRINTF(2, 3);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
int                     g_application_command_line_get_exit_status      (GApplicationCommandLine   *cmdline);
 | 
					int                     g_application_command_line_get_exit_status      (GApplicationCommandLine   *cmdline);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_application_command_line_set_exit_status      (GApplicationCommandLine   *cmdline,
 | 
					void                    g_application_command_line_set_exit_status      (GApplicationCommandLine   *cmdline,
 | 
				
			||||||
                                                                         int                        exit_status);
 | 
					                                                                         int                        exit_status);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GVariant *              g_application_command_line_get_platform_data    (GApplicationCommandLine   *cmdline);
 | 
					GVariant *              g_application_command_line_get_platform_data    (GApplicationCommandLine   *cmdline);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GLIB_AVAILABLE_IN_2_36
 | 
					GLIB_AVAILABLE_IN_2_36
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -74,18 +74,22 @@ struct _GAsyncInitableIface
 | 
				
			|||||||
			    GError             **error);
 | 
								    GError             **error);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType    g_async_initable_get_type    (void) G_GNUC_CONST;
 | 
					GType    g_async_initable_get_type    (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void     g_async_initable_init_async       (GAsyncInitable       *initable,
 | 
					void     g_async_initable_init_async       (GAsyncInitable       *initable,
 | 
				
			||||||
					    int                   io_priority,
 | 
										    int                   io_priority,
 | 
				
			||||||
					    GCancellable         *cancellable,
 | 
										    GCancellable         *cancellable,
 | 
				
			||||||
					    GAsyncReadyCallback   callback,
 | 
										    GAsyncReadyCallback   callback,
 | 
				
			||||||
					    gpointer              user_data);
 | 
										    gpointer              user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_async_initable_init_finish      (GAsyncInitable       *initable,
 | 
					gboolean g_async_initable_init_finish      (GAsyncInitable       *initable,
 | 
				
			||||||
					    GAsyncResult         *res,
 | 
										    GAsyncResult         *res,
 | 
				
			||||||
					    GError              **error);
 | 
										    GError              **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void     g_async_initable_new_async        (GType                 object_type,
 | 
					void     g_async_initable_new_async        (GType                 object_type,
 | 
				
			||||||
					    int                   io_priority,
 | 
										    int                   io_priority,
 | 
				
			||||||
					    GCancellable         *cancellable,
 | 
										    GCancellable         *cancellable,
 | 
				
			||||||
@@ -93,6 +97,7 @@ void     g_async_initable_new_async        (GType                 object_type,
 | 
				
			|||||||
					    gpointer              user_data,
 | 
										    gpointer              user_data,
 | 
				
			||||||
					    const gchar          *first_property_name,
 | 
										    const gchar          *first_property_name,
 | 
				
			||||||
					    ...);
 | 
										    ...);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void     g_async_initable_newv_async       (GType                 object_type,
 | 
					void     g_async_initable_newv_async       (GType                 object_type,
 | 
				
			||||||
					    guint                 n_parameters,
 | 
										    guint                 n_parameters,
 | 
				
			||||||
					    GParameter           *parameters,
 | 
										    GParameter           *parameters,
 | 
				
			||||||
@@ -100,6 +105,7 @@ void     g_async_initable_newv_async       (GType                 object_type,
 | 
				
			|||||||
					    GCancellable         *cancellable,
 | 
										    GCancellable         *cancellable,
 | 
				
			||||||
					    GAsyncReadyCallback   callback,
 | 
										    GAsyncReadyCallback   callback,
 | 
				
			||||||
					    gpointer              user_data);
 | 
										    gpointer              user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void     g_async_initable_new_valist_async (GType                 object_type,
 | 
					void     g_async_initable_new_valist_async (GType                 object_type,
 | 
				
			||||||
					    const gchar          *first_property_name,
 | 
										    const gchar          *first_property_name,
 | 
				
			||||||
					    va_list               var_args,
 | 
										    va_list               var_args,
 | 
				
			||||||
@@ -107,6 +113,7 @@ void     g_async_initable_new_valist_async (GType                 object_type,
 | 
				
			|||||||
					    GCancellable         *cancellable,
 | 
										    GCancellable         *cancellable,
 | 
				
			||||||
					    GAsyncReadyCallback   callback,
 | 
										    GAsyncReadyCallback   callback,
 | 
				
			||||||
					    gpointer              user_data);
 | 
										    gpointer              user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GObject *g_async_initable_new_finish       (GAsyncInitable       *initable,
 | 
					GObject *g_async_initable_new_finish       (GAsyncInitable       *initable,
 | 
				
			||||||
					    GAsyncResult         *res,
 | 
										    GAsyncResult         *res,
 | 
				
			||||||
					    GError              **error);
 | 
										    GError              **error);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -67,9 +67,12 @@ struct _GAsyncResultIface
 | 
				
			|||||||
				   gpointer      tag);
 | 
									   gpointer      tag);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType    g_async_result_get_type          (void) G_GNUC_CONST;
 | 
					GType    g_async_result_get_type          (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gpointer g_async_result_get_user_data     (GAsyncResult *res);
 | 
					gpointer g_async_result_get_user_data     (GAsyncResult *res);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GObject *g_async_result_get_source_object (GAsyncResult *res);
 | 
					GObject *g_async_result_get_source_object (GAsyncResult *res);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GLIB_AVAILABLE_IN_2_34
 | 
					GLIB_AVAILABLE_IN_2_34
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -84,36 +84,48 @@ struct _GBufferedInputStreamClass
 | 
				
			|||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType         g_buffered_input_stream_get_type        (void) G_GNUC_CONST;
 | 
					GType         g_buffered_input_stream_get_type        (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GInputStream* g_buffered_input_stream_new             (GInputStream          *base_stream);
 | 
					GInputStream* g_buffered_input_stream_new             (GInputStream          *base_stream);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GInputStream* g_buffered_input_stream_new_sized       (GInputStream          *base_stream,
 | 
					GInputStream* g_buffered_input_stream_new_sized       (GInputStream          *base_stream,
 | 
				
			||||||
						       gsize                  size);
 | 
											       gsize                  size);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gsize         g_buffered_input_stream_get_buffer_size (GBufferedInputStream  *stream);
 | 
					gsize         g_buffered_input_stream_get_buffer_size (GBufferedInputStream  *stream);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void          g_buffered_input_stream_set_buffer_size (GBufferedInputStream  *stream,
 | 
					void          g_buffered_input_stream_set_buffer_size (GBufferedInputStream  *stream,
 | 
				
			||||||
						       gsize                  size);
 | 
											       gsize                  size);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gsize         g_buffered_input_stream_get_available   (GBufferedInputStream  *stream);
 | 
					gsize         g_buffered_input_stream_get_available   (GBufferedInputStream  *stream);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gsize         g_buffered_input_stream_peek            (GBufferedInputStream  *stream,
 | 
					gsize         g_buffered_input_stream_peek            (GBufferedInputStream  *stream,
 | 
				
			||||||
						       void                  *buffer,
 | 
											       void                  *buffer,
 | 
				
			||||||
						       gsize                  offset,
 | 
											       gsize                  offset,
 | 
				
			||||||
						       gsize                  count);
 | 
											       gsize                  count);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const void*   g_buffered_input_stream_peek_buffer     (GBufferedInputStream  *stream,
 | 
					const void*   g_buffered_input_stream_peek_buffer     (GBufferedInputStream  *stream,
 | 
				
			||||||
						       gsize                 *count);
 | 
											       gsize                 *count);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gssize        g_buffered_input_stream_fill            (GBufferedInputStream  *stream,
 | 
					gssize        g_buffered_input_stream_fill            (GBufferedInputStream  *stream,
 | 
				
			||||||
						       gssize                 count,
 | 
											       gssize                 count,
 | 
				
			||||||
						       GCancellable          *cancellable,
 | 
											       GCancellable          *cancellable,
 | 
				
			||||||
						       GError               **error);
 | 
											       GError               **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void          g_buffered_input_stream_fill_async      (GBufferedInputStream  *stream,
 | 
					void          g_buffered_input_stream_fill_async      (GBufferedInputStream  *stream,
 | 
				
			||||||
						       gssize                 count,
 | 
											       gssize                 count,
 | 
				
			||||||
						       int                    io_priority,
 | 
											       int                    io_priority,
 | 
				
			||||||
						       GCancellable          *cancellable,
 | 
											       GCancellable          *cancellable,
 | 
				
			||||||
						       GAsyncReadyCallback    callback,
 | 
											       GAsyncReadyCallback    callback,
 | 
				
			||||||
						       gpointer               user_data);
 | 
											       gpointer               user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gssize        g_buffered_input_stream_fill_finish     (GBufferedInputStream  *stream,
 | 
					gssize        g_buffered_input_stream_fill_finish     (GBufferedInputStream  *stream,
 | 
				
			||||||
						       GAsyncResult          *result,
 | 
											       GAsyncResult          *result,
 | 
				
			||||||
						       GError               **error);
 | 
											       GError               **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
int           g_buffered_input_stream_read_byte       (GBufferedInputStream  *stream,
 | 
					int           g_buffered_input_stream_read_byte       (GBufferedInputStream  *stream,
 | 
				
			||||||
						       GCancellable          *cancellable,
 | 
											       GCancellable          *cancellable,
 | 
				
			||||||
						       GError               **error);
 | 
											       GError               **error);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -65,14 +65,21 @@ struct _GBufferedOutputStreamClass
 | 
				
			|||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType          g_buffered_output_stream_get_type        (void) G_GNUC_CONST;
 | 
					GType          g_buffered_output_stream_get_type        (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GOutputStream* g_buffered_output_stream_new             (GOutputStream         *base_stream);
 | 
					GOutputStream* g_buffered_output_stream_new             (GOutputStream         *base_stream);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GOutputStream* g_buffered_output_stream_new_sized       (GOutputStream         *base_stream,
 | 
					GOutputStream* g_buffered_output_stream_new_sized       (GOutputStream         *base_stream,
 | 
				
			||||||
							 gsize                  size);
 | 
												 gsize                  size);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gsize          g_buffered_output_stream_get_buffer_size (GBufferedOutputStream *stream);
 | 
					gsize          g_buffered_output_stream_get_buffer_size (GBufferedOutputStream *stream);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void           g_buffered_output_stream_set_buffer_size (GBufferedOutputStream *stream,
 | 
					void           g_buffered_output_stream_set_buffer_size (GBufferedOutputStream *stream,
 | 
				
			||||||
							 gsize                  size);
 | 
												 gsize                  size);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean       g_buffered_output_stream_get_auto_grow   (GBufferedOutputStream *stream);
 | 
					gboolean       g_buffered_output_stream_get_auto_grow   (GBufferedOutputStream *stream);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void           g_buffered_output_stream_set_auto_grow   (GBufferedOutputStream *stream,
 | 
					void           g_buffered_output_stream_set_auto_grow   (GBufferedOutputStream *stream,
 | 
				
			||||||
							 gboolean               auto_grow);
 | 
												 gboolean               auto_grow);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -69,35 +69,50 @@ struct _GCancellableClass
 | 
				
			|||||||
  void (*_g_reserved5) (void);
 | 
					  void (*_g_reserved5) (void);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType         g_cancellable_get_type               (void) G_GNUC_CONST;
 | 
					GType         g_cancellable_get_type               (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GCancellable *g_cancellable_new                    (void);
 | 
					GCancellable *g_cancellable_new                    (void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* These are only safe to call inside a cancellable op */
 | 
					/* These are only safe to call inside a cancellable op */
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean      g_cancellable_is_cancelled           (GCancellable  *cancellable);
 | 
					gboolean      g_cancellable_is_cancelled           (GCancellable  *cancellable);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean      g_cancellable_set_error_if_cancelled (GCancellable  *cancellable,
 | 
					gboolean      g_cancellable_set_error_if_cancelled (GCancellable  *cancellable,
 | 
				
			||||||
						    GError       **error);
 | 
											    GError       **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
int           g_cancellable_get_fd                 (GCancellable  *cancellable);
 | 
					int           g_cancellable_get_fd                 (GCancellable  *cancellable);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean      g_cancellable_make_pollfd            (GCancellable  *cancellable,
 | 
					gboolean      g_cancellable_make_pollfd            (GCancellable  *cancellable,
 | 
				
			||||||
						    GPollFD       *pollfd);
 | 
											    GPollFD       *pollfd);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void          g_cancellable_release_fd             (GCancellable  *cancellable);
 | 
					void          g_cancellable_release_fd             (GCancellable  *cancellable);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSource *     g_cancellable_source_new             (GCancellable  *cancellable);
 | 
					GSource *     g_cancellable_source_new             (GCancellable  *cancellable);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GCancellable *g_cancellable_get_current            (void);
 | 
					GCancellable *g_cancellable_get_current            (void);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void          g_cancellable_push_current           (GCancellable  *cancellable);
 | 
					void          g_cancellable_push_current           (GCancellable  *cancellable);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void          g_cancellable_pop_current            (GCancellable  *cancellable);
 | 
					void          g_cancellable_pop_current            (GCancellable  *cancellable);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void          g_cancellable_reset                  (GCancellable  *cancellable);
 | 
					void          g_cancellable_reset                  (GCancellable  *cancellable);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gulong        g_cancellable_connect                (GCancellable  *cancellable,
 | 
					gulong        g_cancellable_connect                (GCancellable  *cancellable,
 | 
				
			||||||
						    GCallback      callback,
 | 
											    GCallback      callback,
 | 
				
			||||||
						    gpointer       data,
 | 
											    gpointer       data,
 | 
				
			||||||
						    GDestroyNotify data_destroy_func);
 | 
											    GDestroyNotify data_destroy_func);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void          g_cancellable_disconnect             (GCancellable  *cancellable,
 | 
					void          g_cancellable_disconnect             (GCancellable  *cancellable,
 | 
				
			||||||
						    gulong         handler_id);
 | 
											    gulong         handler_id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* This is safe to call from another thread */
 | 
					/* This is safe to call from another thread */
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void          g_cancellable_cancel       (GCancellable  *cancellable);
 | 
					void          g_cancellable_cancel       (GCancellable  *cancellable);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -45,14 +45,19 @@ struct _GCharsetConverterClass
 | 
				
			|||||||
  GObjectClass parent_class;
 | 
					  GObjectClass parent_class;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType              g_charset_converter_get_type      (void) G_GNUC_CONST;
 | 
					GType              g_charset_converter_get_type      (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GCharsetConverter *g_charset_converter_new            (const gchar  *to_charset,
 | 
					GCharsetConverter *g_charset_converter_new            (const gchar  *to_charset,
 | 
				
			||||||
						       const gchar  *from_charset,
 | 
											       const gchar  *from_charset,
 | 
				
			||||||
						       GError **error);
 | 
											       GError **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void               g_charset_converter_set_use_fallback (GCharsetConverter *converter,
 | 
					void               g_charset_converter_set_use_fallback (GCharsetConverter *converter,
 | 
				
			||||||
							 gboolean use_fallback);
 | 
												 gboolean use_fallback);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean           g_charset_converter_get_use_fallback (GCharsetConverter *converter);
 | 
					gboolean           g_charset_converter_get_use_fallback (GCharsetConverter *converter);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint              g_charset_converter_get_num_fallbacks (GCharsetConverter *converter);
 | 
					guint              g_charset_converter_get_num_fallbacks (GCharsetConverter *converter);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -31,30 +31,41 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
G_BEGIN_DECLS
 | 
					G_BEGIN_DECLS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_content_type_equals            (const gchar  *type1,
 | 
					gboolean g_content_type_equals            (const gchar  *type1,
 | 
				
			||||||
                                           const gchar  *type2);
 | 
					                                           const gchar  *type2);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_content_type_is_a              (const gchar  *type,
 | 
					gboolean g_content_type_is_a              (const gchar  *type,
 | 
				
			||||||
                                           const gchar  *supertype);
 | 
					                                           const gchar  *supertype);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_content_type_is_unknown        (const gchar  *type);
 | 
					gboolean g_content_type_is_unknown        (const gchar  *type);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar *  g_content_type_get_description   (const gchar  *type);
 | 
					gchar *  g_content_type_get_description   (const gchar  *type);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar *  g_content_type_get_mime_type     (const gchar  *type);
 | 
					gchar *  g_content_type_get_mime_type     (const gchar  *type);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIcon *  g_content_type_get_icon          (const gchar  *type);
 | 
					GIcon *  g_content_type_get_icon          (const gchar  *type);
 | 
				
			||||||
GLIB_AVAILABLE_IN_2_34
 | 
					GLIB_AVAILABLE_IN_2_34
 | 
				
			||||||
GIcon *  g_content_type_get_symbolic_icon (const gchar  *type);
 | 
					GIcon *  g_content_type_get_symbolic_icon (const gchar  *type);
 | 
				
			||||||
GLIB_AVAILABLE_IN_2_34
 | 
					GLIB_AVAILABLE_IN_2_34
 | 
				
			||||||
gchar *  g_content_type_get_generic_icon_name (const gchar  *type);
 | 
					gchar *  g_content_type_get_generic_icon_name (const gchar  *type);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_content_type_can_be_executable (const gchar  *type);
 | 
					gboolean g_content_type_can_be_executable (const gchar  *type);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar *  g_content_type_from_mime_type    (const gchar  *mime_type);
 | 
					gchar *  g_content_type_from_mime_type    (const gchar  *mime_type);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar *  g_content_type_guess             (const gchar  *filename,
 | 
					gchar *  g_content_type_guess             (const gchar  *filename,
 | 
				
			||||||
                                           const guchar *data,
 | 
					                                           const guchar *data,
 | 
				
			||||||
                                           gsize         data_size,
 | 
					                                           gsize         data_size,
 | 
				
			||||||
                                           gboolean     *result_uncertain);
 | 
					                                           gboolean     *result_uncertain);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar ** g_content_type_guess_for_tree    (GFile        *root);
 | 
					gchar ** g_content_type_guess_for_tree    (GFile        *root);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GList *  g_content_types_get_registered   (void);
 | 
					GList *  g_content_types_get_registered   (void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -75,8 +75,10 @@ struct _GConverterIface
 | 
				
			|||||||
  void  (* reset)   (GConverter *converter);
 | 
					  void  (* reset)   (GConverter *converter);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType            g_converter_get_type     (void) G_GNUC_CONST;
 | 
					GType            g_converter_get_type     (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GConverterResult g_converter_convert (GConverter       *converter,
 | 
					GConverterResult g_converter_convert (GConverter       *converter,
 | 
				
			||||||
				      const void       *inbuf,
 | 
									      const void       *inbuf,
 | 
				
			||||||
				      gsize             inbuf_size,
 | 
									      gsize             inbuf_size,
 | 
				
			||||||
@@ -86,6 +88,7 @@ GConverterResult g_converter_convert (GConverter       *converter,
 | 
				
			|||||||
				      gsize            *bytes_read,
 | 
									      gsize            *bytes_read,
 | 
				
			||||||
				      gsize            *bytes_written,
 | 
									      gsize            *bytes_written,
 | 
				
			||||||
				      GError          **error);
 | 
									      GError          **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void             g_converter_reset   (GConverter       *converter);
 | 
					void             g_converter_reset   (GConverter       *converter);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -69,9 +69,12 @@ struct _GConverterInputStreamClass
 | 
				
			|||||||
  void (*_g_reserved5) (void);
 | 
					  void (*_g_reserved5) (void);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                  g_converter_input_stream_get_type      (void) G_GNUC_CONST;
 | 
					GType                  g_converter_input_stream_get_type      (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GInputStream          *g_converter_input_stream_new           (GInputStream          *base_stream,
 | 
					GInputStream          *g_converter_input_stream_new           (GInputStream          *base_stream,
 | 
				
			||||||
                                                               GConverter            *converter);
 | 
					                                                               GConverter            *converter);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GConverter            *g_converter_input_stream_get_converter (GConverterInputStream *converter_stream);
 | 
					GConverter            *g_converter_input_stream_get_converter (GConverterInputStream *converter_stream);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -69,9 +69,12 @@ struct _GConverterOutputStreamClass
 | 
				
			|||||||
  void (*_g_reserved5) (void);
 | 
					  void (*_g_reserved5) (void);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                   g_converter_output_stream_get_type      (void) G_GNUC_CONST;
 | 
					GType                   g_converter_output_stream_get_type      (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GOutputStream          *g_converter_output_stream_new           (GOutputStream         *base_stream,
 | 
					GOutputStream          *g_converter_output_stream_new           (GOutputStream         *base_stream,
 | 
				
			||||||
                                                                 GConverter            *converter);
 | 
					                                                                 GConverter            *converter);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GConverter             *g_converter_output_stream_get_converter (GConverterOutputStream *converter_stream);
 | 
					GConverter             *g_converter_output_stream_get_converter (GConverterOutputStream *converter_stream);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -46,19 +46,25 @@ G_BEGIN_DECLS
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
typedef struct _GCredentialsClass   GCredentialsClass;
 | 
					typedef struct _GCredentialsClass   GCredentialsClass;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType            g_credentials_get_type           (void) G_GNUC_CONST;
 | 
					GType            g_credentials_get_type           (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GCredentials    *g_credentials_new                (void);
 | 
					GCredentials    *g_credentials_new                (void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar           *g_credentials_to_string          (GCredentials    *credentials);
 | 
					gchar           *g_credentials_to_string          (GCredentials    *credentials);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gpointer         g_credentials_get_native         (GCredentials    *credentials,
 | 
					gpointer         g_credentials_get_native         (GCredentials    *credentials,
 | 
				
			||||||
                                                   GCredentialsType native_type);
 | 
					                                                   GCredentialsType native_type);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void             g_credentials_set_native         (GCredentials    *credentials,
 | 
					void             g_credentials_set_native         (GCredentials    *credentials,
 | 
				
			||||||
                                                   GCredentialsType native_type,
 | 
					                                                   GCredentialsType native_type,
 | 
				
			||||||
                                                   gpointer         native);
 | 
					                                                   gpointer         native);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean         g_credentials_is_same_user       (GCredentials    *credentials,
 | 
					gboolean         g_credentials_is_same_user       (GCredentials    *credentials,
 | 
				
			||||||
                                                   GCredentials    *other_credentials,
 | 
					                                                   GCredentials    *other_credentials,
 | 
				
			||||||
                                                   GError         **error);
 | 
					                                                   GError         **error);
 | 
				
			||||||
@@ -67,8 +73,10 @@ gboolean         g_credentials_is_same_user       (GCredentials    *credentials,
 | 
				
			|||||||
GLIB_AVAILABLE_IN_2_36
 | 
					GLIB_AVAILABLE_IN_2_36
 | 
				
			||||||
pid_t            g_credentials_get_unix_pid       (GCredentials    *credentials,
 | 
					pid_t            g_credentials_get_unix_pid       (GCredentials    *credentials,
 | 
				
			||||||
                                                   GError         **error);
 | 
					                                                   GError         **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
uid_t            g_credentials_get_unix_user      (GCredentials    *credentials,
 | 
					uid_t            g_credentials_get_unix_user      (GCredentials    *credentials,
 | 
				
			||||||
                                                   GError         **error);
 | 
					                                                   GError         **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean         g_credentials_set_unix_user      (GCredentials    *credentials,
 | 
					gboolean         g_credentials_set_unix_user      (GCredentials    *credentials,
 | 
				
			||||||
                                                   uid_t           uid,
 | 
					                                                   uid_t           uid,
 | 
				
			||||||
                                                   GError         **error);
 | 
					                                                   GError         **error);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -68,36 +68,50 @@ struct _GDataInputStreamClass
 | 
				
			|||||||
  void (*_g_reserved5) (void);
 | 
					  void (*_g_reserved5) (void);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                  g_data_input_stream_get_type             (void) G_GNUC_CONST;
 | 
					GType                  g_data_input_stream_get_type             (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDataInputStream *     g_data_input_stream_new                  (GInputStream            *base_stream);
 | 
					GDataInputStream *     g_data_input_stream_new                  (GInputStream            *base_stream);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                   g_data_input_stream_set_byte_order       (GDataInputStream        *stream,
 | 
					void                   g_data_input_stream_set_byte_order       (GDataInputStream        *stream,
 | 
				
			||||||
                                                                 GDataStreamByteOrder     order);
 | 
					                                                                 GDataStreamByteOrder     order);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDataStreamByteOrder   g_data_input_stream_get_byte_order       (GDataInputStream        *stream);
 | 
					GDataStreamByteOrder   g_data_input_stream_get_byte_order       (GDataInputStream        *stream);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                   g_data_input_stream_set_newline_type     (GDataInputStream        *stream,
 | 
					void                   g_data_input_stream_set_newline_type     (GDataInputStream        *stream,
 | 
				
			||||||
                                                                 GDataStreamNewlineType   type);
 | 
					                                                                 GDataStreamNewlineType   type);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDataStreamNewlineType g_data_input_stream_get_newline_type     (GDataInputStream        *stream);
 | 
					GDataStreamNewlineType g_data_input_stream_get_newline_type     (GDataInputStream        *stream);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guchar                 g_data_input_stream_read_byte            (GDataInputStream        *stream,
 | 
					guchar                 g_data_input_stream_read_byte            (GDataInputStream        *stream,
 | 
				
			||||||
                                                                 GCancellable            *cancellable,
 | 
					                                                                 GCancellable            *cancellable,
 | 
				
			||||||
                                                                 GError                 **error);
 | 
					                                                                 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gint16                 g_data_input_stream_read_int16           (GDataInputStream        *stream,
 | 
					gint16                 g_data_input_stream_read_int16           (GDataInputStream        *stream,
 | 
				
			||||||
                                                                 GCancellable            *cancellable,
 | 
					                                                                 GCancellable            *cancellable,
 | 
				
			||||||
                                                                 GError                 **error);
 | 
					                                                                 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint16                g_data_input_stream_read_uint16          (GDataInputStream        *stream,
 | 
					guint16                g_data_input_stream_read_uint16          (GDataInputStream        *stream,
 | 
				
			||||||
                                                                 GCancellable            *cancellable,
 | 
					                                                                 GCancellable            *cancellable,
 | 
				
			||||||
                                                                 GError                 **error);
 | 
					                                                                 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gint32                 g_data_input_stream_read_int32           (GDataInputStream        *stream,
 | 
					gint32                 g_data_input_stream_read_int32           (GDataInputStream        *stream,
 | 
				
			||||||
                                                                 GCancellable            *cancellable,
 | 
					                                                                 GCancellable            *cancellable,
 | 
				
			||||||
                                                                 GError                 **error);
 | 
					                                                                 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint32                g_data_input_stream_read_uint32          (GDataInputStream        *stream,
 | 
					guint32                g_data_input_stream_read_uint32          (GDataInputStream        *stream,
 | 
				
			||||||
                                                                 GCancellable            *cancellable,
 | 
					                                                                 GCancellable            *cancellable,
 | 
				
			||||||
                                                                 GError                 **error);
 | 
					                                                                 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gint64                 g_data_input_stream_read_int64           (GDataInputStream        *stream,
 | 
					gint64                 g_data_input_stream_read_int64           (GDataInputStream        *stream,
 | 
				
			||||||
                                                                 GCancellable            *cancellable,
 | 
					                                                                 GCancellable            *cancellable,
 | 
				
			||||||
                                                                 GError                 **error);
 | 
					                                                                 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint64                g_data_input_stream_read_uint64          (GDataInputStream        *stream,
 | 
					guint64                g_data_input_stream_read_uint64          (GDataInputStream        *stream,
 | 
				
			||||||
                                                                 GCancellable            *cancellable,
 | 
					                                                                 GCancellable            *cancellable,
 | 
				
			||||||
                                                                 GError                 **error);
 | 
					                                                                 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char *                 g_data_input_stream_read_line            (GDataInputStream        *stream,
 | 
					char *                 g_data_input_stream_read_line            (GDataInputStream        *stream,
 | 
				
			||||||
                                                                 gsize                   *length,
 | 
					                                                                 gsize                   *length,
 | 
				
			||||||
                                                                 GCancellable            *cancellable,
 | 
					                                                                 GCancellable            *cancellable,
 | 
				
			||||||
@@ -107,11 +121,13 @@ char *                 g_data_input_stream_read_line_utf8       (GDataInputStrea
 | 
				
			|||||||
								 gsize                   *length,
 | 
													 gsize                   *length,
 | 
				
			||||||
								 GCancellable            *cancellable,
 | 
													 GCancellable            *cancellable,
 | 
				
			||||||
								 GError                 **error);
 | 
													 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                   g_data_input_stream_read_line_async      (GDataInputStream        *stream,
 | 
					void                   g_data_input_stream_read_line_async      (GDataInputStream        *stream,
 | 
				
			||||||
                                                                 gint                     io_priority,
 | 
					                                                                 gint                     io_priority,
 | 
				
			||||||
                                                                 GCancellable            *cancellable,
 | 
					                                                                 GCancellable            *cancellable,
 | 
				
			||||||
                                                                 GAsyncReadyCallback      callback,
 | 
					                                                                 GAsyncReadyCallback      callback,
 | 
				
			||||||
                                                                 gpointer                 user_data);
 | 
					                                                                 gpointer                 user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char *                 g_data_input_stream_read_line_finish     (GDataInputStream        *stream,
 | 
					char *                 g_data_input_stream_read_line_finish     (GDataInputStream        *stream,
 | 
				
			||||||
                                                                 GAsyncResult            *result,
 | 
					                                                                 GAsyncResult            *result,
 | 
				
			||||||
                                                                 gsize                   *length,
 | 
					                                                                 gsize                   *length,
 | 
				
			||||||
@@ -121,28 +137,33 @@ char *                 g_data_input_stream_read_line_finish_utf8(GDataInputStrea
 | 
				
			|||||||
                                                                 GAsyncResult            *result,
 | 
					                                                                 GAsyncResult            *result,
 | 
				
			||||||
                                                                 gsize                   *length,
 | 
					                                                                 gsize                   *length,
 | 
				
			||||||
                                                                 GError                 **error);
 | 
					                                                                 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char *                 g_data_input_stream_read_until           (GDataInputStream        *stream,
 | 
					char *                 g_data_input_stream_read_until           (GDataInputStream        *stream,
 | 
				
			||||||
                                                                 const gchar             *stop_chars,
 | 
					                                                                 const gchar             *stop_chars,
 | 
				
			||||||
                                                                 gsize                   *length,
 | 
					                                                                 gsize                   *length,
 | 
				
			||||||
                                                                 GCancellable            *cancellable,
 | 
					                                                                 GCancellable            *cancellable,
 | 
				
			||||||
                                                                 GError                 **error);
 | 
					                                                                 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                   g_data_input_stream_read_until_async     (GDataInputStream        *stream,
 | 
					void                   g_data_input_stream_read_until_async     (GDataInputStream        *stream,
 | 
				
			||||||
                                                                 const gchar             *stop_chars,
 | 
					                                                                 const gchar             *stop_chars,
 | 
				
			||||||
                                                                 gint                     io_priority,
 | 
					                                                                 gint                     io_priority,
 | 
				
			||||||
                                                                 GCancellable            *cancellable,
 | 
					                                                                 GCancellable            *cancellable,
 | 
				
			||||||
                                                                 GAsyncReadyCallback      callback,
 | 
					                                                                 GAsyncReadyCallback      callback,
 | 
				
			||||||
                                                                 gpointer                 user_data);
 | 
					                                                                 gpointer                 user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char *                 g_data_input_stream_read_until_finish    (GDataInputStream        *stream,
 | 
					char *                 g_data_input_stream_read_until_finish    (GDataInputStream        *stream,
 | 
				
			||||||
                                                                 GAsyncResult            *result,
 | 
					                                                                 GAsyncResult            *result,
 | 
				
			||||||
                                                                 gsize                   *length,
 | 
					                                                                 gsize                   *length,
 | 
				
			||||||
                                                                 GError                 **error);
 | 
					                                                                 GError                 **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char *                 g_data_input_stream_read_upto            (GDataInputStream        *stream,
 | 
					char *                 g_data_input_stream_read_upto            (GDataInputStream        *stream,
 | 
				
			||||||
                                                                 const gchar             *stop_chars,
 | 
					                                                                 const gchar             *stop_chars,
 | 
				
			||||||
                                                                 gssize                   stop_chars_len,
 | 
					                                                                 gssize                   stop_chars_len,
 | 
				
			||||||
                                                                 gsize                   *length,
 | 
					                                                                 gsize                   *length,
 | 
				
			||||||
                                                                 GCancellable            *cancellable,
 | 
					                                                                 GCancellable            *cancellable,
 | 
				
			||||||
                                                                 GError                 **error);
 | 
					                                                                 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                   g_data_input_stream_read_upto_async      (GDataInputStream        *stream,
 | 
					void                   g_data_input_stream_read_upto_async      (GDataInputStream        *stream,
 | 
				
			||||||
                                                                 const gchar             *stop_chars,
 | 
					                                                                 const gchar             *stop_chars,
 | 
				
			||||||
                                                                 gssize                   stop_chars_len,
 | 
					                                                                 gssize                   stop_chars_len,
 | 
				
			||||||
@@ -150,6 +171,7 @@ void                   g_data_input_stream_read_upto_async      (GDataInputStrea
 | 
				
			|||||||
                                                                 GCancellable            *cancellable,
 | 
					                                                                 GCancellable            *cancellable,
 | 
				
			||||||
                                                                 GAsyncReadyCallback      callback,
 | 
					                                                                 GAsyncReadyCallback      callback,
 | 
				
			||||||
                                                                 gpointer                 user_data);
 | 
					                                                                 gpointer                 user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char *                 g_data_input_stream_read_upto_finish     (GDataInputStream        *stream,
 | 
					char *                 g_data_input_stream_read_upto_finish     (GDataInputStream        *stream,
 | 
				
			||||||
                                                                 GAsyncResult            *result,
 | 
					                                                                 GAsyncResult            *result,
 | 
				
			||||||
                                                                 gsize                   *length,
 | 
					                                                                 gsize                   *length,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -70,41 +70,53 @@ struct _GDataOutputStreamClass
 | 
				
			|||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                g_data_output_stream_get_type       (void) G_GNUC_CONST;
 | 
					GType                g_data_output_stream_get_type       (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDataOutputStream *  g_data_output_stream_new            (GOutputStream         *base_stream);
 | 
					GDataOutputStream *  g_data_output_stream_new            (GOutputStream         *base_stream);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                 g_data_output_stream_set_byte_order (GDataOutputStream     *stream,
 | 
					void                 g_data_output_stream_set_byte_order (GDataOutputStream     *stream,
 | 
				
			||||||
							  GDataStreamByteOrder   order);
 | 
												  GDataStreamByteOrder   order);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDataStreamByteOrder g_data_output_stream_get_byte_order (GDataOutputStream     *stream);
 | 
					GDataStreamByteOrder g_data_output_stream_get_byte_order (GDataOutputStream     *stream);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean             g_data_output_stream_put_byte       (GDataOutputStream     *stream,
 | 
					gboolean             g_data_output_stream_put_byte       (GDataOutputStream     *stream,
 | 
				
			||||||
							  guchar                 data,
 | 
												  guchar                 data,
 | 
				
			||||||
							  GCancellable          *cancellable,
 | 
												  GCancellable          *cancellable,
 | 
				
			||||||
							  GError               **error);
 | 
												  GError               **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean             g_data_output_stream_put_int16      (GDataOutputStream     *stream,
 | 
					gboolean             g_data_output_stream_put_int16      (GDataOutputStream     *stream,
 | 
				
			||||||
							  gint16                 data,
 | 
												  gint16                 data,
 | 
				
			||||||
							  GCancellable          *cancellable,
 | 
												  GCancellable          *cancellable,
 | 
				
			||||||
							  GError               **error);
 | 
												  GError               **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean             g_data_output_stream_put_uint16     (GDataOutputStream     *stream,
 | 
					gboolean             g_data_output_stream_put_uint16     (GDataOutputStream     *stream,
 | 
				
			||||||
							  guint16                data,
 | 
												  guint16                data,
 | 
				
			||||||
							  GCancellable          *cancellable,
 | 
												  GCancellable          *cancellable,
 | 
				
			||||||
							  GError               **error);
 | 
												  GError               **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean             g_data_output_stream_put_int32      (GDataOutputStream     *stream,
 | 
					gboolean             g_data_output_stream_put_int32      (GDataOutputStream     *stream,
 | 
				
			||||||
							  gint32                 data,
 | 
												  gint32                 data,
 | 
				
			||||||
							  GCancellable          *cancellable,
 | 
												  GCancellable          *cancellable,
 | 
				
			||||||
							  GError               **error);
 | 
												  GError               **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean             g_data_output_stream_put_uint32     (GDataOutputStream     *stream,
 | 
					gboolean             g_data_output_stream_put_uint32     (GDataOutputStream     *stream,
 | 
				
			||||||
							  guint32                data,
 | 
												  guint32                data,
 | 
				
			||||||
							  GCancellable          *cancellable,
 | 
												  GCancellable          *cancellable,
 | 
				
			||||||
							  GError               **error);
 | 
												  GError               **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean             g_data_output_stream_put_int64      (GDataOutputStream     *stream,
 | 
					gboolean             g_data_output_stream_put_int64      (GDataOutputStream     *stream,
 | 
				
			||||||
							  gint64                 data,
 | 
												  gint64                 data,
 | 
				
			||||||
							  GCancellable          *cancellable,
 | 
												  GCancellable          *cancellable,
 | 
				
			||||||
							  GError               **error);
 | 
												  GError               **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean             g_data_output_stream_put_uint64     (GDataOutputStream     *stream,
 | 
					gboolean             g_data_output_stream_put_uint64     (GDataOutputStream     *stream,
 | 
				
			||||||
							  guint64                data,
 | 
												  guint64                data,
 | 
				
			||||||
							  GCancellable          *cancellable,
 | 
												  GCancellable          *cancellable,
 | 
				
			||||||
							  GError               **error);
 | 
												  GError               **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean             g_data_output_stream_put_string     (GDataOutputStream     *stream,
 | 
					gboolean             g_data_output_stream_put_string     (GDataOutputStream     *stream,
 | 
				
			||||||
							  const char            *str,
 | 
												  const char            *str,
 | 
				
			||||||
							  GCancellable          *cancellable,
 | 
												  GCancellable          *cancellable,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -43,6 +43,7 @@ G_BEGIN_DECLS
 | 
				
			|||||||
#define G_DBUS_ACTION_GROUP_GET_CLASS(inst)                 (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
 | 
					#define G_DBUS_ACTION_GROUP_GET_CLASS(inst)                 (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
 | 
				
			||||||
                                                             G_TYPE_DBUS_ACTION_GROUP, GDBusActionGroupClass))
 | 
					                                                             G_TYPE_DBUS_ACTION_GROUP, GDBusActionGroupClass))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                   g_dbus_action_group_get_type                  (void) G_GNUC_CONST;
 | 
					GType                   g_dbus_action_group_get_type                  (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GLIB_AVAILABLE_IN_2_32
 | 
					GLIB_AVAILABLE_IN_2_32
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -31,24 +31,30 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
G_BEGIN_DECLS
 | 
					G_BEGIN_DECLS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_dbus_is_address (const gchar *string);
 | 
					gboolean g_dbus_is_address (const gchar *string);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_dbus_is_supported_address (const gchar  *string,
 | 
					gboolean g_dbus_is_supported_address (const gchar  *string,
 | 
				
			||||||
                                      GError      **error);
 | 
					                                      GError      **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                 g_dbus_address_get_stream        (const gchar          *address,
 | 
					void                 g_dbus_address_get_stream        (const gchar          *address,
 | 
				
			||||||
                                                       GCancellable         *cancellable,
 | 
					                                                       GCancellable         *cancellable,
 | 
				
			||||||
                                                       GAsyncReadyCallback   callback,
 | 
					                                                       GAsyncReadyCallback   callback,
 | 
				
			||||||
                                                       gpointer              user_data);
 | 
					                                                       gpointer              user_data);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIOStream           *g_dbus_address_get_stream_finish (GAsyncResult         *res,
 | 
					GIOStream           *g_dbus_address_get_stream_finish (GAsyncResult         *res,
 | 
				
			||||||
                                                       gchar               **out_guid,
 | 
					                                                       gchar               **out_guid,
 | 
				
			||||||
                                                       GError              **error);
 | 
					                                                       GError              **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIOStream           *g_dbus_address_get_stream_sync   (const gchar          *address,
 | 
					GIOStream           *g_dbus_address_get_stream_sync   (const gchar          *address,
 | 
				
			||||||
                                                       gchar               **out_guid,
 | 
					                                                       gchar               **out_guid,
 | 
				
			||||||
                                                       GCancellable         *cancellable,
 | 
					                                                       GCancellable         *cancellable,
 | 
				
			||||||
                                                       GError              **error);
 | 
					                                                       GError              **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar               *g_dbus_address_get_for_bus_sync  (GBusType              bus_type,
 | 
					gchar               *g_dbus_address_get_for_bus_sync  (GBusType              bus_type,
 | 
				
			||||||
                                                       GCancellable  *cancellable,
 | 
					                                                       GCancellable  *cancellable,
 | 
				
			||||||
                                                       GError              **error);
 | 
					                                                       GError              **error);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -35,8 +35,11 @@ G_BEGIN_DECLS
 | 
				
			|||||||
#define G_DBUS_AUTH_OBSERVER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_AUTH_OBSERVER, GDBusAuthObserver))
 | 
					#define G_DBUS_AUTH_OBSERVER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_AUTH_OBSERVER, GDBusAuthObserver))
 | 
				
			||||||
#define G_IS_DBUS_AUTH_OBSERVER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_AUTH_OBSERVER))
 | 
					#define G_IS_DBUS_AUTH_OBSERVER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_AUTH_OBSERVER))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType              g_dbus_auth_observer_get_type                     (void) G_GNUC_CONST;
 | 
					GType              g_dbus_auth_observer_get_type                     (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusAuthObserver *g_dbus_auth_observer_new                          (void);
 | 
					GDBusAuthObserver *g_dbus_auth_observer_new                          (void);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean           g_dbus_auth_observer_authorize_authenticated_peer (GDBusAuthObserver  *observer,
 | 
					gboolean           g_dbus_auth_observer_authorize_authenticated_peer (GDBusAuthObserver  *observer,
 | 
				
			||||||
                                                                      GIOStream          *stream,
 | 
					                                                                      GIOStream          *stream,
 | 
				
			||||||
                                                                      GCredentials       *credentials);
 | 
					                                                                      GCredentials       *credentials);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -35,22 +35,27 @@ G_BEGIN_DECLS
 | 
				
			|||||||
#define G_DBUS_CONNECTION(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_CONNECTION, GDBusConnection))
 | 
					#define G_DBUS_CONNECTION(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_CONNECTION, GDBusConnection))
 | 
				
			||||||
#define G_IS_DBUS_CONNECTION(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_CONNECTION))
 | 
					#define G_IS_DBUS_CONNECTION(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_CONNECTION))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType            g_dbus_connection_get_type                   (void) G_GNUC_CONST;
 | 
					GType            g_dbus_connection_get_type                   (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* ---------------------------------------------------------------------------------------------------- */
 | 
					/* ---------------------------------------------------------------------------------------------------- */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void              g_bus_get                    (GBusType             bus_type,
 | 
					void              g_bus_get                    (GBusType             bus_type,
 | 
				
			||||||
                                                GCancellable        *cancellable,
 | 
					                                                GCancellable        *cancellable,
 | 
				
			||||||
                                                GAsyncReadyCallback  callback,
 | 
					                                                GAsyncReadyCallback  callback,
 | 
				
			||||||
                                                gpointer             user_data);
 | 
					                                                gpointer             user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusConnection  *g_bus_get_finish             (GAsyncResult        *res,
 | 
					GDBusConnection  *g_bus_get_finish             (GAsyncResult        *res,
 | 
				
			||||||
                                                GError             **error);
 | 
					                                                GError             **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusConnection  *g_bus_get_sync               (GBusType            bus_type,
 | 
					GDBusConnection  *g_bus_get_sync               (GBusType            bus_type,
 | 
				
			||||||
                                                GCancellable       *cancellable,
 | 
					                                                GCancellable       *cancellable,
 | 
				
			||||||
                                                GError            **error);
 | 
					                                                GError            **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* ---------------------------------------------------------------------------------------------------- */
 | 
					/* ---------------------------------------------------------------------------------------------------- */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void             g_dbus_connection_new                        (GIOStream              *stream,
 | 
					void             g_dbus_connection_new                        (GIOStream              *stream,
 | 
				
			||||||
                                                               const gchar            *guid,
 | 
					                                                               const gchar            *guid,
 | 
				
			||||||
                                                               GDBusConnectionFlags    flags,
 | 
					                                                               GDBusConnectionFlags    flags,
 | 
				
			||||||
@@ -58,8 +63,10 @@ void             g_dbus_connection_new                        (GIOStream
 | 
				
			|||||||
                                                               GCancellable           *cancellable,
 | 
					                                                               GCancellable           *cancellable,
 | 
				
			||||||
                                                               GAsyncReadyCallback     callback,
 | 
					                                                               GAsyncReadyCallback     callback,
 | 
				
			||||||
                                                               gpointer                user_data);
 | 
					                                                               gpointer                user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusConnection *g_dbus_connection_new_finish                 (GAsyncResult           *res,
 | 
					GDBusConnection *g_dbus_connection_new_finish                 (GAsyncResult           *res,
 | 
				
			||||||
                                                               GError                **error);
 | 
					                                                               GError                **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusConnection *g_dbus_connection_new_sync                   (GIOStream              *stream,
 | 
					GDBusConnection *g_dbus_connection_new_sync                   (GIOStream              *stream,
 | 
				
			||||||
                                                               const gchar            *guid,
 | 
					                                                               const gchar            *guid,
 | 
				
			||||||
                                                               GDBusConnectionFlags    flags,
 | 
					                                                               GDBusConnectionFlags    flags,
 | 
				
			||||||
@@ -67,14 +74,17 @@ GDBusConnection *g_dbus_connection_new_sync                   (GIOStream
 | 
				
			|||||||
                                                               GCancellable           *cancellable,
 | 
					                                                               GCancellable           *cancellable,
 | 
				
			||||||
                                                               GError                **error);
 | 
					                                                               GError                **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void             g_dbus_connection_new_for_address            (const gchar            *address,
 | 
					void             g_dbus_connection_new_for_address            (const gchar            *address,
 | 
				
			||||||
                                                               GDBusConnectionFlags    flags,
 | 
					                                                               GDBusConnectionFlags    flags,
 | 
				
			||||||
                                                               GDBusAuthObserver      *observer,
 | 
					                                                               GDBusAuthObserver      *observer,
 | 
				
			||||||
                                                               GCancellable           *cancellable,
 | 
					                                                               GCancellable           *cancellable,
 | 
				
			||||||
                                                               GAsyncReadyCallback     callback,
 | 
					                                                               GAsyncReadyCallback     callback,
 | 
				
			||||||
                                                               gpointer                user_data);
 | 
					                                                               gpointer                user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusConnection *g_dbus_connection_new_for_address_finish     (GAsyncResult           *res,
 | 
					GDBusConnection *g_dbus_connection_new_for_address_finish     (GAsyncResult           *res,
 | 
				
			||||||
                                                               GError                **error);
 | 
					                                                               GError                **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusConnection *g_dbus_connection_new_for_address_sync       (const gchar            *address,
 | 
					GDBusConnection *g_dbus_connection_new_for_address_sync       (const gchar            *address,
 | 
				
			||||||
                                                               GDBusConnectionFlags    flags,
 | 
					                                                               GDBusConnectionFlags    flags,
 | 
				
			||||||
                                                               GDBusAuthObserver      *observer,
 | 
					                                                               GDBusAuthObserver      *observer,
 | 
				
			||||||
@@ -83,54 +93,71 @@ GDBusConnection *g_dbus_connection_new_for_address_sync       (const gchar
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/* ---------------------------------------------------------------------------------------------------- */
 | 
					/* ---------------------------------------------------------------------------------------------------- */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void             g_dbus_connection_start_message_processing   (GDBusConnection    *connection);
 | 
					void             g_dbus_connection_start_message_processing   (GDBusConnection    *connection);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean         g_dbus_connection_is_closed                  (GDBusConnection    *connection);
 | 
					gboolean         g_dbus_connection_is_closed                  (GDBusConnection    *connection);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIOStream       *g_dbus_connection_get_stream                 (GDBusConnection    *connection);
 | 
					GIOStream       *g_dbus_connection_get_stream                 (GDBusConnection    *connection);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar     *g_dbus_connection_get_guid                   (GDBusConnection    *connection);
 | 
					const gchar     *g_dbus_connection_get_guid                   (GDBusConnection    *connection);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar     *g_dbus_connection_get_unique_name            (GDBusConnection    *connection);
 | 
					const gchar     *g_dbus_connection_get_unique_name            (GDBusConnection    *connection);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GCredentials    *g_dbus_connection_get_peer_credentials       (GDBusConnection    *connection);
 | 
					GCredentials    *g_dbus_connection_get_peer_credentials       (GDBusConnection    *connection);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GLIB_AVAILABLE_IN_2_34
 | 
					GLIB_AVAILABLE_IN_2_34
 | 
				
			||||||
guint32          g_dbus_connection_get_last_serial            (GDBusConnection    *connection);
 | 
					guint32          g_dbus_connection_get_last_serial            (GDBusConnection    *connection);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean         g_dbus_connection_get_exit_on_close          (GDBusConnection    *connection);
 | 
					gboolean         g_dbus_connection_get_exit_on_close          (GDBusConnection    *connection);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void             g_dbus_connection_set_exit_on_close          (GDBusConnection    *connection,
 | 
					void             g_dbus_connection_set_exit_on_close          (GDBusConnection    *connection,
 | 
				
			||||||
                                                               gboolean            exit_on_close);
 | 
					                                                               gboolean            exit_on_close);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusCapabilityFlags  g_dbus_connection_get_capabilities      (GDBusConnection    *connection);
 | 
					GDBusCapabilityFlags  g_dbus_connection_get_capabilities      (GDBusConnection    *connection);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* ---------------------------------------------------------------------------------------------------- */
 | 
					/* ---------------------------------------------------------------------------------------------------- */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void             g_dbus_connection_close                          (GDBusConnection     *connection,
 | 
					void             g_dbus_connection_close                          (GDBusConnection     *connection,
 | 
				
			||||||
                                                                   GCancellable        *cancellable,
 | 
					                                                                   GCancellable        *cancellable,
 | 
				
			||||||
                                                                   GAsyncReadyCallback  callback,
 | 
					                                                                   GAsyncReadyCallback  callback,
 | 
				
			||||||
                                                                   gpointer             user_data);
 | 
					                                                                   gpointer             user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean         g_dbus_connection_close_finish                   (GDBusConnection     *connection,
 | 
					gboolean         g_dbus_connection_close_finish                   (GDBusConnection     *connection,
 | 
				
			||||||
                                                                   GAsyncResult        *res,
 | 
					                                                                   GAsyncResult        *res,
 | 
				
			||||||
                                                                   GError             **error);
 | 
					                                                                   GError             **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean         g_dbus_connection_close_sync                     (GDBusConnection     *connection,
 | 
					gboolean         g_dbus_connection_close_sync                     (GDBusConnection     *connection,
 | 
				
			||||||
                                                                   GCancellable        *cancellable,
 | 
					                                                                   GCancellable        *cancellable,
 | 
				
			||||||
                                                                   GError             **error);
 | 
					                                                                   GError             **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* ---------------------------------------------------------------------------------------------------- */
 | 
					/* ---------------------------------------------------------------------------------------------------- */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void             g_dbus_connection_flush                          (GDBusConnection     *connection,
 | 
					void             g_dbus_connection_flush                          (GDBusConnection     *connection,
 | 
				
			||||||
                                                                   GCancellable        *cancellable,
 | 
					                                                                   GCancellable        *cancellable,
 | 
				
			||||||
                                                                   GAsyncReadyCallback  callback,
 | 
					                                                                   GAsyncReadyCallback  callback,
 | 
				
			||||||
                                                                   gpointer             user_data);
 | 
					                                                                   gpointer             user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean         g_dbus_connection_flush_finish                   (GDBusConnection     *connection,
 | 
					gboolean         g_dbus_connection_flush_finish                   (GDBusConnection     *connection,
 | 
				
			||||||
                                                                   GAsyncResult        *res,
 | 
					                                                                   GAsyncResult        *res,
 | 
				
			||||||
                                                                   GError             **error);
 | 
					                                                                   GError             **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean         g_dbus_connection_flush_sync                     (GDBusConnection     *connection,
 | 
					gboolean         g_dbus_connection_flush_sync                     (GDBusConnection     *connection,
 | 
				
			||||||
                                                                   GCancellable        *cancellable,
 | 
					                                                                   GCancellable        *cancellable,
 | 
				
			||||||
                                                                   GError             **error);
 | 
					                                                                   GError             **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* ---------------------------------------------------------------------------------------------------- */
 | 
					/* ---------------------------------------------------------------------------------------------------- */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean         g_dbus_connection_send_message                   (GDBusConnection     *connection,
 | 
					gboolean         g_dbus_connection_send_message                   (GDBusConnection     *connection,
 | 
				
			||||||
                                                                   GDBusMessage        *message,
 | 
					                                                                   GDBusMessage        *message,
 | 
				
			||||||
                                                                   GDBusSendMessageFlags flags,
 | 
					                                                                   GDBusSendMessageFlags flags,
 | 
				
			||||||
                                                                   volatile guint32    *out_serial,
 | 
					                                                                   volatile guint32    *out_serial,
 | 
				
			||||||
                                                                   GError             **error);
 | 
					                                                                   GError             **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void             g_dbus_connection_send_message_with_reply        (GDBusConnection     *connection,
 | 
					void             g_dbus_connection_send_message_with_reply        (GDBusConnection     *connection,
 | 
				
			||||||
                                                                   GDBusMessage        *message,
 | 
					                                                                   GDBusMessage        *message,
 | 
				
			||||||
                                                                   GDBusSendMessageFlags flags,
 | 
					                                                                   GDBusSendMessageFlags flags,
 | 
				
			||||||
@@ -139,9 +166,11 @@ void             g_dbus_connection_send_message_with_reply        (GDBusConnecti
 | 
				
			|||||||
                                                                   GCancellable        *cancellable,
 | 
					                                                                   GCancellable        *cancellable,
 | 
				
			||||||
                                                                   GAsyncReadyCallback  callback,
 | 
					                                                                   GAsyncReadyCallback  callback,
 | 
				
			||||||
                                                                   gpointer             user_data);
 | 
					                                                                   gpointer             user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusMessage    *g_dbus_connection_send_message_with_reply_finish (GDBusConnection     *connection,
 | 
					GDBusMessage    *g_dbus_connection_send_message_with_reply_finish (GDBusConnection     *connection,
 | 
				
			||||||
                                                                   GAsyncResult        *res,
 | 
					                                                                   GAsyncResult        *res,
 | 
				
			||||||
                                                                   GError             **error);
 | 
					                                                                   GError             **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusMessage    *g_dbus_connection_send_message_with_reply_sync   (GDBusConnection     *connection,
 | 
					GDBusMessage    *g_dbus_connection_send_message_with_reply_sync   (GDBusConnection     *connection,
 | 
				
			||||||
                                                                   GDBusMessage        *message,
 | 
					                                                                   GDBusMessage        *message,
 | 
				
			||||||
                                                                   GDBusSendMessageFlags flags,
 | 
					                                                                   GDBusSendMessageFlags flags,
 | 
				
			||||||
@@ -152,6 +181,7 @@ GDBusMessage    *g_dbus_connection_send_message_with_reply_sync   (GDBusConnecti
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/* ---------------------------------------------------------------------------------------------------- */
 | 
					/* ---------------------------------------------------------------------------------------------------- */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean  g_dbus_connection_emit_signal                       (GDBusConnection    *connection,
 | 
					gboolean  g_dbus_connection_emit_signal                       (GDBusConnection    *connection,
 | 
				
			||||||
                                                               const gchar        *destination_bus_name,
 | 
					                                                               const gchar        *destination_bus_name,
 | 
				
			||||||
                                                               const gchar        *object_path,
 | 
					                                                               const gchar        *object_path,
 | 
				
			||||||
@@ -159,6 +189,7 @@ gboolean  g_dbus_connection_emit_signal                       (GDBusConnection
 | 
				
			|||||||
                                                               const gchar        *signal_name,
 | 
					                                                               const gchar        *signal_name,
 | 
				
			||||||
                                                               GVariant           *parameters,
 | 
					                                                               GVariant           *parameters,
 | 
				
			||||||
                                                               GError            **error);
 | 
					                                                               GError            **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void      g_dbus_connection_call                              (GDBusConnection    *connection,
 | 
					void      g_dbus_connection_call                              (GDBusConnection    *connection,
 | 
				
			||||||
                                                               const gchar        *bus_name,
 | 
					                                                               const gchar        *bus_name,
 | 
				
			||||||
                                                               const gchar        *object_path,
 | 
					                                                               const gchar        *object_path,
 | 
				
			||||||
@@ -171,9 +202,11 @@ void      g_dbus_connection_call                              (GDBusConnection
 | 
				
			|||||||
                                                               GCancellable       *cancellable,
 | 
					                                                               GCancellable       *cancellable,
 | 
				
			||||||
                                                               GAsyncReadyCallback callback,
 | 
					                                                               GAsyncReadyCallback callback,
 | 
				
			||||||
                                                               gpointer            user_data);
 | 
					                                                               gpointer            user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GVariant *g_dbus_connection_call_finish                       (GDBusConnection    *connection,
 | 
					GVariant *g_dbus_connection_call_finish                       (GDBusConnection    *connection,
 | 
				
			||||||
                                                               GAsyncResult       *res,
 | 
					                                                               GAsyncResult       *res,
 | 
				
			||||||
                                                               GError            **error);
 | 
					                                                               GError            **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GVariant *g_dbus_connection_call_sync                         (GDBusConnection    *connection,
 | 
					GVariant *g_dbus_connection_call_sync                         (GDBusConnection    *connection,
 | 
				
			||||||
                                                               const gchar        *bus_name,
 | 
					                                                               const gchar        *bus_name,
 | 
				
			||||||
                                                               const gchar        *object_path,
 | 
					                                                               const gchar        *object_path,
 | 
				
			||||||
@@ -327,6 +360,7 @@ struct _GDBusInterfaceVTable
 | 
				
			|||||||
  gpointer padding[8];
 | 
					  gpointer padding[8];
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint            g_dbus_connection_register_object            (GDBusConnection            *connection,
 | 
					guint            g_dbus_connection_register_object            (GDBusConnection            *connection,
 | 
				
			||||||
                                                               const gchar                *object_path,
 | 
					                                                               const gchar                *object_path,
 | 
				
			||||||
                                                               GDBusInterfaceInfo         *interface_info,
 | 
					                                                               GDBusInterfaceInfo         *interface_info,
 | 
				
			||||||
@@ -334,6 +368,7 @@ guint            g_dbus_connection_register_object            (GDBusConnection
 | 
				
			|||||||
                                                               gpointer                    user_data,
 | 
					                                                               gpointer                    user_data,
 | 
				
			||||||
                                                               GDestroyNotify              user_data_free_func,
 | 
					                                                               GDestroyNotify              user_data_free_func,
 | 
				
			||||||
                                                               GError                    **error);
 | 
					                                                               GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean         g_dbus_connection_unregister_object          (GDBusConnection            *connection,
 | 
					gboolean         g_dbus_connection_unregister_object          (GDBusConnection            *connection,
 | 
				
			||||||
                                                               guint                       registration_id);
 | 
					                                                               guint                       registration_id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -455,6 +490,7 @@ struct _GDBusSubtreeVTable
 | 
				
			|||||||
  gpointer padding[8];
 | 
					  gpointer padding[8];
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint            g_dbus_connection_register_subtree           (GDBusConnection            *connection,
 | 
					guint            g_dbus_connection_register_subtree           (GDBusConnection            *connection,
 | 
				
			||||||
                                                               const gchar                *object_path,
 | 
					                                                               const gchar                *object_path,
 | 
				
			||||||
                                                               const GDBusSubtreeVTable   *vtable,
 | 
					                                                               const GDBusSubtreeVTable   *vtable,
 | 
				
			||||||
@@ -462,6 +498,7 @@ guint            g_dbus_connection_register_subtree           (GDBusConnection
 | 
				
			|||||||
                                                               gpointer                    user_data,
 | 
					                                                               gpointer                    user_data,
 | 
				
			||||||
                                                               GDestroyNotify              user_data_free_func,
 | 
					                                                               GDestroyNotify              user_data_free_func,
 | 
				
			||||||
                                                               GError                    **error);
 | 
					                                                               GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean         g_dbus_connection_unregister_subtree         (GDBusConnection            *connection,
 | 
					gboolean         g_dbus_connection_unregister_subtree         (GDBusConnection            *connection,
 | 
				
			||||||
                                                               guint                       registration_id);
 | 
					                                                               guint                       registration_id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -489,6 +526,7 @@ typedef void (*GDBusSignalCallback) (GDBusConnection  *connection,
 | 
				
			|||||||
                                     GVariant         *parameters,
 | 
					                                     GVariant         *parameters,
 | 
				
			||||||
                                     gpointer          user_data);
 | 
					                                     gpointer          user_data);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint            g_dbus_connection_signal_subscribe           (GDBusConnection     *connection,
 | 
					guint            g_dbus_connection_signal_subscribe           (GDBusConnection     *connection,
 | 
				
			||||||
                                                               const gchar         *sender,
 | 
					                                                               const gchar         *sender,
 | 
				
			||||||
                                                               const gchar         *interface_name,
 | 
					                                                               const gchar         *interface_name,
 | 
				
			||||||
@@ -499,6 +537,7 @@ guint            g_dbus_connection_signal_subscribe           (GDBusConnection
 | 
				
			|||||||
                                                               GDBusSignalCallback  callback,
 | 
					                                                               GDBusSignalCallback  callback,
 | 
				
			||||||
                                                               gpointer             user_data,
 | 
					                                                               gpointer             user_data,
 | 
				
			||||||
                                                               GDestroyNotify       user_data_free_func);
 | 
					                                                               GDestroyNotify       user_data_free_func);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void             g_dbus_connection_signal_unsubscribe         (GDBusConnection     *connection,
 | 
					void             g_dbus_connection_signal_unsubscribe         (GDBusConnection     *connection,
 | 
				
			||||||
                                                               guint                subscription_id);
 | 
					                                                               guint                subscription_id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -583,11 +622,13 @@ typedef GDBusMessage *(*GDBusMessageFilterFunction) (GDBusConnection *connection
 | 
				
			|||||||
                                                     gboolean         incoming,
 | 
					                                                     gboolean         incoming,
 | 
				
			||||||
                                                     gpointer         user_data);
 | 
					                                                     gpointer         user_data);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint g_dbus_connection_add_filter (GDBusConnection            *connection,
 | 
					guint g_dbus_connection_add_filter (GDBusConnection            *connection,
 | 
				
			||||||
                                    GDBusMessageFilterFunction  filter_function,
 | 
					                                    GDBusMessageFilterFunction  filter_function,
 | 
				
			||||||
                                    gpointer                    user_data,
 | 
					                                    gpointer                    user_data,
 | 
				
			||||||
                                    GDestroyNotify              user_data_free_func);
 | 
					                                    GDestroyNotify              user_data_free_func);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void  g_dbus_connection_remove_filter (GDBusConnection    *connection,
 | 
					void  g_dbus_connection_remove_filter (GDBusConnection    *connection,
 | 
				
			||||||
                                       guint               filter_id);
 | 
					                                       guint               filter_id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -47,11 +47,15 @@ G_BEGIN_DECLS
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
#define G_DBUS_ERROR g_dbus_error_quark()
 | 
					#define G_DBUS_ERROR g_dbus_error_quark()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GQuark g_dbus_error_quark (void);
 | 
					GQuark g_dbus_error_quark (void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Used by applications to check, get and strip the D-Bus error name */
 | 
					/* Used by applications to check, get and strip the D-Bus error name */
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_dbus_error_is_remote_error       (const GError    *error);
 | 
					gboolean g_dbus_error_is_remote_error       (const GError    *error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar   *g_dbus_error_get_remote_error      (const GError    *error);
 | 
					gchar   *g_dbus_error_get_remote_error      (const GError    *error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_dbus_error_strip_remote_error    (GError          *error);
 | 
					gboolean g_dbus_error_strip_remote_error    (GError          *error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
@@ -69,30 +73,37 @@ struct _GDBusErrorEntry
 | 
				
			|||||||
  const gchar *dbus_error_name;
 | 
					  const gchar *dbus_error_name;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_dbus_error_register_error        (GQuark                 error_domain,
 | 
					gboolean g_dbus_error_register_error        (GQuark                 error_domain,
 | 
				
			||||||
                                             gint                   error_code,
 | 
					                                             gint                   error_code,
 | 
				
			||||||
                                             const gchar           *dbus_error_name);
 | 
					                                             const gchar           *dbus_error_name);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_dbus_error_unregister_error      (GQuark                 error_domain,
 | 
					gboolean g_dbus_error_unregister_error      (GQuark                 error_domain,
 | 
				
			||||||
                                             gint                   error_code,
 | 
					                                             gint                   error_code,
 | 
				
			||||||
                                             const gchar           *dbus_error_name);
 | 
					                                             const gchar           *dbus_error_name);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void     g_dbus_error_register_error_domain (const gchar           *error_domain_quark_name,
 | 
					void     g_dbus_error_register_error_domain (const gchar           *error_domain_quark_name,
 | 
				
			||||||
                                             volatile gsize        *quark_volatile,
 | 
					                                             volatile gsize        *quark_volatile,
 | 
				
			||||||
                                             const GDBusErrorEntry *entries,
 | 
					                                             const GDBusErrorEntry *entries,
 | 
				
			||||||
                                             guint                  num_entries);
 | 
					                                             guint                  num_entries);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Only used by object mappings to map back and forth to GError */
 | 
					/* Only used by object mappings to map back and forth to GError */
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GError  *g_dbus_error_new_for_dbus_error    (const gchar     *dbus_error_name,
 | 
					GError  *g_dbus_error_new_for_dbus_error    (const gchar     *dbus_error_name,
 | 
				
			||||||
                                             const gchar     *dbus_error_message);
 | 
					                                             const gchar     *dbus_error_message);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void     g_dbus_error_set_dbus_error        (GError         **error,
 | 
					void     g_dbus_error_set_dbus_error        (GError         **error,
 | 
				
			||||||
                                             const gchar     *dbus_error_name,
 | 
					                                             const gchar     *dbus_error_name,
 | 
				
			||||||
                                             const gchar     *dbus_error_message,
 | 
					                                             const gchar     *dbus_error_message,
 | 
				
			||||||
                                             const gchar     *format,
 | 
					                                             const gchar     *format,
 | 
				
			||||||
                                             ...) G_GNUC_PRINTF(4, 5);
 | 
					                                             ...) G_GNUC_PRINTF(4, 5);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void     g_dbus_error_set_dbus_error_valist (GError         **error,
 | 
					void     g_dbus_error_set_dbus_error_valist (GError         **error,
 | 
				
			||||||
                                             const gchar     *dbus_error_name,
 | 
					                                             const gchar     *dbus_error_name,
 | 
				
			||||||
                                             const gchar     *dbus_error_message,
 | 
					                                             const gchar     *dbus_error_message,
 | 
				
			||||||
                                             const gchar     *format,
 | 
					                                             const gchar     *format,
 | 
				
			||||||
                                             va_list          var_args) G_GNUC_PRINTF(4, 0);
 | 
					                                             va_list          var_args) G_GNUC_PRINTF(4, 0);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar   *g_dbus_error_encode_gerror         (const GError    *error);
 | 
					gchar   *g_dbus_error_encode_gerror         (const GError    *error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -66,9 +66,13 @@ struct _GDBusInterfaceIface
 | 
				
			|||||||
  GDBusObject          *(*dup_object) (GDBusInterface      *interface_);
 | 
					  GDBusObject          *(*dup_object) (GDBusInterface      *interface_);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                 g_dbus_interface_get_type         (void) G_GNUC_CONST;
 | 
					GType                 g_dbus_interface_get_type         (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusInterfaceInfo   *g_dbus_interface_get_info         (GDBusInterface      *interface_);
 | 
					GDBusInterfaceInfo   *g_dbus_interface_get_info         (GDBusInterface      *interface_);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusObject          *g_dbus_interface_get_object       (GDBusInterface      *interface_);
 | 
					GDBusObject          *g_dbus_interface_get_object       (GDBusInterface      *interface_);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                  g_dbus_interface_set_object       (GDBusInterface      *interface_,
 | 
					void                  g_dbus_interface_set_object       (GDBusInterface      *interface_,
 | 
				
			||||||
                                                         GDBusObject         *object);
 | 
					                                                         GDBusObject         *object);
 | 
				
			||||||
GLIB_AVAILABLE_IN_2_32
 | 
					GLIB_AVAILABLE_IN_2_32
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -87,27 +87,41 @@ struct _GDBusInterfaceSkeletonClass
 | 
				
			|||||||
  gpointer signal_padding[8];
 | 
					  gpointer signal_padding[8];
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                        g_dbus_interface_skeleton_get_type        (void) G_GNUC_CONST;
 | 
					GType                        g_dbus_interface_skeleton_get_type        (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusInterfaceSkeletonFlags  g_dbus_interface_skeleton_get_flags       (GDBusInterfaceSkeleton      *interface_);
 | 
					GDBusInterfaceSkeletonFlags  g_dbus_interface_skeleton_get_flags       (GDBusInterfaceSkeleton      *interface_);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                         g_dbus_interface_skeleton_set_flags       (GDBusInterfaceSkeleton      *interface_,
 | 
					void                         g_dbus_interface_skeleton_set_flags       (GDBusInterfaceSkeleton      *interface_,
 | 
				
			||||||
                                                                        GDBusInterfaceSkeletonFlags  flags);
 | 
					                                                                        GDBusInterfaceSkeletonFlags  flags);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusInterfaceInfo          *g_dbus_interface_skeleton_get_info        (GDBusInterfaceSkeleton      *interface_);
 | 
					GDBusInterfaceInfo          *g_dbus_interface_skeleton_get_info        (GDBusInterfaceSkeleton      *interface_);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusInterfaceVTable        *g_dbus_interface_skeleton_get_vtable      (GDBusInterfaceSkeleton      *interface_);
 | 
					GDBusInterfaceVTable        *g_dbus_interface_skeleton_get_vtable      (GDBusInterfaceSkeleton      *interface_);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GVariant                    *g_dbus_interface_skeleton_get_properties  (GDBusInterfaceSkeleton      *interface_);
 | 
					GVariant                    *g_dbus_interface_skeleton_get_properties  (GDBusInterfaceSkeleton      *interface_);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                         g_dbus_interface_skeleton_flush           (GDBusInterfaceSkeleton      *interface_);
 | 
					void                         g_dbus_interface_skeleton_flush           (GDBusInterfaceSkeleton      *interface_);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                     g_dbus_interface_skeleton_export          (GDBusInterfaceSkeleton      *interface_,
 | 
					gboolean                     g_dbus_interface_skeleton_export          (GDBusInterfaceSkeleton      *interface_,
 | 
				
			||||||
                                                                        GDBusConnection             *connection,
 | 
					                                                                        GDBusConnection             *connection,
 | 
				
			||||||
                                                                        const gchar                 *object_path,
 | 
					                                                                        const gchar                 *object_path,
 | 
				
			||||||
                                                                        GError                     **error);
 | 
					                                                                        GError                     **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                         g_dbus_interface_skeleton_unexport        (GDBusInterfaceSkeleton      *interface_);
 | 
					void                         g_dbus_interface_skeleton_unexport        (GDBusInterfaceSkeleton      *interface_);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                g_dbus_interface_skeleton_unexport_from_connection (GDBusInterfaceSkeleton      *interface_,
 | 
					void                g_dbus_interface_skeleton_unexport_from_connection (GDBusInterfaceSkeleton      *interface_,
 | 
				
			||||||
                                                                        GDBusConnection             *connection);
 | 
					                                                                        GDBusConnection             *connection);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusConnection             *g_dbus_interface_skeleton_get_connection  (GDBusInterfaceSkeleton      *interface_);
 | 
					GDBusConnection             *g_dbus_interface_skeleton_get_connection  (GDBusInterfaceSkeleton      *interface_);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GList                       *g_dbus_interface_skeleton_get_connections (GDBusInterfaceSkeleton      *interface_);
 | 
					GList                       *g_dbus_interface_skeleton_get_connections (GDBusInterfaceSkeleton      *interface_);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                     g_dbus_interface_skeleton_has_connection  (GDBusInterfaceSkeleton      *interface_,
 | 
					gboolean                     g_dbus_interface_skeleton_has_connection  (GDBusInterfaceSkeleton      *interface_,
 | 
				
			||||||
                                                                        GDBusConnection             *connection);
 | 
					                                                                        GDBusConnection             *connection);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar                 *g_dbus_interface_skeleton_get_object_path (GDBusInterfaceSkeleton      *interface_);
 | 
					const gchar                 *g_dbus_interface_skeleton_get_object_path (GDBusInterfaceSkeleton      *interface_);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -181,43 +181,67 @@ struct _GDBusNodeInfo
 | 
				
			|||||||
  GDBusAnnotationInfo **annotations;
 | 
					  GDBusAnnotationInfo **annotations;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar        *g_dbus_annotation_info_lookup          (GDBusAnnotationInfo **annotations,
 | 
					const gchar        *g_dbus_annotation_info_lookup          (GDBusAnnotationInfo **annotations,
 | 
				
			||||||
                                                            const gchar          *name);
 | 
					                                                            const gchar          *name);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusMethodInfo    *g_dbus_interface_info_lookup_method    (GDBusInterfaceInfo   *info,
 | 
					GDBusMethodInfo    *g_dbus_interface_info_lookup_method    (GDBusInterfaceInfo   *info,
 | 
				
			||||||
                                                            const gchar          *name);
 | 
					                                                            const gchar          *name);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusSignalInfo    *g_dbus_interface_info_lookup_signal    (GDBusInterfaceInfo   *info,
 | 
					GDBusSignalInfo    *g_dbus_interface_info_lookup_signal    (GDBusInterfaceInfo   *info,
 | 
				
			||||||
                                                            const gchar          *name);
 | 
					                                                            const gchar          *name);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusPropertyInfo  *g_dbus_interface_info_lookup_property  (GDBusInterfaceInfo   *info,
 | 
					GDBusPropertyInfo  *g_dbus_interface_info_lookup_property  (GDBusInterfaceInfo   *info,
 | 
				
			||||||
                                                            const gchar          *name);
 | 
					                                                            const gchar          *name);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                g_dbus_interface_info_cache_build      (GDBusInterfaceInfo   *info);
 | 
					void                g_dbus_interface_info_cache_build      (GDBusInterfaceInfo   *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                g_dbus_interface_info_cache_release    (GDBusInterfaceInfo   *info);
 | 
					void                g_dbus_interface_info_cache_release    (GDBusInterfaceInfo   *info);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                g_dbus_interface_info_generate_xml     (GDBusInterfaceInfo   *info,
 | 
					void                g_dbus_interface_info_generate_xml     (GDBusInterfaceInfo   *info,
 | 
				
			||||||
                                                            guint                 indent,
 | 
					                                                            guint                 indent,
 | 
				
			||||||
                                                            GString              *string_builder);
 | 
					                                                            GString              *string_builder);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusNodeInfo      *g_dbus_node_info_new_for_xml           (const gchar          *xml_data,
 | 
					GDBusNodeInfo      *g_dbus_node_info_new_for_xml           (const gchar          *xml_data,
 | 
				
			||||||
                                                            GError              **error);
 | 
					                                                            GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusInterfaceInfo *g_dbus_node_info_lookup_interface      (GDBusNodeInfo        *info,
 | 
					GDBusInterfaceInfo *g_dbus_node_info_lookup_interface      (GDBusNodeInfo        *info,
 | 
				
			||||||
                                                            const gchar          *name);
 | 
					                                                            const gchar          *name);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                g_dbus_node_info_generate_xml          (GDBusNodeInfo        *info,
 | 
					void                g_dbus_node_info_generate_xml          (GDBusNodeInfo        *info,
 | 
				
			||||||
                                                            guint                 indent,
 | 
					                                                            guint                 indent,
 | 
				
			||||||
                                                            GString              *string_builder);
 | 
					                                                            GString              *string_builder);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusNodeInfo       *g_dbus_node_info_ref                  (GDBusNodeInfo        *info);
 | 
					GDBusNodeInfo       *g_dbus_node_info_ref                  (GDBusNodeInfo        *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusInterfaceInfo  *g_dbus_interface_info_ref             (GDBusInterfaceInfo   *info);
 | 
					GDBusInterfaceInfo  *g_dbus_interface_info_ref             (GDBusInterfaceInfo   *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusMethodInfo     *g_dbus_method_info_ref                (GDBusMethodInfo      *info);
 | 
					GDBusMethodInfo     *g_dbus_method_info_ref                (GDBusMethodInfo      *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusSignalInfo     *g_dbus_signal_info_ref                (GDBusSignalInfo      *info);
 | 
					GDBusSignalInfo     *g_dbus_signal_info_ref                (GDBusSignalInfo      *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusPropertyInfo   *g_dbus_property_info_ref              (GDBusPropertyInfo    *info);
 | 
					GDBusPropertyInfo   *g_dbus_property_info_ref              (GDBusPropertyInfo    *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusArgInfo        *g_dbus_arg_info_ref                   (GDBusArgInfo         *info);
 | 
					GDBusArgInfo        *g_dbus_arg_info_ref                   (GDBusArgInfo         *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusAnnotationInfo *g_dbus_annotation_info_ref            (GDBusAnnotationInfo  *info);
 | 
					GDBusAnnotationInfo *g_dbus_annotation_info_ref            (GDBusAnnotationInfo  *info);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                 g_dbus_node_info_unref                (GDBusNodeInfo        *info);
 | 
					void                 g_dbus_node_info_unref                (GDBusNodeInfo        *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                 g_dbus_interface_info_unref           (GDBusInterfaceInfo   *info);
 | 
					void                 g_dbus_interface_info_unref           (GDBusInterfaceInfo   *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                 g_dbus_method_info_unref              (GDBusMethodInfo      *info);
 | 
					void                 g_dbus_method_info_unref              (GDBusMethodInfo      *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                 g_dbus_signal_info_unref              (GDBusSignalInfo      *info);
 | 
					void                 g_dbus_signal_info_unref              (GDBusSignalInfo      *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                 g_dbus_property_info_unref            (GDBusPropertyInfo    *info);
 | 
					void                 g_dbus_property_info_unref            (GDBusPropertyInfo    *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                 g_dbus_arg_info_unref                 (GDBusArgInfo         *info);
 | 
					void                 g_dbus_arg_info_unref                 (GDBusArgInfo         *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                 g_dbus_annotation_info_unref          (GDBusAnnotationInfo  *info);
 | 
					void                 g_dbus_annotation_info_unref          (GDBusAnnotationInfo  *info);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
@@ -283,12 +307,19 @@ void                 g_dbus_annotation_info_unref          (GDBusAnnotationInfo
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
#define G_TYPE_DBUS_ANNOTATION_INFO (g_dbus_annotation_info_get_type ())
 | 
					#define G_TYPE_DBUS_ANNOTATION_INFO (g_dbus_annotation_info_get_type ())
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType g_dbus_node_info_get_type       (void) G_GNUC_CONST;
 | 
					GType g_dbus_node_info_get_type       (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType g_dbus_interface_info_get_type  (void) G_GNUC_CONST;
 | 
					GType g_dbus_interface_info_get_type  (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType g_dbus_method_info_get_type     (void) G_GNUC_CONST;
 | 
					GType g_dbus_method_info_get_type     (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType g_dbus_signal_info_get_type     (void) G_GNUC_CONST;
 | 
					GType g_dbus_signal_info_get_type     (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType g_dbus_property_info_get_type   (void) G_GNUC_CONST;
 | 
					GType g_dbus_property_info_get_type   (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType g_dbus_arg_info_get_type        (void) G_GNUC_CONST;
 | 
					GType g_dbus_arg_info_get_type        (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType g_dbus_annotation_info_get_type (void) G_GNUC_CONST;
 | 
					GType g_dbus_annotation_info_get_type (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -34,8 +34,10 @@ G_BEGIN_DECLS
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
typedef struct _GDBusMenuModel GDBusMenuModel;
 | 
					typedef struct _GDBusMenuModel GDBusMenuModel;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                   g_dbus_menu_model_get_type     (void) G_GNUC_CONST;
 | 
					GType                   g_dbus_menu_model_get_type     (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusMenuModel *        g_dbus_menu_model_get          (GDBusConnection *connection,
 | 
					GDBusMenuModel *        g_dbus_menu_model_get          (GDBusConnection *connection,
 | 
				
			||||||
                                                        const gchar     *bus_name,
 | 
					                                                        const gchar     *bus_name,
 | 
				
			||||||
                                                        const gchar     *object_path);
 | 
					                                                        const gchar     *object_path);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -35,112 +35,162 @@ G_BEGIN_DECLS
 | 
				
			|||||||
#define G_DBUS_MESSAGE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_MESSAGE, GDBusMessage))
 | 
					#define G_DBUS_MESSAGE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_MESSAGE, GDBusMessage))
 | 
				
			||||||
#define G_IS_DBUS_MESSAGE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_MESSAGE))
 | 
					#define G_IS_DBUS_MESSAGE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_MESSAGE))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                     g_dbus_message_get_type           (void) G_GNUC_CONST;
 | 
					GType                     g_dbus_message_get_type           (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusMessage             *g_dbus_message_new                (void);
 | 
					GDBusMessage             *g_dbus_message_new                (void);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusMessage             *g_dbus_message_new_signal         (const gchar              *path,
 | 
					GDBusMessage             *g_dbus_message_new_signal         (const gchar              *path,
 | 
				
			||||||
                                                             const gchar              *interface_,
 | 
					                                                             const gchar              *interface_,
 | 
				
			||||||
                                                             const gchar              *signal);
 | 
					                                                             const gchar              *signal);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusMessage             *g_dbus_message_new_method_call    (const gchar              *name,
 | 
					GDBusMessage             *g_dbus_message_new_method_call    (const gchar              *name,
 | 
				
			||||||
                                                             const gchar              *path,
 | 
					                                                             const gchar              *path,
 | 
				
			||||||
                                                             const gchar              *interface_,
 | 
					                                                             const gchar              *interface_,
 | 
				
			||||||
                                                             const gchar              *method);
 | 
					                                                             const gchar              *method);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusMessage             *g_dbus_message_new_method_reply   (GDBusMessage             *method_call_message);
 | 
					GDBusMessage             *g_dbus_message_new_method_reply   (GDBusMessage             *method_call_message);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusMessage             *g_dbus_message_new_method_error   (GDBusMessage             *method_call_message,
 | 
					GDBusMessage             *g_dbus_message_new_method_error   (GDBusMessage             *method_call_message,
 | 
				
			||||||
                                                             const gchar              *error_name,
 | 
					                                                             const gchar              *error_name,
 | 
				
			||||||
                                                             const gchar              *error_message_format,
 | 
					                                                             const gchar              *error_message_format,
 | 
				
			||||||
                                                             ...);
 | 
					                                                             ...);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusMessage             *g_dbus_message_new_method_error_valist (GDBusMessage             *method_call_message,
 | 
					GDBusMessage             *g_dbus_message_new_method_error_valist (GDBusMessage             *method_call_message,
 | 
				
			||||||
                                                                  const gchar              *error_name,
 | 
					                                                                  const gchar              *error_name,
 | 
				
			||||||
                                                                  const gchar              *error_message_format,
 | 
					                                                                  const gchar              *error_message_format,
 | 
				
			||||||
                                                                  va_list                   var_args);
 | 
					                                                                  va_list                   var_args);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusMessage             *g_dbus_message_new_method_error_literal (GDBusMessage             *method_call_message,
 | 
					GDBusMessage             *g_dbus_message_new_method_error_literal (GDBusMessage             *method_call_message,
 | 
				
			||||||
                                                                   const gchar              *error_name,
 | 
					                                                                   const gchar              *error_name,
 | 
				
			||||||
                                                                   const gchar              *error_message);
 | 
					                                                                   const gchar              *error_message);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar                    *g_dbus_message_print              (GDBusMessage             *message,
 | 
					gchar                    *g_dbus_message_print              (GDBusMessage             *message,
 | 
				
			||||||
                                                             guint                     indent);
 | 
					                                                             guint                     indent);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                  g_dbus_message_get_locked         (GDBusMessage             *message);
 | 
					gboolean                  g_dbus_message_get_locked         (GDBusMessage             *message);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                      g_dbus_message_lock               (GDBusMessage             *message);
 | 
					void                      g_dbus_message_lock               (GDBusMessage             *message);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusMessage             *g_dbus_message_copy               (GDBusMessage             *message,
 | 
					GDBusMessage             *g_dbus_message_copy               (GDBusMessage             *message,
 | 
				
			||||||
                                                             GError                  **error);
 | 
					                                                             GError                  **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusMessageByteOrder     g_dbus_message_get_byte_order     (GDBusMessage             *message);
 | 
					GDBusMessageByteOrder     g_dbus_message_get_byte_order     (GDBusMessage             *message);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                      g_dbus_message_set_byte_order     (GDBusMessage             *message,
 | 
					void                      g_dbus_message_set_byte_order     (GDBusMessage             *message,
 | 
				
			||||||
                                                             GDBusMessageByteOrder     byte_order);
 | 
					                                                             GDBusMessageByteOrder     byte_order);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusMessageType          g_dbus_message_get_message_type   (GDBusMessage             *message);
 | 
					GDBusMessageType          g_dbus_message_get_message_type   (GDBusMessage             *message);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                      g_dbus_message_set_message_type   (GDBusMessage             *message,
 | 
					void                      g_dbus_message_set_message_type   (GDBusMessage             *message,
 | 
				
			||||||
                                                             GDBusMessageType          type);
 | 
					                                                             GDBusMessageType          type);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusMessageFlags         g_dbus_message_get_flags          (GDBusMessage             *message);
 | 
					GDBusMessageFlags         g_dbus_message_get_flags          (GDBusMessage             *message);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                      g_dbus_message_set_flags          (GDBusMessage             *message,
 | 
					void                      g_dbus_message_set_flags          (GDBusMessage             *message,
 | 
				
			||||||
                                                             GDBusMessageFlags         flags);
 | 
					                                                             GDBusMessageFlags         flags);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint32                   g_dbus_message_get_serial         (GDBusMessage             *message);
 | 
					guint32                   g_dbus_message_get_serial         (GDBusMessage             *message);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                      g_dbus_message_set_serial         (GDBusMessage             *message,
 | 
					void                      g_dbus_message_set_serial         (GDBusMessage             *message,
 | 
				
			||||||
                                                             guint32                   serial);
 | 
					                                                             guint32                   serial);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GVariant                 *g_dbus_message_get_header         (GDBusMessage             *message,
 | 
					GVariant                 *g_dbus_message_get_header         (GDBusMessage             *message,
 | 
				
			||||||
                                                             GDBusMessageHeaderField   header_field);
 | 
					                                                             GDBusMessageHeaderField   header_field);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                      g_dbus_message_set_header         (GDBusMessage             *message,
 | 
					void                      g_dbus_message_set_header         (GDBusMessage             *message,
 | 
				
			||||||
                                                             GDBusMessageHeaderField   header_field,
 | 
					                                                             GDBusMessageHeaderField   header_field,
 | 
				
			||||||
                                                             GVariant                 *value);
 | 
					                                                             GVariant                 *value);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guchar                   *g_dbus_message_get_header_fields  (GDBusMessage             *message);
 | 
					guchar                   *g_dbus_message_get_header_fields  (GDBusMessage             *message);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GVariant                 *g_dbus_message_get_body           (GDBusMessage             *message);
 | 
					GVariant                 *g_dbus_message_get_body           (GDBusMessage             *message);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                      g_dbus_message_set_body           (GDBusMessage             *message,
 | 
					void                      g_dbus_message_set_body           (GDBusMessage             *message,
 | 
				
			||||||
                                                             GVariant                 *body);
 | 
					                                                             GVariant                 *body);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GUnixFDList              *g_dbus_message_get_unix_fd_list   (GDBusMessage             *message);
 | 
					GUnixFDList              *g_dbus_message_get_unix_fd_list   (GDBusMessage             *message);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                      g_dbus_message_set_unix_fd_list   (GDBusMessage             *message,
 | 
					void                      g_dbus_message_set_unix_fd_list   (GDBusMessage             *message,
 | 
				
			||||||
                                                             GUnixFDList              *fd_list);
 | 
					                                                             GUnixFDList              *fd_list);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint32                   g_dbus_message_get_reply_serial   (GDBusMessage             *message);
 | 
					guint32                   g_dbus_message_get_reply_serial   (GDBusMessage             *message);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                      g_dbus_message_set_reply_serial   (GDBusMessage             *message,
 | 
					void                      g_dbus_message_set_reply_serial   (GDBusMessage             *message,
 | 
				
			||||||
                                                             guint32                   value);
 | 
					                                                             guint32                   value);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar              *g_dbus_message_get_interface      (GDBusMessage             *message);
 | 
					const gchar              *g_dbus_message_get_interface      (GDBusMessage             *message);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                      g_dbus_message_set_interface      (GDBusMessage             *message,
 | 
					void                      g_dbus_message_set_interface      (GDBusMessage             *message,
 | 
				
			||||||
                                                             const gchar              *value);
 | 
					                                                             const gchar              *value);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar              *g_dbus_message_get_member         (GDBusMessage             *message);
 | 
					const gchar              *g_dbus_message_get_member         (GDBusMessage             *message);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                      g_dbus_message_set_member         (GDBusMessage             *message,
 | 
					void                      g_dbus_message_set_member         (GDBusMessage             *message,
 | 
				
			||||||
                                                             const gchar              *value);
 | 
					                                                             const gchar              *value);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar              *g_dbus_message_get_path           (GDBusMessage             *message);
 | 
					const gchar              *g_dbus_message_get_path           (GDBusMessage             *message);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                      g_dbus_message_set_path           (GDBusMessage             *message,
 | 
					void                      g_dbus_message_set_path           (GDBusMessage             *message,
 | 
				
			||||||
                                                             const gchar              *value);
 | 
					                                                             const gchar              *value);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar              *g_dbus_message_get_sender         (GDBusMessage             *message);
 | 
					const gchar              *g_dbus_message_get_sender         (GDBusMessage             *message);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                      g_dbus_message_set_sender         (GDBusMessage             *message,
 | 
					void                      g_dbus_message_set_sender         (GDBusMessage             *message,
 | 
				
			||||||
                                                             const gchar              *value);
 | 
					                                                             const gchar              *value);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar              *g_dbus_message_get_destination    (GDBusMessage             *message);
 | 
					const gchar              *g_dbus_message_get_destination    (GDBusMessage             *message);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                      g_dbus_message_set_destination    (GDBusMessage             *message,
 | 
					void                      g_dbus_message_set_destination    (GDBusMessage             *message,
 | 
				
			||||||
                                                             const gchar              *value);
 | 
					                                                             const gchar              *value);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar              *g_dbus_message_get_error_name     (GDBusMessage             *message);
 | 
					const gchar              *g_dbus_message_get_error_name     (GDBusMessage             *message);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                      g_dbus_message_set_error_name     (GDBusMessage             *message,
 | 
					void                      g_dbus_message_set_error_name     (GDBusMessage             *message,
 | 
				
			||||||
                                                             const gchar              *value);
 | 
					                                                             const gchar              *value);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar              *g_dbus_message_get_signature      (GDBusMessage             *message);
 | 
					const gchar              *g_dbus_message_get_signature      (GDBusMessage             *message);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                      g_dbus_message_set_signature      (GDBusMessage             *message,
 | 
					void                      g_dbus_message_set_signature      (GDBusMessage             *message,
 | 
				
			||||||
                                                             const gchar              *value);
 | 
					                                                             const gchar              *value);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint32                   g_dbus_message_get_num_unix_fds   (GDBusMessage             *message);
 | 
					guint32                   g_dbus_message_get_num_unix_fds   (GDBusMessage             *message);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                      g_dbus_message_set_num_unix_fds   (GDBusMessage             *message,
 | 
					void                      g_dbus_message_set_num_unix_fds   (GDBusMessage             *message,
 | 
				
			||||||
                                                             guint32                   value);
 | 
					                                                             guint32                   value);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar              *g_dbus_message_get_arg0           (GDBusMessage             *message);
 | 
					const gchar              *g_dbus_message_get_arg0           (GDBusMessage             *message);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusMessage             *g_dbus_message_new_from_blob      (guchar                   *blob,
 | 
					GDBusMessage             *g_dbus_message_new_from_blob      (guchar                   *blob,
 | 
				
			||||||
                                                             gsize                     blob_len,
 | 
					                                                             gsize                     blob_len,
 | 
				
			||||||
                                                             GDBusCapabilityFlags      capabilities,
 | 
					                                                             GDBusCapabilityFlags      capabilities,
 | 
				
			||||||
                                                             GError                  **error);
 | 
					                                                             GError                  **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gssize                    g_dbus_message_bytes_needed       (guchar                   *blob,
 | 
					gssize                    g_dbus_message_bytes_needed       (guchar                   *blob,
 | 
				
			||||||
                                                             gsize                     blob_len,
 | 
					                                                             gsize                     blob_len,
 | 
				
			||||||
                                                             GError                  **error);
 | 
					                                                             GError                  **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guchar                   *g_dbus_message_to_blob            (GDBusMessage             *message,
 | 
					guchar                   *g_dbus_message_to_blob            (GDBusMessage             *message,
 | 
				
			||||||
                                                             gsize                    *out_size,
 | 
					                                                             gsize                    *out_size,
 | 
				
			||||||
                                                             GDBusCapabilityFlags      capabilities,
 | 
					                                                             GDBusCapabilityFlags      capabilities,
 | 
				
			||||||
                                                             GError                  **error);
 | 
					                                                             GError                  **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                  g_dbus_message_to_gerror          (GDBusMessage             *message,
 | 
					gboolean                  g_dbus_message_to_gerror          (GDBusMessage             *message,
 | 
				
			||||||
                                                             GError                  **error);
 | 
					                                                             GError                  **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -35,41 +35,59 @@ G_BEGIN_DECLS
 | 
				
			|||||||
#define G_DBUS_METHOD_INVOCATION(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_METHOD_INVOCATION, GDBusMethodInvocation))
 | 
					#define G_DBUS_METHOD_INVOCATION(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_METHOD_INVOCATION, GDBusMethodInvocation))
 | 
				
			||||||
#define G_IS_DBUS_METHOD_INVOCATION(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_METHOD_INVOCATION))
 | 
					#define G_IS_DBUS_METHOD_INVOCATION(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_METHOD_INVOCATION))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                  g_dbus_method_invocation_get_type             (void) G_GNUC_CONST;
 | 
					GType                  g_dbus_method_invocation_get_type             (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar           *g_dbus_method_invocation_get_sender           (GDBusMethodInvocation *invocation);
 | 
					const gchar           *g_dbus_method_invocation_get_sender           (GDBusMethodInvocation *invocation);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar           *g_dbus_method_invocation_get_object_path      (GDBusMethodInvocation *invocation);
 | 
					const gchar           *g_dbus_method_invocation_get_object_path      (GDBusMethodInvocation *invocation);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar           *g_dbus_method_invocation_get_interface_name   (GDBusMethodInvocation *invocation);
 | 
					const gchar           *g_dbus_method_invocation_get_interface_name   (GDBusMethodInvocation *invocation);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar           *g_dbus_method_invocation_get_method_name      (GDBusMethodInvocation *invocation);
 | 
					const gchar           *g_dbus_method_invocation_get_method_name      (GDBusMethodInvocation *invocation);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const GDBusMethodInfo *g_dbus_method_invocation_get_method_info      (GDBusMethodInvocation *invocation);
 | 
					const GDBusMethodInfo *g_dbus_method_invocation_get_method_info      (GDBusMethodInvocation *invocation);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusConnection       *g_dbus_method_invocation_get_connection       (GDBusMethodInvocation *invocation);
 | 
					GDBusConnection       *g_dbus_method_invocation_get_connection       (GDBusMethodInvocation *invocation);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusMessage          *g_dbus_method_invocation_get_message          (GDBusMethodInvocation *invocation);
 | 
					GDBusMessage          *g_dbus_method_invocation_get_message          (GDBusMethodInvocation *invocation);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GVariant              *g_dbus_method_invocation_get_parameters       (GDBusMethodInvocation *invocation);
 | 
					GVariant              *g_dbus_method_invocation_get_parameters       (GDBusMethodInvocation *invocation);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gpointer               g_dbus_method_invocation_get_user_data        (GDBusMethodInvocation *invocation);
 | 
					gpointer               g_dbus_method_invocation_get_user_data        (GDBusMethodInvocation *invocation);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                   g_dbus_method_invocation_return_value         (GDBusMethodInvocation *invocation,
 | 
					void                   g_dbus_method_invocation_return_value         (GDBusMethodInvocation *invocation,
 | 
				
			||||||
                                                                      GVariant              *parameters);
 | 
					                                                                      GVariant              *parameters);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                   g_dbus_method_invocation_return_value_with_unix_fd_list (GDBusMethodInvocation *invocation,
 | 
					void                   g_dbus_method_invocation_return_value_with_unix_fd_list (GDBusMethodInvocation *invocation,
 | 
				
			||||||
                                                                                GVariant              *parameters,
 | 
					                                                                                GVariant              *parameters,
 | 
				
			||||||
                                                                                GUnixFDList           *fd_list);
 | 
					                                                                                GUnixFDList           *fd_list);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                   g_dbus_method_invocation_return_error         (GDBusMethodInvocation *invocation,
 | 
					void                   g_dbus_method_invocation_return_error         (GDBusMethodInvocation *invocation,
 | 
				
			||||||
                                                                      GQuark                 domain,
 | 
					                                                                      GQuark                 domain,
 | 
				
			||||||
                                                                      gint                   code,
 | 
					                                                                      gint                   code,
 | 
				
			||||||
                                                                      const gchar           *format,
 | 
					                                                                      const gchar           *format,
 | 
				
			||||||
                                                                      ...) G_GNUC_PRINTF(4, 5);
 | 
					                                                                      ...) G_GNUC_PRINTF(4, 5);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                   g_dbus_method_invocation_return_error_valist  (GDBusMethodInvocation *invocation,
 | 
					void                   g_dbus_method_invocation_return_error_valist  (GDBusMethodInvocation *invocation,
 | 
				
			||||||
                                                                      GQuark                 domain,
 | 
					                                                                      GQuark                 domain,
 | 
				
			||||||
                                                                      gint                   code,
 | 
					                                                                      gint                   code,
 | 
				
			||||||
                                                                      const gchar           *format,
 | 
					                                                                      const gchar           *format,
 | 
				
			||||||
                                                                      va_list                var_args)
 | 
					                                                                      va_list                var_args)
 | 
				
			||||||
                                                                      G_GNUC_PRINTF(4, 0);
 | 
					                                                                      G_GNUC_PRINTF(4, 0);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                   g_dbus_method_invocation_return_error_literal (GDBusMethodInvocation *invocation,
 | 
					void                   g_dbus_method_invocation_return_error_literal (GDBusMethodInvocation *invocation,
 | 
				
			||||||
                                                                      GQuark                 domain,
 | 
					                                                                      GQuark                 domain,
 | 
				
			||||||
                                                                      gint                   code,
 | 
					                                                                      gint                   code,
 | 
				
			||||||
                                                                      const gchar           *message);
 | 
					                                                                      const gchar           *message);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                   g_dbus_method_invocation_return_gerror        (GDBusMethodInvocation *invocation,
 | 
					void                   g_dbus_method_invocation_return_gerror        (GDBusMethodInvocation *invocation,
 | 
				
			||||||
                                                                      const GError          *error);
 | 
					                                                                      const GError          *error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                   g_dbus_method_invocation_take_error           (GDBusMethodInvocation *invocation,
 | 
					void                   g_dbus_method_invocation_take_error           (GDBusMethodInvocation *invocation,
 | 
				
			||||||
                                                                      GError                *error);
 | 
					                                                                      GError                *error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                   g_dbus_method_invocation_return_dbus_error    (GDBusMethodInvocation *invocation,
 | 
					void                   g_dbus_method_invocation_return_dbus_error    (GDBusMethodInvocation *invocation,
 | 
				
			||||||
                                                                      const gchar           *error_name,
 | 
					                                                                      const gchar           *error_name,
 | 
				
			||||||
                                                                      const gchar           *error_message);
 | 
					                                                                      const gchar           *error_message);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -74,6 +74,7 @@ typedef void (*GBusNameLostCallback) (GDBusConnection *connection,
 | 
				
			|||||||
                                      const gchar     *name,
 | 
					                                      const gchar     *name,
 | 
				
			||||||
                                      gpointer         user_data);
 | 
					                                      gpointer         user_data);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint g_bus_own_name                 (GBusType                  bus_type,
 | 
					guint g_bus_own_name                 (GBusType                  bus_type,
 | 
				
			||||||
                                      const gchar              *name,
 | 
					                                      const gchar              *name,
 | 
				
			||||||
                                      GBusNameOwnerFlags        flags,
 | 
					                                      GBusNameOwnerFlags        flags,
 | 
				
			||||||
@@ -83,6 +84,7 @@ guint g_bus_own_name                 (GBusType                  bus_type,
 | 
				
			|||||||
                                      gpointer                  user_data,
 | 
					                                      gpointer                  user_data,
 | 
				
			||||||
                                      GDestroyNotify            user_data_free_func);
 | 
					                                      GDestroyNotify            user_data_free_func);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint g_bus_own_name_on_connection   (GDBusConnection          *connection,
 | 
					guint g_bus_own_name_on_connection   (GDBusConnection          *connection,
 | 
				
			||||||
                                      const gchar              *name,
 | 
					                                      const gchar              *name,
 | 
				
			||||||
                                      GBusNameOwnerFlags        flags,
 | 
					                                      GBusNameOwnerFlags        flags,
 | 
				
			||||||
@@ -91,6 +93,7 @@ guint g_bus_own_name_on_connection   (GDBusConnection          *connection,
 | 
				
			|||||||
                                      gpointer                  user_data,
 | 
					                                      gpointer                  user_data,
 | 
				
			||||||
                                      GDestroyNotify            user_data_free_func);
 | 
					                                      GDestroyNotify            user_data_free_func);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint g_bus_own_name_with_closures   (GBusType                  bus_type,
 | 
					guint g_bus_own_name_with_closures   (GBusType                  bus_type,
 | 
				
			||||||
                                      const gchar              *name,
 | 
					                                      const gchar              *name,
 | 
				
			||||||
                                      GBusNameOwnerFlags        flags,
 | 
					                                      GBusNameOwnerFlags        flags,
 | 
				
			||||||
@@ -98,6 +101,7 @@ guint g_bus_own_name_with_closures   (GBusType                  bus_type,
 | 
				
			|||||||
                                      GClosure                 *name_acquired_closure,
 | 
					                                      GClosure                 *name_acquired_closure,
 | 
				
			||||||
                                      GClosure                 *name_lost_closure);
 | 
					                                      GClosure                 *name_lost_closure);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint g_bus_own_name_on_connection_with_closures (
 | 
					guint g_bus_own_name_on_connection_with_closures (
 | 
				
			||||||
                                      GDBusConnection          *connection,
 | 
					                                      GDBusConnection          *connection,
 | 
				
			||||||
                                      const gchar              *name,
 | 
					                                      const gchar              *name,
 | 
				
			||||||
@@ -105,6 +109,7 @@ guint g_bus_own_name_on_connection_with_closures (
 | 
				
			|||||||
                                      GClosure                 *name_acquired_closure,
 | 
					                                      GClosure                 *name_acquired_closure,
 | 
				
			||||||
                                      GClosure                 *name_lost_closure);
 | 
					                                      GClosure                 *name_lost_closure);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void  g_bus_unown_name               (guint                     owner_id);
 | 
					void  g_bus_unown_name               (guint                     owner_id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -67,6 +67,7 @@ typedef void (*GBusNameVanishedCallback) (GDBusConnection *connection,
 | 
				
			|||||||
                                          gpointer         user_data);
 | 
					                                          gpointer         user_data);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint g_bus_watch_name               (GBusType                  bus_type,
 | 
					guint g_bus_watch_name               (GBusType                  bus_type,
 | 
				
			||||||
                                      const gchar              *name,
 | 
					                                      const gchar              *name,
 | 
				
			||||||
                                      GBusNameWatcherFlags      flags,
 | 
					                                      GBusNameWatcherFlags      flags,
 | 
				
			||||||
@@ -74,6 +75,7 @@ guint g_bus_watch_name               (GBusType                  bus_type,
 | 
				
			|||||||
                                      GBusNameVanishedCallback  name_vanished_handler,
 | 
					                                      GBusNameVanishedCallback  name_vanished_handler,
 | 
				
			||||||
                                      gpointer                  user_data,
 | 
					                                      gpointer                  user_data,
 | 
				
			||||||
                                      GDestroyNotify            user_data_free_func);
 | 
					                                      GDestroyNotify            user_data_free_func);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint g_bus_watch_name_on_connection (GDBusConnection          *connection,
 | 
					guint g_bus_watch_name_on_connection (GDBusConnection          *connection,
 | 
				
			||||||
                                      const gchar              *name,
 | 
					                                      const gchar              *name,
 | 
				
			||||||
                                      GBusNameWatcherFlags      flags,
 | 
					                                      GBusNameWatcherFlags      flags,
 | 
				
			||||||
@@ -81,17 +83,20 @@ guint g_bus_watch_name_on_connection (GDBusConnection          *connection,
 | 
				
			|||||||
                                      GBusNameVanishedCallback  name_vanished_handler,
 | 
					                                      GBusNameVanishedCallback  name_vanished_handler,
 | 
				
			||||||
                                      gpointer                  user_data,
 | 
					                                      gpointer                  user_data,
 | 
				
			||||||
                                      GDestroyNotify            user_data_free_func);
 | 
					                                      GDestroyNotify            user_data_free_func);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint g_bus_watch_name_with_closures (GBusType                  bus_type,
 | 
					guint g_bus_watch_name_with_closures (GBusType                  bus_type,
 | 
				
			||||||
                                      const gchar              *name,
 | 
					                                      const gchar              *name,
 | 
				
			||||||
                                      GBusNameWatcherFlags      flags,
 | 
					                                      GBusNameWatcherFlags      flags,
 | 
				
			||||||
                                      GClosure                 *name_appeared_closure,
 | 
					                                      GClosure                 *name_appeared_closure,
 | 
				
			||||||
                                      GClosure                 *name_vanished_closure);
 | 
					                                      GClosure                 *name_vanished_closure);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint g_bus_watch_name_on_connection_with_closures (
 | 
					guint g_bus_watch_name_on_connection_with_closures (
 | 
				
			||||||
                                      GDBusConnection          *connection,
 | 
					                                      GDBusConnection          *connection,
 | 
				
			||||||
                                      const gchar              *name,
 | 
					                                      const gchar              *name,
 | 
				
			||||||
                                      GBusNameWatcherFlags      flags,
 | 
					                                      GBusNameWatcherFlags      flags,
 | 
				
			||||||
                                      GClosure                 *name_appeared_closure,
 | 
					                                      GClosure                 *name_appeared_closure,
 | 
				
			||||||
                                      GClosure                 *name_vanished_closure);
 | 
					                                      GClosure                 *name_vanished_closure);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void  g_bus_unwatch_name             (guint                     watcher_id);
 | 
					void  g_bus_unwatch_name             (guint                     watcher_id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -65,9 +65,13 @@ struct _GDBusObjectIface
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType            g_dbus_object_get_type        (void) G_GNUC_CONST;
 | 
					GType            g_dbus_object_get_type        (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar     *g_dbus_object_get_object_path (GDBusObject  *object);
 | 
					const gchar     *g_dbus_object_get_object_path (GDBusObject  *object);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GList           *g_dbus_object_get_interfaces  (GDBusObject  *object);
 | 
					GList           *g_dbus_object_get_interfaces  (GDBusObject  *object);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusInterface  *g_dbus_object_get_interface   (GDBusObject  *object,
 | 
					GDBusInterface  *g_dbus_object_get_interface   (GDBusObject  *object,
 | 
				
			||||||
                                                const gchar  *interface_name);
 | 
					                                                const gchar  *interface_name);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -77,11 +77,16 @@ struct _GDBusObjectManagerIface
 | 
				
			|||||||
                                           GDBusInterface       *interface_);
 | 
					                                           GDBusInterface       *interface_);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType            g_dbus_object_manager_get_type        (void) G_GNUC_CONST;
 | 
					GType            g_dbus_object_manager_get_type        (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar     *g_dbus_object_manager_get_object_path (GDBusObjectManager    *manager);
 | 
					const gchar     *g_dbus_object_manager_get_object_path (GDBusObjectManager    *manager);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GList           *g_dbus_object_manager_get_objects     (GDBusObjectManager    *manager);
 | 
					GList           *g_dbus_object_manager_get_objects     (GDBusObjectManager    *manager);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusObject     *g_dbus_object_manager_get_object      (GDBusObjectManager    *manager,
 | 
					GDBusObject     *g_dbus_object_manager_get_object      (GDBusObjectManager    *manager,
 | 
				
			||||||
                                                        const gchar           *object_path);
 | 
					                                                        const gchar           *object_path);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusInterface  *g_dbus_object_manager_get_interface   (GDBusObjectManager    *manager,
 | 
					GDBusInterface  *g_dbus_object_manager_get_interface   (GDBusObjectManager    *manager,
 | 
				
			||||||
                                                        const gchar           *object_path,
 | 
					                                                        const gchar           *object_path,
 | 
				
			||||||
                                                        const gchar           *interface_name);
 | 
					                                                        const gchar           *interface_name);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -84,7 +84,9 @@ struct _GDBusObjectManagerClientClass
 | 
				
			|||||||
  gpointer padding[8];
 | 
					  gpointer padding[8];
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                         g_dbus_object_manager_client_get_type           (void) G_GNUC_CONST;
 | 
					GType                         g_dbus_object_manager_client_get_type           (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                          g_dbus_object_manager_client_new                (GDBusConnection               *connection,
 | 
					void                          g_dbus_object_manager_client_new                (GDBusConnection               *connection,
 | 
				
			||||||
                                                                               GDBusObjectManagerClientFlags  flags,
 | 
					                                                                               GDBusObjectManagerClientFlags  flags,
 | 
				
			||||||
                                                                               const gchar                   *name,
 | 
					                                                                               const gchar                   *name,
 | 
				
			||||||
@@ -95,8 +97,10 @@ void                          g_dbus_object_manager_client_new                (G
 | 
				
			|||||||
                                                                               GCancellable                  *cancellable,
 | 
					                                                                               GCancellable                  *cancellable,
 | 
				
			||||||
                                                                               GAsyncReadyCallback            callback,
 | 
					                                                                               GAsyncReadyCallback            callback,
 | 
				
			||||||
                                                                               gpointer                       user_data);
 | 
					                                                                               gpointer                       user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusObjectManager           *g_dbus_object_manager_client_new_finish         (GAsyncResult                  *res,
 | 
					GDBusObjectManager           *g_dbus_object_manager_client_new_finish         (GAsyncResult                  *res,
 | 
				
			||||||
                                                                               GError                       **error);
 | 
					                                                                               GError                       **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusObjectManager           *g_dbus_object_manager_client_new_sync           (GDBusConnection               *connection,
 | 
					GDBusObjectManager           *g_dbus_object_manager_client_new_sync           (GDBusConnection               *connection,
 | 
				
			||||||
                                                                               GDBusObjectManagerClientFlags  flags,
 | 
					                                                                               GDBusObjectManagerClientFlags  flags,
 | 
				
			||||||
                                                                               const gchar                   *name,
 | 
					                                                                               const gchar                   *name,
 | 
				
			||||||
@@ -106,6 +110,7 @@ GDBusObjectManager           *g_dbus_object_manager_client_new_sync           (G
 | 
				
			|||||||
                                                                               GDestroyNotify                 get_proxy_type_destroy_notify,
 | 
					                                                                               GDestroyNotify                 get_proxy_type_destroy_notify,
 | 
				
			||||||
                                                                               GCancellable                  *cancellable,
 | 
					                                                                               GCancellable                  *cancellable,
 | 
				
			||||||
                                                                               GError                       **error);
 | 
					                                                                               GError                       **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                          g_dbus_object_manager_client_new_for_bus        (GBusType                       bus_type,
 | 
					void                          g_dbus_object_manager_client_new_for_bus        (GBusType                       bus_type,
 | 
				
			||||||
                                                                               GDBusObjectManagerClientFlags  flags,
 | 
					                                                                               GDBusObjectManagerClientFlags  flags,
 | 
				
			||||||
                                                                               const gchar                   *name,
 | 
					                                                                               const gchar                   *name,
 | 
				
			||||||
@@ -116,8 +121,10 @@ void                          g_dbus_object_manager_client_new_for_bus        (G
 | 
				
			|||||||
                                                                               GCancellable                  *cancellable,
 | 
					                                                                               GCancellable                  *cancellable,
 | 
				
			||||||
                                                                               GAsyncReadyCallback            callback,
 | 
					                                                                               GAsyncReadyCallback            callback,
 | 
				
			||||||
                                                                               gpointer                       user_data);
 | 
					                                                                               gpointer                       user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusObjectManager           *g_dbus_object_manager_client_new_for_bus_finish (GAsyncResult                  *res,
 | 
					GDBusObjectManager           *g_dbus_object_manager_client_new_for_bus_finish (GAsyncResult                  *res,
 | 
				
			||||||
                                                                               GError                       **error);
 | 
					                                                                               GError                       **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusObjectManager           *g_dbus_object_manager_client_new_for_bus_sync   (GBusType                       bus_type,
 | 
					GDBusObjectManager           *g_dbus_object_manager_client_new_for_bus_sync   (GBusType                       bus_type,
 | 
				
			||||||
                                                                               GDBusObjectManagerClientFlags  flags,
 | 
					                                                                               GDBusObjectManagerClientFlags  flags,
 | 
				
			||||||
                                                                               const gchar                   *name,
 | 
					                                                                               const gchar                   *name,
 | 
				
			||||||
@@ -127,9 +134,13 @@ GDBusObjectManager           *g_dbus_object_manager_client_new_for_bus_sync   (G
 | 
				
			|||||||
                                                                               GDestroyNotify                 get_proxy_type_destroy_notify,
 | 
					                                                                               GDestroyNotify                 get_proxy_type_destroy_notify,
 | 
				
			||||||
                                                                               GCancellable                  *cancellable,
 | 
					                                                                               GCancellable                  *cancellable,
 | 
				
			||||||
                                                                               GError                       **error);
 | 
					                                                                               GError                       **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusConnection              *g_dbus_object_manager_client_get_connection     (GDBusObjectManagerClient      *manager);
 | 
					GDBusConnection              *g_dbus_object_manager_client_get_connection     (GDBusObjectManagerClient      *manager);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusObjectManagerClientFlags g_dbus_object_manager_client_get_flags          (GDBusObjectManagerClient      *manager);
 | 
					GDBusObjectManagerClientFlags g_dbus_object_manager_client_get_flags          (GDBusObjectManagerClient      *manager);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar                  *g_dbus_object_manager_client_get_name           (GDBusObjectManagerClient      *manager);
 | 
					const gchar                  *g_dbus_object_manager_client_get_name           (GDBusObjectManagerClient      *manager);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar                        *g_dbus_object_manager_client_get_name_owner     (GDBusObjectManagerClient      *manager);
 | 
					gchar                        *g_dbus_object_manager_client_get_name_owner     (GDBusObjectManagerClient      *manager);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -68,17 +68,25 @@ struct _GDBusObjectManagerServerClass
 | 
				
			|||||||
  gpointer padding[8];
 | 
					  gpointer padding[8];
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                     g_dbus_object_manager_server_get_type            (void) G_GNUC_CONST;
 | 
					GType                     g_dbus_object_manager_server_get_type            (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusObjectManagerServer *g_dbus_object_manager_server_new                 (const gchar               *object_path);
 | 
					GDBusObjectManagerServer *g_dbus_object_manager_server_new                 (const gchar               *object_path);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusConnection          *g_dbus_object_manager_server_get_connection      (GDBusObjectManagerServer  *manager);
 | 
					GDBusConnection          *g_dbus_object_manager_server_get_connection      (GDBusObjectManagerServer  *manager);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                      g_dbus_object_manager_server_set_connection      (GDBusObjectManagerServer  *manager,
 | 
					void                      g_dbus_object_manager_server_set_connection      (GDBusObjectManagerServer  *manager,
 | 
				
			||||||
                                                                            GDBusConnection           *connection);
 | 
					                                                                            GDBusConnection           *connection);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                      g_dbus_object_manager_server_export              (GDBusObjectManagerServer  *manager,
 | 
					void                      g_dbus_object_manager_server_export              (GDBusObjectManagerServer  *manager,
 | 
				
			||||||
                                                                            GDBusObjectSkeleton       *object);
 | 
					                                                                            GDBusObjectSkeleton       *object);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                      g_dbus_object_manager_server_export_uniquely     (GDBusObjectManagerServer  *manager,
 | 
					void                      g_dbus_object_manager_server_export_uniquely     (GDBusObjectManagerServer  *manager,
 | 
				
			||||||
                                                                            GDBusObjectSkeleton       *object);
 | 
					                                                                            GDBusObjectSkeleton       *object);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                  g_dbus_object_manager_server_is_exported         (GDBusObjectManagerServer  *manager,
 | 
					gboolean                  g_dbus_object_manager_server_is_exported         (GDBusObjectManagerServer  *manager,
 | 
				
			||||||
                                                                            GDBusObjectSkeleton       *object);
 | 
					                                                                            GDBusObjectSkeleton       *object);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                  g_dbus_object_manager_server_unexport            (GDBusObjectManagerServer  *manager,
 | 
					gboolean                  g_dbus_object_manager_server_unexport            (GDBusObjectManagerServer  *manager,
 | 
				
			||||||
                                                                            const gchar               *object_path);
 | 
					                                                                            const gchar               *object_path);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -68,9 +68,12 @@ struct _GDBusObjectProxyClass
 | 
				
			|||||||
  gpointer padding[8];
 | 
					  gpointer padding[8];
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType             g_dbus_object_proxy_get_type       (void) G_GNUC_CONST;
 | 
					GType             g_dbus_object_proxy_get_type       (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusObjectProxy *g_dbus_object_proxy_new            (GDBusConnection   *connection,
 | 
					GDBusObjectProxy *g_dbus_object_proxy_new            (GDBusConnection   *connection,
 | 
				
			||||||
                                                      const gchar       *object_path);
 | 
					                                                      const gchar       *object_path);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusConnection  *g_dbus_object_proxy_get_connection (GDBusObjectProxy  *proxy);
 | 
					GDBusConnection  *g_dbus_object_proxy_get_connection (GDBusObjectProxy  *proxy);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -74,15 +74,22 @@ struct _GDBusObjectSkeletonClass
 | 
				
			|||||||
  gpointer padding[8];
 | 
					  gpointer padding[8];
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                g_dbus_object_skeleton_get_type                  (void) G_GNUC_CONST;
 | 
					GType                g_dbus_object_skeleton_get_type                  (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusObjectSkeleton *g_dbus_object_skeleton_new                       (const gchar            *object_path);
 | 
					GDBusObjectSkeleton *g_dbus_object_skeleton_new                       (const gchar            *object_path);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                 g_dbus_object_skeleton_flush                     (GDBusObjectSkeleton    *object);
 | 
					void                 g_dbus_object_skeleton_flush                     (GDBusObjectSkeleton    *object);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                 g_dbus_object_skeleton_add_interface             (GDBusObjectSkeleton    *object,
 | 
					void                 g_dbus_object_skeleton_add_interface             (GDBusObjectSkeleton    *object,
 | 
				
			||||||
                                                                       GDBusInterfaceSkeleton *interface_);
 | 
					                                                                       GDBusInterfaceSkeleton *interface_);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                 g_dbus_object_skeleton_remove_interface          (GDBusObjectSkeleton    *object,
 | 
					void                 g_dbus_object_skeleton_remove_interface          (GDBusObjectSkeleton    *object,
 | 
				
			||||||
                                                                       GDBusInterfaceSkeleton *interface_);
 | 
					                                                                       GDBusInterfaceSkeleton *interface_);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                 g_dbus_object_skeleton_remove_interface_by_name  (GDBusObjectSkeleton    *object,
 | 
					void                 g_dbus_object_skeleton_remove_interface_by_name  (GDBusObjectSkeleton    *object,
 | 
				
			||||||
                                                                       const gchar            *interface_name);
 | 
					                                                                       const gchar            *interface_name);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                 g_dbus_object_skeleton_set_object_path           (GDBusObjectSkeleton    *object,
 | 
					void                 g_dbus_object_skeleton_set_object_path           (GDBusObjectSkeleton    *object,
 | 
				
			||||||
                                                                       const gchar            *object_path);
 | 
					                                                                       const gchar            *object_path);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -86,7 +86,9 @@ struct _GDBusProxyClass
 | 
				
			|||||||
  gpointer padding[32];
 | 
					  gpointer padding[32];
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType            g_dbus_proxy_get_type                  (void) G_GNUC_CONST;
 | 
					GType            g_dbus_proxy_get_type                  (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void             g_dbus_proxy_new                       (GDBusConnection     *connection,
 | 
					void             g_dbus_proxy_new                       (GDBusConnection     *connection,
 | 
				
			||||||
                                                         GDBusProxyFlags      flags,
 | 
					                                                         GDBusProxyFlags      flags,
 | 
				
			||||||
                                                         GDBusInterfaceInfo *info,
 | 
					                                                         GDBusInterfaceInfo *info,
 | 
				
			||||||
@@ -96,8 +98,10 @@ void             g_dbus_proxy_new                       (GDBusConnection     *co
 | 
				
			|||||||
                                                         GCancellable        *cancellable,
 | 
					                                                         GCancellable        *cancellable,
 | 
				
			||||||
                                                         GAsyncReadyCallback  callback,
 | 
					                                                         GAsyncReadyCallback  callback,
 | 
				
			||||||
                                                         gpointer             user_data);
 | 
					                                                         gpointer             user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusProxy      *g_dbus_proxy_new_finish                (GAsyncResult        *res,
 | 
					GDBusProxy      *g_dbus_proxy_new_finish                (GAsyncResult        *res,
 | 
				
			||||||
                                                         GError             **error);
 | 
					                                                         GError             **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusProxy      *g_dbus_proxy_new_sync                  (GDBusConnection     *connection,
 | 
					GDBusProxy      *g_dbus_proxy_new_sync                  (GDBusConnection     *connection,
 | 
				
			||||||
                                                         GDBusProxyFlags      flags,
 | 
					                                                         GDBusProxyFlags      flags,
 | 
				
			||||||
                                                         GDBusInterfaceInfo *info,
 | 
					                                                         GDBusInterfaceInfo *info,
 | 
				
			||||||
@@ -106,6 +110,7 @@ GDBusProxy      *g_dbus_proxy_new_sync                  (GDBusConnection     *co
 | 
				
			|||||||
                                                         const gchar         *interface_name,
 | 
					                                                         const gchar         *interface_name,
 | 
				
			||||||
                                                         GCancellable        *cancellable,
 | 
					                                                         GCancellable        *cancellable,
 | 
				
			||||||
                                                         GError             **error);
 | 
					                                                         GError             **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void             g_dbus_proxy_new_for_bus               (GBusType             bus_type,
 | 
					void             g_dbus_proxy_new_for_bus               (GBusType             bus_type,
 | 
				
			||||||
                                                         GDBusProxyFlags      flags,
 | 
					                                                         GDBusProxyFlags      flags,
 | 
				
			||||||
                                                         GDBusInterfaceInfo *info,
 | 
					                                                         GDBusInterfaceInfo *info,
 | 
				
			||||||
@@ -115,8 +120,10 @@ void             g_dbus_proxy_new_for_bus               (GBusType             bu
 | 
				
			|||||||
                                                         GCancellable        *cancellable,
 | 
					                                                         GCancellable        *cancellable,
 | 
				
			||||||
                                                         GAsyncReadyCallback  callback,
 | 
					                                                         GAsyncReadyCallback  callback,
 | 
				
			||||||
                                                         gpointer             user_data);
 | 
					                                                         gpointer             user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusProxy      *g_dbus_proxy_new_for_bus_finish        (GAsyncResult        *res,
 | 
					GDBusProxy      *g_dbus_proxy_new_for_bus_finish        (GAsyncResult        *res,
 | 
				
			||||||
                                                         GError             **error);
 | 
					                                                         GError             **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusProxy      *g_dbus_proxy_new_for_bus_sync          (GBusType             bus_type,
 | 
					GDBusProxy      *g_dbus_proxy_new_for_bus_sync          (GBusType             bus_type,
 | 
				
			||||||
                                                         GDBusProxyFlags      flags,
 | 
					                                                         GDBusProxyFlags      flags,
 | 
				
			||||||
                                                         GDBusInterfaceInfo *info,
 | 
					                                                         GDBusInterfaceInfo *info,
 | 
				
			||||||
@@ -125,24 +132,38 @@ GDBusProxy      *g_dbus_proxy_new_for_bus_sync          (GBusType             bu
 | 
				
			|||||||
                                                         const gchar         *interface_name,
 | 
					                                                         const gchar         *interface_name,
 | 
				
			||||||
                                                         GCancellable        *cancellable,
 | 
					                                                         GCancellable        *cancellable,
 | 
				
			||||||
                                                         GError             **error);
 | 
					                                                         GError             **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusConnection *g_dbus_proxy_get_connection            (GDBusProxy          *proxy);
 | 
					GDBusConnection *g_dbus_proxy_get_connection            (GDBusProxy          *proxy);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusProxyFlags  g_dbus_proxy_get_flags                 (GDBusProxy          *proxy);
 | 
					GDBusProxyFlags  g_dbus_proxy_get_flags                 (GDBusProxy          *proxy);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar     *g_dbus_proxy_get_name                  (GDBusProxy          *proxy);
 | 
					const gchar     *g_dbus_proxy_get_name                  (GDBusProxy          *proxy);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar           *g_dbus_proxy_get_name_owner            (GDBusProxy          *proxy);
 | 
					gchar           *g_dbus_proxy_get_name_owner            (GDBusProxy          *proxy);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar     *g_dbus_proxy_get_object_path           (GDBusProxy          *proxy);
 | 
					const gchar     *g_dbus_proxy_get_object_path           (GDBusProxy          *proxy);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar     *g_dbus_proxy_get_interface_name        (GDBusProxy          *proxy);
 | 
					const gchar     *g_dbus_proxy_get_interface_name        (GDBusProxy          *proxy);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gint             g_dbus_proxy_get_default_timeout       (GDBusProxy          *proxy);
 | 
					gint             g_dbus_proxy_get_default_timeout       (GDBusProxy          *proxy);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void             g_dbus_proxy_set_default_timeout       (GDBusProxy          *proxy,
 | 
					void             g_dbus_proxy_set_default_timeout       (GDBusProxy          *proxy,
 | 
				
			||||||
                                                         gint                 timeout_msec);
 | 
					                                                         gint                 timeout_msec);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusInterfaceInfo *g_dbus_proxy_get_interface_info     (GDBusProxy          *proxy);
 | 
					GDBusInterfaceInfo *g_dbus_proxy_get_interface_info     (GDBusProxy          *proxy);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void             g_dbus_proxy_set_interface_info        (GDBusProxy           *proxy,
 | 
					void             g_dbus_proxy_set_interface_info        (GDBusProxy           *proxy,
 | 
				
			||||||
                                                         GDBusInterfaceInfo   *info);
 | 
					                                                         GDBusInterfaceInfo   *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GVariant        *g_dbus_proxy_get_cached_property       (GDBusProxy          *proxy,
 | 
					GVariant        *g_dbus_proxy_get_cached_property       (GDBusProxy          *proxy,
 | 
				
			||||||
                                                         const gchar         *property_name);
 | 
					                                                         const gchar         *property_name);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void             g_dbus_proxy_set_cached_property       (GDBusProxy          *proxy,
 | 
					void             g_dbus_proxy_set_cached_property       (GDBusProxy          *proxy,
 | 
				
			||||||
                                                         const gchar         *property_name,
 | 
					                                                         const gchar         *property_name,
 | 
				
			||||||
                                                         GVariant            *value);
 | 
					                                                         GVariant            *value);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar          **g_dbus_proxy_get_cached_property_names (GDBusProxy          *proxy);
 | 
					gchar          **g_dbus_proxy_get_cached_property_names (GDBusProxy          *proxy);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void             g_dbus_proxy_call                      (GDBusProxy          *proxy,
 | 
					void             g_dbus_proxy_call                      (GDBusProxy          *proxy,
 | 
				
			||||||
                                                         const gchar         *method_name,
 | 
					                                                         const gchar         *method_name,
 | 
				
			||||||
                                                         GVariant            *parameters,
 | 
					                                                         GVariant            *parameters,
 | 
				
			||||||
@@ -151,9 +172,11 @@ void             g_dbus_proxy_call                      (GDBusProxy          *pr
 | 
				
			|||||||
                                                         GCancellable        *cancellable,
 | 
					                                                         GCancellable        *cancellable,
 | 
				
			||||||
                                                         GAsyncReadyCallback  callback,
 | 
					                                                         GAsyncReadyCallback  callback,
 | 
				
			||||||
                                                         gpointer             user_data);
 | 
					                                                         gpointer             user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GVariant        *g_dbus_proxy_call_finish               (GDBusProxy          *proxy,
 | 
					GVariant        *g_dbus_proxy_call_finish               (GDBusProxy          *proxy,
 | 
				
			||||||
                                                         GAsyncResult        *res,
 | 
					                                                         GAsyncResult        *res,
 | 
				
			||||||
                                                         GError             **error);
 | 
					                                                         GError             **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GVariant        *g_dbus_proxy_call_sync                 (GDBusProxy          *proxy,
 | 
					GVariant        *g_dbus_proxy_call_sync                 (GDBusProxy          *proxy,
 | 
				
			||||||
                                                         const gchar         *method_name,
 | 
					                                                         const gchar         *method_name,
 | 
				
			||||||
                                                         GVariant            *parameters,
 | 
					                                                         GVariant            *parameters,
 | 
				
			||||||
@@ -162,6 +185,7 @@ GVariant        *g_dbus_proxy_call_sync                 (GDBusProxy          *pr
 | 
				
			|||||||
                                                         GCancellable        *cancellable,
 | 
					                                                         GCancellable        *cancellable,
 | 
				
			||||||
                                                         GError             **error);
 | 
					                                                         GError             **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void             g_dbus_proxy_call_with_unix_fd_list        (GDBusProxy          *proxy,
 | 
					void             g_dbus_proxy_call_with_unix_fd_list        (GDBusProxy          *proxy,
 | 
				
			||||||
                                                             const gchar         *method_name,
 | 
					                                                             const gchar         *method_name,
 | 
				
			||||||
                                                             GVariant            *parameters,
 | 
					                                                             GVariant            *parameters,
 | 
				
			||||||
@@ -171,10 +195,12 @@ void             g_dbus_proxy_call_with_unix_fd_list        (GDBusProxy
 | 
				
			|||||||
                                                             GCancellable        *cancellable,
 | 
					                                                             GCancellable        *cancellable,
 | 
				
			||||||
                                                             GAsyncReadyCallback  callback,
 | 
					                                                             GAsyncReadyCallback  callback,
 | 
				
			||||||
                                                             gpointer             user_data);
 | 
					                                                             gpointer             user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GVariant        *g_dbus_proxy_call_with_unix_fd_list_finish (GDBusProxy          *proxy,
 | 
					GVariant        *g_dbus_proxy_call_with_unix_fd_list_finish (GDBusProxy          *proxy,
 | 
				
			||||||
                                                             GUnixFDList        **out_fd_list,
 | 
					                                                             GUnixFDList        **out_fd_list,
 | 
				
			||||||
                                                             GAsyncResult        *res,
 | 
					                                                             GAsyncResult        *res,
 | 
				
			||||||
                                                             GError             **error);
 | 
					                                                             GError             **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GVariant        *g_dbus_proxy_call_with_unix_fd_list_sync   (GDBusProxy          *proxy,
 | 
					GVariant        *g_dbus_proxy_call_with_unix_fd_list_sync   (GDBusProxy          *proxy,
 | 
				
			||||||
                                                             const gchar         *method_name,
 | 
					                                                             const gchar         *method_name,
 | 
				
			||||||
                                                             GVariant            *parameters,
 | 
					                                                             GVariant            *parameters,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -35,18 +35,26 @@ G_BEGIN_DECLS
 | 
				
			|||||||
#define G_DBUS_SERVER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_SERVER, GDBusServer))
 | 
					#define G_DBUS_SERVER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_SERVER, GDBusServer))
 | 
				
			||||||
#define G_IS_DBUS_SERVER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_SERVER))
 | 
					#define G_IS_DBUS_SERVER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_SERVER))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType             g_dbus_server_get_type           (void) G_GNUC_CONST;
 | 
					GType             g_dbus_server_get_type           (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusServer      *g_dbus_server_new_sync           (const gchar       *address,
 | 
					GDBusServer      *g_dbus_server_new_sync           (const gchar       *address,
 | 
				
			||||||
                                                    GDBusServerFlags   flags,
 | 
					                                                    GDBusServerFlags   flags,
 | 
				
			||||||
                                                    const gchar       *guid,
 | 
					                                                    const gchar       *guid,
 | 
				
			||||||
                                                    GDBusAuthObserver *observer,
 | 
					                                                    GDBusAuthObserver *observer,
 | 
				
			||||||
                                                    GCancellable      *cancellable,
 | 
					                                                    GCancellable      *cancellable,
 | 
				
			||||||
                                                    GError           **error);
 | 
					                                                    GError           **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar      *g_dbus_server_get_client_address (GDBusServer       *server);
 | 
					const gchar      *g_dbus_server_get_client_address (GDBusServer       *server);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar      *g_dbus_server_get_guid           (GDBusServer       *server);
 | 
					const gchar      *g_dbus_server_get_guid           (GDBusServer       *server);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDBusServerFlags  g_dbus_server_get_flags          (GDBusServer       *server);
 | 
					GDBusServerFlags  g_dbus_server_get_flags          (GDBusServer       *server);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void              g_dbus_server_start              (GDBusServer       *server);
 | 
					void              g_dbus_server_start              (GDBusServer       *server);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void              g_dbus_server_stop               (GDBusServer       *server);
 | 
					void              g_dbus_server_stop               (GDBusServer       *server);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean          g_dbus_server_is_active          (GDBusServer       *server);
 | 
					gboolean          g_dbus_server_is_active          (GDBusServer       *server);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -31,16 +31,24 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
G_BEGIN_DECLS
 | 
					G_BEGIN_DECLS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_dbus_is_guid (const gchar *string);
 | 
					gboolean g_dbus_is_guid (const gchar *string);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar *g_dbus_generate_guid (void);
 | 
					gchar *g_dbus_generate_guid (void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_dbus_is_name (const gchar *string);
 | 
					gboolean g_dbus_is_name (const gchar *string);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_dbus_is_unique_name (const gchar *string);
 | 
					gboolean g_dbus_is_unique_name (const gchar *string);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_dbus_is_member_name (const gchar *string);
 | 
					gboolean g_dbus_is_member_name (const gchar *string);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_dbus_is_interface_name (const gchar *string);
 | 
					gboolean g_dbus_is_interface_name (const gchar *string);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void g_dbus_gvariant_to_gvalue (GVariant  *value,
 | 
					void g_dbus_gvariant_to_gvalue (GVariant  *value,
 | 
				
			||||||
                                GValue    *out_gvalue);
 | 
					                                GValue    *out_gvalue);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GVariant *g_dbus_gvalue_to_gvariant (const GValue         *gvalue,
 | 
					GVariant *g_dbus_gvalue_to_gvariant (const GValue         *gvalue,
 | 
				
			||||||
                                     const GVariantType   *type);
 | 
					                                     const GVariantType   *type);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -43,11 +43,15 @@ struct _GDesktopAppInfoClass
 | 
				
			|||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType            g_desktop_app_info_get_type          (void) G_GNUC_CONST;
 | 
					GType            g_desktop_app_info_get_type          (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDesktopAppInfo *g_desktop_app_info_new_from_filename (const char      *filename);
 | 
					GDesktopAppInfo *g_desktop_app_info_new_from_filename (const char      *filename);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDesktopAppInfo *g_desktop_app_info_new_from_keyfile  (GKeyFile        *key_file);
 | 
					GDesktopAppInfo *g_desktop_app_info_new_from_keyfile  (GKeyFile        *key_file);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const char *     g_desktop_app_info_get_filename      (GDesktopAppInfo *info);
 | 
					const char *     g_desktop_app_info_get_filename      (GDesktopAppInfo *info);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GLIB_AVAILABLE_IN_2_30
 | 
					GLIB_AVAILABLE_IN_2_30
 | 
				
			||||||
@@ -64,9 +68,12 @@ gboolean         g_desktop_app_info_get_show_in       (GDesktopAppInfo *info,
 | 
				
			|||||||
GLIB_AVAILABLE_IN_2_34
 | 
					GLIB_AVAILABLE_IN_2_34
 | 
				
			||||||
const char *     g_desktop_app_info_get_startup_wm_class (GDesktopAppInfo *info);
 | 
					const char *     g_desktop_app_info_get_startup_wm_class (GDesktopAppInfo *info);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDesktopAppInfo *g_desktop_app_info_new               (const char      *desktop_id);
 | 
					GDesktopAppInfo *g_desktop_app_info_new               (const char      *desktop_id);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean         g_desktop_app_info_get_is_hidden     (GDesktopAppInfo *info);
 | 
					gboolean         g_desktop_app_info_get_is_hidden     (GDesktopAppInfo *info);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void             g_desktop_app_info_set_desktop_env   (const char      *desktop_env);
 | 
					void             g_desktop_app_info_set_desktop_env   (const char      *desktop_env);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GLIB_AVAILABLE_IN_2_36
 | 
					GLIB_AVAILABLE_IN_2_36
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										25
									
								
								gio/gdrive.h
									
									
									
									
									
								
							
							
						
						
									
										25
									
								
								gio/gdrive.h
									
									
									
									
									
								
							@@ -159,17 +159,28 @@ struct _GDriveIface
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType    g_drive_get_type                 (void) G_GNUC_CONST;
 | 
					GType    g_drive_get_type                 (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char *   g_drive_get_name                 (GDrive               *drive);
 | 
					char *   g_drive_get_name                 (GDrive               *drive);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIcon *  g_drive_get_icon                 (GDrive               *drive);
 | 
					GIcon *  g_drive_get_icon                 (GDrive               *drive);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIcon *  g_drive_get_symbolic_icon        (GDrive               *drive);
 | 
					GIcon *  g_drive_get_symbolic_icon        (GDrive               *drive);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_drive_has_volumes              (GDrive               *drive);
 | 
					gboolean g_drive_has_volumes              (GDrive               *drive);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GList *  g_drive_get_volumes              (GDrive               *drive);
 | 
					GList *  g_drive_get_volumes              (GDrive               *drive);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_drive_is_media_removable       (GDrive               *drive);
 | 
					gboolean g_drive_is_media_removable       (GDrive               *drive);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_drive_has_media                (GDrive               *drive);
 | 
					gboolean g_drive_has_media                (GDrive               *drive);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_drive_is_media_check_automatic (GDrive               *drive);
 | 
					gboolean g_drive_is_media_check_automatic (GDrive               *drive);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_drive_can_poll_for_media       (GDrive               *drive);
 | 
					gboolean g_drive_can_poll_for_media       (GDrive               *drive);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_drive_can_eject                (GDrive               *drive);
 | 
					gboolean g_drive_can_eject                (GDrive               *drive);
 | 
				
			||||||
GLIB_DEPRECATED_FOR(g_drive_eject_with_operation)
 | 
					GLIB_DEPRECATED_FOR(g_drive_eject_with_operation)
 | 
				
			||||||
void     g_drive_eject                    (GDrive               *drive,
 | 
					void     g_drive_eject                    (GDrive               *drive,
 | 
				
			||||||
@@ -182,48 +193,62 @@ GLIB_DEPRECATED_FOR(g_drive_eject_with_operation_finish)
 | 
				
			|||||||
gboolean g_drive_eject_finish             (GDrive               *drive,
 | 
					gboolean g_drive_eject_finish             (GDrive               *drive,
 | 
				
			||||||
                                           GAsyncResult         *result,
 | 
					                                           GAsyncResult         *result,
 | 
				
			||||||
                                           GError              **error);
 | 
					                                           GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void     g_drive_poll_for_media           (GDrive               *drive,
 | 
					void     g_drive_poll_for_media           (GDrive               *drive,
 | 
				
			||||||
                                           GCancellable         *cancellable,
 | 
					                                           GCancellable         *cancellable,
 | 
				
			||||||
                                           GAsyncReadyCallback   callback,
 | 
					                                           GAsyncReadyCallback   callback,
 | 
				
			||||||
                                           gpointer              user_data);
 | 
					                                           gpointer              user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_drive_poll_for_media_finish    (GDrive               *drive,
 | 
					gboolean g_drive_poll_for_media_finish    (GDrive               *drive,
 | 
				
			||||||
                                           GAsyncResult         *result,
 | 
					                                           GAsyncResult         *result,
 | 
				
			||||||
                                           GError              **error);
 | 
					                                           GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char *   g_drive_get_identifier           (GDrive              *drive,
 | 
					char *   g_drive_get_identifier           (GDrive              *drive,
 | 
				
			||||||
                                           const char          *kind);
 | 
					                                           const char          *kind);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char **  g_drive_enumerate_identifiers    (GDrive              *drive);
 | 
					char **  g_drive_enumerate_identifiers    (GDrive              *drive);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDriveStartStopType g_drive_get_start_stop_type (GDrive        *drive);
 | 
					GDriveStartStopType g_drive_get_start_stop_type (GDrive        *drive);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_drive_can_start                (GDrive              *drive);
 | 
					gboolean g_drive_can_start                (GDrive              *drive);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_drive_can_start_degraded       (GDrive              *drive);
 | 
					gboolean g_drive_can_start_degraded       (GDrive              *drive);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void     g_drive_start                    (GDrive              *drive,
 | 
					void     g_drive_start                    (GDrive              *drive,
 | 
				
			||||||
                                           GDriveStartFlags     flags,
 | 
					                                           GDriveStartFlags     flags,
 | 
				
			||||||
                                           GMountOperation     *mount_operation,
 | 
					                                           GMountOperation     *mount_operation,
 | 
				
			||||||
                                           GCancellable        *cancellable,
 | 
					                                           GCancellable        *cancellable,
 | 
				
			||||||
                                           GAsyncReadyCallback  callback,
 | 
					                                           GAsyncReadyCallback  callback,
 | 
				
			||||||
                                           gpointer             user_data);
 | 
					                                           gpointer             user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_drive_start_finish             (GDrive               *drive,
 | 
					gboolean g_drive_start_finish             (GDrive               *drive,
 | 
				
			||||||
                                           GAsyncResult         *result,
 | 
					                                           GAsyncResult         *result,
 | 
				
			||||||
                                           GError              **error);
 | 
					                                           GError              **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_drive_can_stop                 (GDrive               *drive);
 | 
					gboolean g_drive_can_stop                 (GDrive               *drive);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void     g_drive_stop                     (GDrive               *drive,
 | 
					void     g_drive_stop                     (GDrive               *drive,
 | 
				
			||||||
                                           GMountUnmountFlags    flags,
 | 
					                                           GMountUnmountFlags    flags,
 | 
				
			||||||
                                           GMountOperation      *mount_operation,
 | 
					                                           GMountOperation      *mount_operation,
 | 
				
			||||||
                                           GCancellable         *cancellable,
 | 
					                                           GCancellable         *cancellable,
 | 
				
			||||||
                                           GAsyncReadyCallback   callback,
 | 
					                                           GAsyncReadyCallback   callback,
 | 
				
			||||||
                                           gpointer              user_data);
 | 
					                                           gpointer              user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_drive_stop_finish              (GDrive               *drive,
 | 
					gboolean g_drive_stop_finish              (GDrive               *drive,
 | 
				
			||||||
                                           GAsyncResult         *result,
 | 
					                                           GAsyncResult         *result,
 | 
				
			||||||
                                           GError              **error);
 | 
					                                           GError              **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void        g_drive_eject_with_operation      (GDrive              *drive,
 | 
					void        g_drive_eject_with_operation      (GDrive              *drive,
 | 
				
			||||||
                                               GMountUnmountFlags   flags,
 | 
					                                               GMountUnmountFlags   flags,
 | 
				
			||||||
                                               GMountOperation     *mount_operation,
 | 
					                                               GMountOperation     *mount_operation,
 | 
				
			||||||
                                               GCancellable        *cancellable,
 | 
					                                               GCancellable        *cancellable,
 | 
				
			||||||
                                               GAsyncReadyCallback  callback,
 | 
					                                               GAsyncReadyCallback  callback,
 | 
				
			||||||
                                               gpointer             user_data);
 | 
					                                               gpointer             user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean    g_drive_eject_with_operation_finish (GDrive            *drive,
 | 
					gboolean    g_drive_eject_with_operation_finish (GDrive            *drive,
 | 
				
			||||||
                                               GAsyncResult        *result,
 | 
					                                               GAsyncResult        *result,
 | 
				
			||||||
                                               GError             **error);
 | 
					                                               GError             **error);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -45,12 +45,17 @@ G_BEGIN_DECLS
 | 
				
			|||||||
typedef struct _GEmblem        GEmblem;
 | 
					typedef struct _GEmblem        GEmblem;
 | 
				
			||||||
typedef struct _GEmblemClass   GEmblemClass;
 | 
					typedef struct _GEmblemClass   GEmblemClass;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType          g_emblem_get_type        (void) G_GNUC_CONST;
 | 
					GType          g_emblem_get_type        (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GEmblem       *g_emblem_new             (GIcon         *icon);
 | 
					GEmblem       *g_emblem_new             (GIcon         *icon);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GEmblem       *g_emblem_new_with_origin (GIcon         *icon,
 | 
					GEmblem       *g_emblem_new_with_origin (GIcon         *icon,
 | 
				
			||||||
                                         GEmblemOrigin  origin);
 | 
					                                         GEmblemOrigin  origin);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIcon         *g_emblem_get_icon        (GEmblem       *emblem);
 | 
					GIcon         *g_emblem_get_icon        (GEmblem       *emblem);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GEmblemOrigin  g_emblem_get_origin      (GEmblem       *emblem);
 | 
					GEmblemOrigin  g_emblem_get_origin      (GEmblem       *emblem);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -62,14 +62,20 @@ struct _GEmblemedIconClass
 | 
				
			|||||||
  GObjectClass parent_class;
 | 
					  GObjectClass parent_class;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType  g_emblemed_icon_get_type    (void) G_GNUC_CONST;
 | 
					GType  g_emblemed_icon_get_type    (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIcon *g_emblemed_icon_new         (GIcon         *icon,
 | 
					GIcon *g_emblemed_icon_new         (GIcon         *icon,
 | 
				
			||||||
                                    GEmblem       *emblem);
 | 
					                                    GEmblem       *emblem);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIcon *g_emblemed_icon_get_icon    (GEmblemedIcon *emblemed);
 | 
					GIcon *g_emblemed_icon_get_icon    (GEmblemedIcon *emblemed);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GList *g_emblemed_icon_get_emblems (GEmblemedIcon *emblemed);
 | 
					GList *g_emblemed_icon_get_emblems (GEmblemedIcon *emblemed);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void   g_emblemed_icon_add_emblem  (GEmblemedIcon *emblemed,
 | 
					void   g_emblemed_icon_add_emblem  (GEmblemedIcon *emblemed,
 | 
				
			||||||
                                    GEmblem       *emblem);
 | 
					                                    GEmblem       *emblem);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void   g_emblemed_icon_clear_emblems  (GEmblemedIcon *emblemed);
 | 
					void   g_emblemed_icon_clear_emblems  (GEmblemedIcon *emblemed);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										109
									
								
								gio/gfile.h
									
									
									
									
									
								
							
							
						
						
									
										109
									
								
								gio/gfile.h
									
									
									
									
									
								
							@@ -551,10 +551,14 @@ struct _GFileIface
 | 
				
			|||||||
                                                       GError              **error);
 | 
					                                                       GError              **error);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                   g_file_get_type                   (void) G_GNUC_CONST;
 | 
					GType                   g_file_get_type                   (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFile *                 g_file_new_for_path               (const char                 *path);
 | 
					GFile *                 g_file_new_for_path               (const char                 *path);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFile *                 g_file_new_for_uri                (const char                 *uri);
 | 
					GFile *                 g_file_new_for_uri                (const char                 *uri);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFile *                 g_file_new_for_commandline_arg    (const char                 *arg);
 | 
					GFile *                 g_file_new_for_commandline_arg    (const char                 *arg);
 | 
				
			||||||
GLIB_AVAILABLE_IN_2_36
 | 
					GLIB_AVAILABLE_IN_2_36
 | 
				
			||||||
GFile *                 g_file_new_for_commandline_arg_and_cwd (const gchar           *arg,
 | 
					GFile *                 g_file_new_for_commandline_arg_and_cwd (const gchar           *arg,
 | 
				
			||||||
@@ -563,76 +567,105 @@ GLIB_AVAILABLE_IN_2_32
 | 
				
			|||||||
GFile *                 g_file_new_tmp                    (const char                 *tmpl,
 | 
					GFile *                 g_file_new_tmp                    (const char                 *tmpl,
 | 
				
			||||||
                                                           GFileIOStream             **iostream,
 | 
					                                                           GFileIOStream             **iostream,
 | 
				
			||||||
                                                           GError                    **error);
 | 
					                                                           GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFile *                 g_file_parse_name                 (const char                 *parse_name);
 | 
					GFile *                 g_file_parse_name                 (const char                 *parse_name);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFile *                 g_file_dup                        (GFile                      *file);
 | 
					GFile *                 g_file_dup                        (GFile                      *file);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint                   g_file_hash                       (gconstpointer               file);
 | 
					guint                   g_file_hash                       (gconstpointer               file);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_equal                      (GFile                      *file1,
 | 
					gboolean                g_file_equal                      (GFile                      *file1,
 | 
				
			||||||
							   GFile                      *file2);
 | 
												   GFile                      *file2);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char *                  g_file_get_basename               (GFile                      *file);
 | 
					char *                  g_file_get_basename               (GFile                      *file);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char *                  g_file_get_path                   (GFile                      *file);
 | 
					char *                  g_file_get_path                   (GFile                      *file);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char *                  g_file_get_uri                    (GFile                      *file);
 | 
					char *                  g_file_get_uri                    (GFile                      *file);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char *                  g_file_get_parse_name             (GFile                      *file);
 | 
					char *                  g_file_get_parse_name             (GFile                      *file);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFile *                 g_file_get_parent                 (GFile                      *file);
 | 
					GFile *                 g_file_get_parent                 (GFile                      *file);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_has_parent                 (GFile                      *file,
 | 
					gboolean                g_file_has_parent                 (GFile                      *file,
 | 
				
			||||||
                                                           GFile                      *parent);
 | 
					                                                           GFile                      *parent);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFile *                 g_file_get_child                  (GFile                      *file,
 | 
					GFile *                 g_file_get_child                  (GFile                      *file,
 | 
				
			||||||
							   const char                 *name);
 | 
												   const char                 *name);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFile *                 g_file_get_child_for_display_name (GFile                      *file,
 | 
					GFile *                 g_file_get_child_for_display_name (GFile                      *file,
 | 
				
			||||||
							   const char                 *display_name,
 | 
												   const char                 *display_name,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_has_prefix                 (GFile                      *file,
 | 
					gboolean                g_file_has_prefix                 (GFile                      *file,
 | 
				
			||||||
							   GFile                      *prefix);
 | 
												   GFile                      *prefix);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char *                  g_file_get_relative_path          (GFile                      *parent,
 | 
					char *                  g_file_get_relative_path          (GFile                      *parent,
 | 
				
			||||||
							   GFile                      *descendant);
 | 
												   GFile                      *descendant);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFile *                 g_file_resolve_relative_path      (GFile                      *file,
 | 
					GFile *                 g_file_resolve_relative_path      (GFile                      *file,
 | 
				
			||||||
							   const char                 *relative_path);
 | 
												   const char                 *relative_path);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_is_native                  (GFile                      *file);
 | 
					gboolean                g_file_is_native                  (GFile                      *file);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_has_uri_scheme             (GFile                      *file,
 | 
					gboolean                g_file_has_uri_scheme             (GFile                      *file,
 | 
				
			||||||
							   const char                 *uri_scheme);
 | 
												   const char                 *uri_scheme);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char *                  g_file_get_uri_scheme             (GFile                      *file);
 | 
					char *                  g_file_get_uri_scheme             (GFile                      *file);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileInputStream *      g_file_read                       (GFile                      *file,
 | 
					GFileInputStream *      g_file_read                       (GFile                      *file,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_file_read_async                 (GFile                      *file,
 | 
					void                    g_file_read_async                 (GFile                      *file,
 | 
				
			||||||
							   int                         io_priority,
 | 
												   int                         io_priority,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GAsyncReadyCallback         callback,
 | 
												   GAsyncReadyCallback         callback,
 | 
				
			||||||
							   gpointer                    user_data);
 | 
												   gpointer                    user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileInputStream *      g_file_read_finish                (GFile                      *file,
 | 
					GFileInputStream *      g_file_read_finish                (GFile                      *file,
 | 
				
			||||||
							   GAsyncResult               *res,
 | 
												   GAsyncResult               *res,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileOutputStream *     g_file_append_to                  (GFile                      *file,
 | 
					GFileOutputStream *     g_file_append_to                  (GFile                      *file,
 | 
				
			||||||
							   GFileCreateFlags             flags,
 | 
												   GFileCreateFlags             flags,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileOutputStream *     g_file_create                     (GFile                      *file,
 | 
					GFileOutputStream *     g_file_create                     (GFile                      *file,
 | 
				
			||||||
							   GFileCreateFlags             flags,
 | 
												   GFileCreateFlags             flags,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileOutputStream *     g_file_replace                    (GFile                      *file,
 | 
					GFileOutputStream *     g_file_replace                    (GFile                      *file,
 | 
				
			||||||
							   const char                 *etag,
 | 
												   const char                 *etag,
 | 
				
			||||||
							   gboolean                    make_backup,
 | 
												   gboolean                    make_backup,
 | 
				
			||||||
							   GFileCreateFlags            flags,
 | 
												   GFileCreateFlags            flags,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_file_append_to_async            (GFile                      *file,
 | 
					void                    g_file_append_to_async            (GFile                      *file,
 | 
				
			||||||
							   GFileCreateFlags            flags,
 | 
												   GFileCreateFlags            flags,
 | 
				
			||||||
							   int                         io_priority,
 | 
												   int                         io_priority,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GAsyncReadyCallback         callback,
 | 
												   GAsyncReadyCallback         callback,
 | 
				
			||||||
							   gpointer                    user_data);
 | 
												   gpointer                    user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileOutputStream *     g_file_append_to_finish           (GFile                      *file,
 | 
					GFileOutputStream *     g_file_append_to_finish           (GFile                      *file,
 | 
				
			||||||
							   GAsyncResult               *res,
 | 
												   GAsyncResult               *res,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_file_create_async               (GFile                      *file,
 | 
					void                    g_file_create_async               (GFile                      *file,
 | 
				
			||||||
							   GFileCreateFlags            flags,
 | 
												   GFileCreateFlags            flags,
 | 
				
			||||||
							   int                         io_priority,
 | 
												   int                         io_priority,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GAsyncReadyCallback         callback,
 | 
												   GAsyncReadyCallback         callback,
 | 
				
			||||||
							   gpointer                    user_data);
 | 
												   gpointer                    user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileOutputStream *     g_file_create_finish              (GFile                      *file,
 | 
					GFileOutputStream *     g_file_create_finish              (GFile                      *file,
 | 
				
			||||||
							   GAsyncResult               *res,
 | 
												   GAsyncResult               *res,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_file_replace_async              (GFile                      *file,
 | 
					void                    g_file_replace_async              (GFile                      *file,
 | 
				
			||||||
							   const char                 *etag,
 | 
												   const char                 *etag,
 | 
				
			||||||
							   gboolean                    make_backup,
 | 
												   gboolean                    make_backup,
 | 
				
			||||||
@@ -641,39 +674,48 @@ void                    g_file_replace_async              (GFile
 | 
				
			|||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GAsyncReadyCallback         callback,
 | 
												   GAsyncReadyCallback         callback,
 | 
				
			||||||
							   gpointer                    user_data);
 | 
												   gpointer                    user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileOutputStream *     g_file_replace_finish             (GFile                      *file,
 | 
					GFileOutputStream *     g_file_replace_finish             (GFile                      *file,
 | 
				
			||||||
							   GAsyncResult               *res,
 | 
												   GAsyncResult               *res,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileIOStream *         g_file_open_readwrite             (GFile                      *file,
 | 
					GFileIOStream *         g_file_open_readwrite             (GFile                      *file,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_file_open_readwrite_async       (GFile                      *file,
 | 
					void                    g_file_open_readwrite_async       (GFile                      *file,
 | 
				
			||||||
							   int                         io_priority,
 | 
												   int                         io_priority,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GAsyncReadyCallback         callback,
 | 
												   GAsyncReadyCallback         callback,
 | 
				
			||||||
							   gpointer                    user_data);
 | 
												   gpointer                    user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileIOStream *         g_file_open_readwrite_finish      (GFile                      *file,
 | 
					GFileIOStream *         g_file_open_readwrite_finish      (GFile                      *file,
 | 
				
			||||||
							   GAsyncResult               *res,
 | 
												   GAsyncResult               *res,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileIOStream *         g_file_create_readwrite           (GFile                      *file,
 | 
					GFileIOStream *         g_file_create_readwrite           (GFile                      *file,
 | 
				
			||||||
							   GFileCreateFlags            flags,
 | 
												   GFileCreateFlags            flags,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_file_create_readwrite_async     (GFile                      *file,
 | 
					void                    g_file_create_readwrite_async     (GFile                      *file,
 | 
				
			||||||
							   GFileCreateFlags            flags,
 | 
												   GFileCreateFlags            flags,
 | 
				
			||||||
							   int                         io_priority,
 | 
												   int                         io_priority,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GAsyncReadyCallback         callback,
 | 
												   GAsyncReadyCallback         callback,
 | 
				
			||||||
							   gpointer                    user_data);
 | 
												   gpointer                    user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileIOStream *         g_file_create_readwrite_finish    (GFile                      *file,
 | 
					GFileIOStream *         g_file_create_readwrite_finish    (GFile                      *file,
 | 
				
			||||||
							   GAsyncResult               *res,
 | 
												   GAsyncResult               *res,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileIOStream *         g_file_replace_readwrite          (GFile                      *file,
 | 
					GFileIOStream *         g_file_replace_readwrite          (GFile                      *file,
 | 
				
			||||||
							   const char                 *etag,
 | 
												   const char                 *etag,
 | 
				
			||||||
							   gboolean                    make_backup,
 | 
												   gboolean                    make_backup,
 | 
				
			||||||
							   GFileCreateFlags            flags,
 | 
												   GFileCreateFlags            flags,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_file_replace_readwrite_async    (GFile                      *file,
 | 
					void                    g_file_replace_readwrite_async    (GFile                      *file,
 | 
				
			||||||
							   const char                 *etag,
 | 
												   const char                 *etag,
 | 
				
			||||||
							   gboolean                    make_backup,
 | 
												   gboolean                    make_backup,
 | 
				
			||||||
@@ -682,19 +724,24 @@ void                    g_file_replace_readwrite_async    (GFile
 | 
				
			|||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GAsyncReadyCallback         callback,
 | 
												   GAsyncReadyCallback         callback,
 | 
				
			||||||
							   gpointer                    user_data);
 | 
												   gpointer                    user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileIOStream *         g_file_replace_readwrite_finish   (GFile                      *file,
 | 
					GFileIOStream *         g_file_replace_readwrite_finish   (GFile                      *file,
 | 
				
			||||||
							   GAsyncResult               *res,
 | 
												   GAsyncResult               *res,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_query_exists               (GFile                      *file,
 | 
					gboolean                g_file_query_exists               (GFile                      *file,
 | 
				
			||||||
							   GCancellable               *cancellable);
 | 
												   GCancellable               *cancellable);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileType               g_file_query_file_type            (GFile                      *file,
 | 
					GFileType               g_file_query_file_type            (GFile                      *file,
 | 
				
			||||||
                                                           GFileQueryInfoFlags         flags,
 | 
					                                                           GFileQueryInfoFlags         flags,
 | 
				
			||||||
                                                           GCancellable               *cancellable);
 | 
					                                                           GCancellable               *cancellable);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileInfo *             g_file_query_info                 (GFile                      *file,
 | 
					GFileInfo *             g_file_query_info                 (GFile                      *file,
 | 
				
			||||||
							   const char                 *attributes,
 | 
												   const char                 *attributes,
 | 
				
			||||||
							   GFileQueryInfoFlags         flags,
 | 
												   GFileQueryInfoFlags         flags,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_file_query_info_async           (GFile                      *file,
 | 
					void                    g_file_query_info_async           (GFile                      *file,
 | 
				
			||||||
							   const char                 *attributes,
 | 
												   const char                 *attributes,
 | 
				
			||||||
							   GFileQueryInfoFlags         flags,
 | 
												   GFileQueryInfoFlags         flags,
 | 
				
			||||||
@@ -702,38 +749,47 @@ void                    g_file_query_info_async           (GFile
 | 
				
			|||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GAsyncReadyCallback         callback,
 | 
												   GAsyncReadyCallback         callback,
 | 
				
			||||||
							   gpointer                    user_data);
 | 
												   gpointer                    user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileInfo *             g_file_query_info_finish          (GFile                      *file,
 | 
					GFileInfo *             g_file_query_info_finish          (GFile                      *file,
 | 
				
			||||||
							   GAsyncResult               *res,
 | 
												   GAsyncResult               *res,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileInfo *             g_file_query_filesystem_info      (GFile                      *file,
 | 
					GFileInfo *             g_file_query_filesystem_info      (GFile                      *file,
 | 
				
			||||||
							   const char                 *attributes,
 | 
												   const char                 *attributes,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_file_query_filesystem_info_async (GFile                      *file,
 | 
					void                    g_file_query_filesystem_info_async (GFile                      *file,
 | 
				
			||||||
							   const char                 *attributes,
 | 
												   const char                 *attributes,
 | 
				
			||||||
							   int                         io_priority,
 | 
												   int                         io_priority,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GAsyncReadyCallback         callback,
 | 
												   GAsyncReadyCallback         callback,
 | 
				
			||||||
							   gpointer                    user_data);
 | 
												   gpointer                    user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileInfo *             g_file_query_filesystem_info_finish (GFile                      *file,
 | 
					GFileInfo *             g_file_query_filesystem_info_finish (GFile                      *file,
 | 
				
			||||||
                                                           GAsyncResult               *res,
 | 
					                                                           GAsyncResult               *res,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GMount *                g_file_find_enclosing_mount       (GFile                      *file,
 | 
					GMount *                g_file_find_enclosing_mount       (GFile                      *file,
 | 
				
			||||||
                                                           GCancellable               *cancellable,
 | 
					                                                           GCancellable               *cancellable,
 | 
				
			||||||
                                                           GError                    **error);
 | 
					                                                           GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_file_find_enclosing_mount_async (GFile                      *file,
 | 
					void                    g_file_find_enclosing_mount_async (GFile                      *file,
 | 
				
			||||||
							   int                         io_priority,
 | 
												   int                         io_priority,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GAsyncReadyCallback         callback,
 | 
												   GAsyncReadyCallback         callback,
 | 
				
			||||||
							   gpointer                    user_data);
 | 
												   gpointer                    user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GMount *                g_file_find_enclosing_mount_finish (GFile                     *file,
 | 
					GMount *                g_file_find_enclosing_mount_finish (GFile                     *file,
 | 
				
			||||||
							    GAsyncResult              *res,
 | 
												    GAsyncResult              *res,
 | 
				
			||||||
							    GError                   **error);
 | 
												    GError                   **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileEnumerator *       g_file_enumerate_children         (GFile                      *file,
 | 
					GFileEnumerator *       g_file_enumerate_children         (GFile                      *file,
 | 
				
			||||||
							   const char                 *attributes,
 | 
												   const char                 *attributes,
 | 
				
			||||||
							   GFileQueryInfoFlags         flags,
 | 
												   GFileQueryInfoFlags         flags,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_file_enumerate_children_async   (GFile                      *file,
 | 
					void                    g_file_enumerate_children_async   (GFile                      *file,
 | 
				
			||||||
							   const char                 *attributes,
 | 
												   const char                 *attributes,
 | 
				
			||||||
							   GFileQueryInfoFlags         flags,
 | 
												   GFileQueryInfoFlags         flags,
 | 
				
			||||||
@@ -741,22 +797,27 @@ void                    g_file_enumerate_children_async   (GFile
 | 
				
			|||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GAsyncReadyCallback         callback,
 | 
												   GAsyncReadyCallback         callback,
 | 
				
			||||||
							   gpointer                    user_data);
 | 
												   gpointer                    user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileEnumerator *       g_file_enumerate_children_finish  (GFile                      *file,
 | 
					GFileEnumerator *       g_file_enumerate_children_finish  (GFile                      *file,
 | 
				
			||||||
							   GAsyncResult               *res,
 | 
												   GAsyncResult               *res,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFile *                 g_file_set_display_name           (GFile                      *file,
 | 
					GFile *                 g_file_set_display_name           (GFile                      *file,
 | 
				
			||||||
							   const char                 *display_name,
 | 
												   const char                 *display_name,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_file_set_display_name_async     (GFile                      *file,
 | 
					void                    g_file_set_display_name_async     (GFile                      *file,
 | 
				
			||||||
							   const char                 *display_name,
 | 
												   const char                 *display_name,
 | 
				
			||||||
							   int                         io_priority,
 | 
												   int                         io_priority,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GAsyncReadyCallback         callback,
 | 
												   GAsyncReadyCallback         callback,
 | 
				
			||||||
							   gpointer                    user_data);
 | 
												   gpointer                    user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFile *                 g_file_set_display_name_finish    (GFile                      *file,
 | 
					GFile *                 g_file_set_display_name_finish    (GFile                      *file,
 | 
				
			||||||
							   GAsyncResult               *res,
 | 
												   GAsyncResult               *res,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_delete                     (GFile                      *file,
 | 
					gboolean                g_file_delete                     (GFile                      *file,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
@@ -773,9 +834,11 @@ gboolean                g_file_delete_finish              (GFile
 | 
				
			|||||||
							   GAsyncResult               *result,
 | 
												   GAsyncResult               *result,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_trash                      (GFile                      *file,
 | 
					gboolean                g_file_trash                      (GFile                      *file,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_copy                       (GFile                      *source,
 | 
					gboolean                g_file_copy                       (GFile                      *source,
 | 
				
			||||||
							   GFile                      *destination,
 | 
												   GFile                      *destination,
 | 
				
			||||||
							   GFileCopyFlags              flags,
 | 
												   GFileCopyFlags              flags,
 | 
				
			||||||
@@ -783,6 +846,7 @@ gboolean                g_file_copy                       (GFile
 | 
				
			|||||||
							   GFileProgressCallback       progress_callback,
 | 
												   GFileProgressCallback       progress_callback,
 | 
				
			||||||
							   gpointer                    progress_callback_data,
 | 
												   gpointer                    progress_callback_data,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_file_copy_async                 (GFile                      *source,
 | 
					void                    g_file_copy_async                 (GFile                      *source,
 | 
				
			||||||
							   GFile                      *destination,
 | 
												   GFile                      *destination,
 | 
				
			||||||
							   GFileCopyFlags              flags,
 | 
												   GFileCopyFlags              flags,
 | 
				
			||||||
@@ -792,9 +856,11 @@ void                    g_file_copy_async                 (GFile
 | 
				
			|||||||
							   gpointer                    progress_callback_data,
 | 
												   gpointer                    progress_callback_data,
 | 
				
			||||||
							   GAsyncReadyCallback         callback,
 | 
												   GAsyncReadyCallback         callback,
 | 
				
			||||||
							   gpointer                    user_data);
 | 
												   gpointer                    user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_copy_finish                (GFile                      *file,
 | 
					gboolean                g_file_copy_finish                (GFile                      *file,
 | 
				
			||||||
							   GAsyncResult               *res,
 | 
												   GAsyncResult               *res,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_move                       (GFile                      *source,
 | 
					gboolean                g_file_move                       (GFile                      *source,
 | 
				
			||||||
							   GFile                      *destination,
 | 
												   GFile                      *destination,
 | 
				
			||||||
							   GFileCopyFlags              flags,
 | 
												   GFileCopyFlags              flags,
 | 
				
			||||||
@@ -802,22 +868,28 @@ gboolean                g_file_move                       (GFile
 | 
				
			|||||||
							   GFileProgressCallback       progress_callback,
 | 
												   GFileProgressCallback       progress_callback,
 | 
				
			||||||
							   gpointer                    progress_callback_data,
 | 
												   gpointer                    progress_callback_data,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_make_directory             (GFile                      *file,
 | 
					gboolean                g_file_make_directory             (GFile                      *file,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_make_directory_with_parents (GFile                     *file,
 | 
					gboolean                g_file_make_directory_with_parents (GFile                     *file,
 | 
				
			||||||
		                                           GCancellable               *cancellable,
 | 
							                                           GCancellable               *cancellable,
 | 
				
			||||||
		                                           GError                    **error);
 | 
							                                           GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_make_symbolic_link         (GFile                      *file,
 | 
					gboolean                g_file_make_symbolic_link         (GFile                      *file,
 | 
				
			||||||
							   const char                 *symlink_value,
 | 
												   const char                 *symlink_value,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileAttributeInfoList *g_file_query_settable_attributes  (GFile                      *file,
 | 
					GFileAttributeInfoList *g_file_query_settable_attributes  (GFile                      *file,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileAttributeInfoList *g_file_query_writable_namespaces  (GFile                      *file,
 | 
					GFileAttributeInfoList *g_file_query_writable_namespaces  (GFile                      *file,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_set_attribute              (GFile                      *file,
 | 
					gboolean                g_file_set_attribute              (GFile                      *file,
 | 
				
			||||||
							   const char                 *attribute,
 | 
												   const char                 *attribute,
 | 
				
			||||||
							   GFileAttributeType          type,
 | 
												   GFileAttributeType          type,
 | 
				
			||||||
@@ -825,11 +897,13 @@ gboolean                g_file_set_attribute              (GFile
 | 
				
			|||||||
							   GFileQueryInfoFlags         flags,
 | 
												   GFileQueryInfoFlags         flags,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_set_attributes_from_info   (GFile                      *file,
 | 
					gboolean                g_file_set_attributes_from_info   (GFile                      *file,
 | 
				
			||||||
							   GFileInfo                  *info,
 | 
												   GFileInfo                  *info,
 | 
				
			||||||
							   GFileQueryInfoFlags         flags,
 | 
												   GFileQueryInfoFlags         flags,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_file_set_attributes_async       (GFile                      *file,
 | 
					void                    g_file_set_attributes_async       (GFile                      *file,
 | 
				
			||||||
							   GFileInfo                  *info,
 | 
												   GFileInfo                  *info,
 | 
				
			||||||
							   GFileQueryInfoFlags         flags,
 | 
												   GFileQueryInfoFlags         flags,
 | 
				
			||||||
@@ -837,61 +911,72 @@ void                    g_file_set_attributes_async       (GFile
 | 
				
			|||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GAsyncReadyCallback         callback,
 | 
												   GAsyncReadyCallback         callback,
 | 
				
			||||||
							   gpointer                    user_data);
 | 
												   gpointer                    user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_set_attributes_finish      (GFile                      *file,
 | 
					gboolean                g_file_set_attributes_finish      (GFile                      *file,
 | 
				
			||||||
							   GAsyncResult               *result,
 | 
												   GAsyncResult               *result,
 | 
				
			||||||
							   GFileInfo                 **info,
 | 
												   GFileInfo                 **info,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_set_attribute_string       (GFile                      *file,
 | 
					gboolean                g_file_set_attribute_string       (GFile                      *file,
 | 
				
			||||||
							   const char                 *attribute,
 | 
												   const char                 *attribute,
 | 
				
			||||||
							   const char                 *value,
 | 
												   const char                 *value,
 | 
				
			||||||
							   GFileQueryInfoFlags         flags,
 | 
												   GFileQueryInfoFlags         flags,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_set_attribute_byte_string  (GFile                      *file,
 | 
					gboolean                g_file_set_attribute_byte_string  (GFile                      *file,
 | 
				
			||||||
							   const char                 *attribute,
 | 
												   const char                 *attribute,
 | 
				
			||||||
							   const char                 *value,
 | 
												   const char                 *value,
 | 
				
			||||||
							   GFileQueryInfoFlags         flags,
 | 
												   GFileQueryInfoFlags         flags,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_set_attribute_uint32       (GFile                      *file,
 | 
					gboolean                g_file_set_attribute_uint32       (GFile                      *file,
 | 
				
			||||||
							   const char                 *attribute,
 | 
												   const char                 *attribute,
 | 
				
			||||||
							   guint32                     value,
 | 
												   guint32                     value,
 | 
				
			||||||
							   GFileQueryInfoFlags         flags,
 | 
												   GFileQueryInfoFlags         flags,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_set_attribute_int32        (GFile                      *file,
 | 
					gboolean                g_file_set_attribute_int32        (GFile                      *file,
 | 
				
			||||||
							   const char                 *attribute,
 | 
												   const char                 *attribute,
 | 
				
			||||||
							   gint32                      value,
 | 
												   gint32                      value,
 | 
				
			||||||
							   GFileQueryInfoFlags         flags,
 | 
												   GFileQueryInfoFlags         flags,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_set_attribute_uint64       (GFile                      *file,
 | 
					gboolean                g_file_set_attribute_uint64       (GFile                      *file,
 | 
				
			||||||
							   const char                 *attribute,
 | 
												   const char                 *attribute,
 | 
				
			||||||
							   guint64                     value,
 | 
												   guint64                     value,
 | 
				
			||||||
							   GFileQueryInfoFlags         flags,
 | 
												   GFileQueryInfoFlags         flags,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_set_attribute_int64        (GFile                      *file,
 | 
					gboolean                g_file_set_attribute_int64        (GFile                      *file,
 | 
				
			||||||
							   const char                 *attribute,
 | 
												   const char                 *attribute,
 | 
				
			||||||
							   gint64                      value,
 | 
												   gint64                      value,
 | 
				
			||||||
							   GFileQueryInfoFlags         flags,
 | 
												   GFileQueryInfoFlags         flags,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_file_mount_enclosing_volume     (GFile                      *location,
 | 
					void                    g_file_mount_enclosing_volume     (GFile                      *location,
 | 
				
			||||||
							   GMountMountFlags            flags,
 | 
												   GMountMountFlags            flags,
 | 
				
			||||||
							   GMountOperation            *mount_operation,
 | 
												   GMountOperation            *mount_operation,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GAsyncReadyCallback         callback,
 | 
												   GAsyncReadyCallback         callback,
 | 
				
			||||||
							   gpointer                    user_data);
 | 
												   gpointer                    user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_mount_enclosing_volume_finish (GFile                      *location,
 | 
					gboolean                g_file_mount_enclosing_volume_finish (GFile                      *location,
 | 
				
			||||||
							   GAsyncResult               *result,
 | 
												   GAsyncResult               *result,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_file_mount_mountable            (GFile                      *file,
 | 
					void                    g_file_mount_mountable            (GFile                      *file,
 | 
				
			||||||
							   GMountMountFlags            flags,
 | 
												   GMountMountFlags            flags,
 | 
				
			||||||
							   GMountOperation            *mount_operation,
 | 
												   GMountOperation            *mount_operation,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GAsyncReadyCallback         callback,
 | 
												   GAsyncReadyCallback         callback,
 | 
				
			||||||
							   gpointer                    user_data);
 | 
												   gpointer                    user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFile *                 g_file_mount_mountable_finish     (GFile                      *file,
 | 
					GFile *                 g_file_mount_mountable_finish     (GFile                      *file,
 | 
				
			||||||
							   GAsyncResult               *result,
 | 
												   GAsyncResult               *result,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
@@ -906,12 +991,14 @@ GLIB_DEPRECATED_FOR(g_file_unmount_mountable_with_operation_finish)
 | 
				
			|||||||
gboolean                g_file_unmount_mountable_finish   (GFile                      *file,
 | 
					gboolean                g_file_unmount_mountable_finish   (GFile                      *file,
 | 
				
			||||||
                                                           GAsyncResult               *result,
 | 
					                                                           GAsyncResult               *result,
 | 
				
			||||||
                                                           GError                    **error);
 | 
					                                                           GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_file_unmount_mountable_with_operation (GFile                *file,
 | 
					void                    g_file_unmount_mountable_with_operation (GFile                *file,
 | 
				
			||||||
							   GMountUnmountFlags          flags,
 | 
												   GMountUnmountFlags          flags,
 | 
				
			||||||
							   GMountOperation            *mount_operation,
 | 
												   GMountOperation            *mount_operation,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GAsyncReadyCallback         callback,
 | 
												   GAsyncReadyCallback         callback,
 | 
				
			||||||
							   gpointer                    user_data);
 | 
												   gpointer                    user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_unmount_mountable_with_operation_finish (GFile         *file,
 | 
					gboolean                g_file_unmount_mountable_with_operation_finish (GFile         *file,
 | 
				
			||||||
							   GAsyncResult               *result,
 | 
												   GAsyncResult               *result,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
@@ -926,16 +1013,19 @@ GLIB_DEPRECATED_FOR(g_file_eject_mountable_with_operation_finish)
 | 
				
			|||||||
gboolean                g_file_eject_mountable_finish     (GFile                      *file,
 | 
					gboolean                g_file_eject_mountable_finish     (GFile                      *file,
 | 
				
			||||||
                                                           GAsyncResult               *result,
 | 
					                                                           GAsyncResult               *result,
 | 
				
			||||||
                                                           GError                    **error);
 | 
					                                                           GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_file_eject_mountable_with_operation (GFile                  *file,
 | 
					void                    g_file_eject_mountable_with_operation (GFile                  *file,
 | 
				
			||||||
							   GMountUnmountFlags          flags,
 | 
												   GMountUnmountFlags          flags,
 | 
				
			||||||
							   GMountOperation            *mount_operation,
 | 
												   GMountOperation            *mount_operation,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GAsyncReadyCallback         callback,
 | 
												   GAsyncReadyCallback         callback,
 | 
				
			||||||
							   gpointer                    user_data);
 | 
												   gpointer                    user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_eject_mountable_with_operation_finish (GFile           *file,
 | 
					gboolean                g_file_eject_mountable_with_operation_finish (GFile           *file,
 | 
				
			||||||
							   GAsyncResult               *result,
 | 
												   GAsyncResult               *result,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_copy_attributes            (GFile                      *source,
 | 
					gboolean                g_file_copy_attributes            (GFile                      *source,
 | 
				
			||||||
							   GFile                      *destination,
 | 
												   GFile                      *destination,
 | 
				
			||||||
							   GFileCopyFlags              flags,
 | 
												   GFileCopyFlags              flags,
 | 
				
			||||||
@@ -943,78 +1033,94 @@ gboolean                g_file_copy_attributes            (GFile
 | 
				
			|||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileMonitor*           g_file_monitor_directory          (GFile                  *file,
 | 
					GFileMonitor*           g_file_monitor_directory          (GFile                  *file,
 | 
				
			||||||
							   GFileMonitorFlags       flags,
 | 
												   GFileMonitorFlags       flags,
 | 
				
			||||||
							   GCancellable           *cancellable,
 | 
												   GCancellable           *cancellable,
 | 
				
			||||||
							   GError                **error);
 | 
												   GError                **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileMonitor*           g_file_monitor_file               (GFile                  *file,
 | 
					GFileMonitor*           g_file_monitor_file               (GFile                  *file,
 | 
				
			||||||
							   GFileMonitorFlags       flags,
 | 
												   GFileMonitorFlags       flags,
 | 
				
			||||||
							   GCancellable           *cancellable,
 | 
												   GCancellable           *cancellable,
 | 
				
			||||||
							   GError                **error);
 | 
												   GError                **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileMonitor*           g_file_monitor                    (GFile                  *file,
 | 
					GFileMonitor*           g_file_monitor                    (GFile                  *file,
 | 
				
			||||||
							   GFileMonitorFlags       flags,
 | 
												   GFileMonitorFlags       flags,
 | 
				
			||||||
							   GCancellable           *cancellable,
 | 
												   GCancellable           *cancellable,
 | 
				
			||||||
							   GError                **error);
 | 
												   GError                **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_file_start_mountable            (GFile                      *file,
 | 
					void                    g_file_start_mountable            (GFile                      *file,
 | 
				
			||||||
							   GDriveStartFlags            flags,
 | 
												   GDriveStartFlags            flags,
 | 
				
			||||||
							   GMountOperation            *start_operation,
 | 
												   GMountOperation            *start_operation,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GAsyncReadyCallback         callback,
 | 
												   GAsyncReadyCallback         callback,
 | 
				
			||||||
							   gpointer                    user_data);
 | 
												   gpointer                    user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_start_mountable_finish     (GFile                      *file,
 | 
					gboolean                g_file_start_mountable_finish     (GFile                      *file,
 | 
				
			||||||
							   GAsyncResult               *result,
 | 
												   GAsyncResult               *result,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_file_stop_mountable             (GFile                      *file,
 | 
					void                    g_file_stop_mountable             (GFile                      *file,
 | 
				
			||||||
							   GMountUnmountFlags          flags,
 | 
												   GMountUnmountFlags          flags,
 | 
				
			||||||
                                                           GMountOperation            *mount_operation,
 | 
					                                                           GMountOperation            *mount_operation,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GAsyncReadyCallback         callback,
 | 
												   GAsyncReadyCallback         callback,
 | 
				
			||||||
							   gpointer                    user_data);
 | 
												   gpointer                    user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_stop_mountable_finish      (GFile                      *file,
 | 
					gboolean                g_file_stop_mountable_finish      (GFile                      *file,
 | 
				
			||||||
							   GAsyncResult               *result,
 | 
												   GAsyncResult               *result,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_file_poll_mountable             (GFile                      *file,
 | 
					void                    g_file_poll_mountable             (GFile                      *file,
 | 
				
			||||||
							   GCancellable               *cancellable,
 | 
												   GCancellable               *cancellable,
 | 
				
			||||||
							   GAsyncReadyCallback         callback,
 | 
												   GAsyncReadyCallback         callback,
 | 
				
			||||||
							   gpointer                    user_data);
 | 
												   gpointer                    user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_file_poll_mountable_finish      (GFile                      *file,
 | 
					gboolean                g_file_poll_mountable_finish      (GFile                      *file,
 | 
				
			||||||
							   GAsyncResult               *result,
 | 
												   GAsyncResult               *result,
 | 
				
			||||||
							   GError                    **error);
 | 
												   GError                    **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Utilities */
 | 
					/* Utilities */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GAppInfo *g_file_query_default_handler       (GFile                  *file,
 | 
					GAppInfo *g_file_query_default_handler       (GFile                  *file,
 | 
				
			||||||
					      GCancellable           *cancellable,
 | 
										      GCancellable           *cancellable,
 | 
				
			||||||
					      GError                **error);
 | 
										      GError                **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_file_load_contents                (GFile                  *file,
 | 
					gboolean g_file_load_contents                (GFile                  *file,
 | 
				
			||||||
					      GCancellable           *cancellable,
 | 
										      GCancellable           *cancellable,
 | 
				
			||||||
					      char                  **contents,
 | 
										      char                  **contents,
 | 
				
			||||||
					      gsize                  *length,
 | 
										      gsize                  *length,
 | 
				
			||||||
					      char                  **etag_out,
 | 
										      char                  **etag_out,
 | 
				
			||||||
					      GError                **error);
 | 
										      GError                **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void     g_file_load_contents_async          (GFile                  *file,
 | 
					void     g_file_load_contents_async          (GFile                  *file,
 | 
				
			||||||
					      GCancellable           *cancellable,
 | 
										      GCancellable           *cancellable,
 | 
				
			||||||
					      GAsyncReadyCallback     callback,
 | 
										      GAsyncReadyCallback     callback,
 | 
				
			||||||
					      gpointer                user_data);
 | 
										      gpointer                user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_file_load_contents_finish         (GFile                  *file,
 | 
					gboolean g_file_load_contents_finish         (GFile                  *file,
 | 
				
			||||||
					      GAsyncResult           *res,
 | 
										      GAsyncResult           *res,
 | 
				
			||||||
					      char                  **contents,
 | 
										      char                  **contents,
 | 
				
			||||||
					      gsize                  *length,
 | 
										      gsize                  *length,
 | 
				
			||||||
					      char                  **etag_out,
 | 
										      char                  **etag_out,
 | 
				
			||||||
					      GError                **error);
 | 
										      GError                **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void     g_file_load_partial_contents_async  (GFile                  *file,
 | 
					void     g_file_load_partial_contents_async  (GFile                  *file,
 | 
				
			||||||
					      GCancellable           *cancellable,
 | 
										      GCancellable           *cancellable,
 | 
				
			||||||
					      GFileReadMoreCallback   read_more_callback,
 | 
										      GFileReadMoreCallback   read_more_callback,
 | 
				
			||||||
					      GAsyncReadyCallback     callback,
 | 
										      GAsyncReadyCallback     callback,
 | 
				
			||||||
					      gpointer                user_data);
 | 
										      gpointer                user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_file_load_partial_contents_finish (GFile                  *file,
 | 
					gboolean g_file_load_partial_contents_finish (GFile                  *file,
 | 
				
			||||||
					      GAsyncResult           *res,
 | 
										      GAsyncResult           *res,
 | 
				
			||||||
					      char                  **contents,
 | 
										      char                  **contents,
 | 
				
			||||||
					      gsize                  *length,
 | 
										      gsize                  *length,
 | 
				
			||||||
					      char                  **etag_out,
 | 
										      char                  **etag_out,
 | 
				
			||||||
					      GError                **error);
 | 
										      GError                **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_file_replace_contents             (GFile                  *file,
 | 
					gboolean g_file_replace_contents             (GFile                  *file,
 | 
				
			||||||
					      const char             *contents,
 | 
										      const char             *contents,
 | 
				
			||||||
					      gsize                   length,
 | 
										      gsize                   length,
 | 
				
			||||||
@@ -1024,6 +1130,7 @@ gboolean g_file_replace_contents             (GFile                  *file,
 | 
				
			|||||||
					      char                  **new_etag,
 | 
										      char                  **new_etag,
 | 
				
			||||||
					      GCancellable           *cancellable,
 | 
										      GCancellable           *cancellable,
 | 
				
			||||||
					      GError                **error);
 | 
										      GError                **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void     g_file_replace_contents_async       (GFile                  *file,
 | 
					void     g_file_replace_contents_async       (GFile                  *file,
 | 
				
			||||||
					      const char             *contents,
 | 
										      const char             *contents,
 | 
				
			||||||
					      gsize                   length,
 | 
										      gsize                   length,
 | 
				
			||||||
@@ -1033,11 +1140,13 @@ void     g_file_replace_contents_async       (GFile                  *file,
 | 
				
			|||||||
					      GCancellable           *cancellable,
 | 
										      GCancellable           *cancellable,
 | 
				
			||||||
					      GAsyncReadyCallback     callback,
 | 
										      GAsyncReadyCallback     callback,
 | 
				
			||||||
					      gpointer                user_data);
 | 
										      gpointer                user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_file_replace_contents_finish      (GFile                  *file,
 | 
					gboolean g_file_replace_contents_finish      (GFile                  *file,
 | 
				
			||||||
					      GAsyncResult           *res,
 | 
										      GAsyncResult           *res,
 | 
				
			||||||
					      char                  **new_etag,
 | 
										      char                  **new_etag,
 | 
				
			||||||
					      GError                **error);
 | 
										      GError                **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_file_supports_thread_contexts     (GFile                  *file);
 | 
					gboolean g_file_supports_thread_contexts     (GFile                  *file);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -61,14 +61,21 @@ struct _GFileAttributeInfoList
 | 
				
			|||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define G_TYPE_FILE_ATTRIBUTE_INFO_LIST (g_file_attribute_info_list_get_type ())
 | 
					#define G_TYPE_FILE_ATTRIBUTE_INFO_LIST (g_file_attribute_info_list_get_type ())
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType g_file_attribute_info_list_get_type (void);
 | 
					GType g_file_attribute_info_list_get_type (void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileAttributeInfoList *  g_file_attribute_info_list_new    (void);
 | 
					GFileAttributeInfoList *  g_file_attribute_info_list_new    (void);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileAttributeInfoList *  g_file_attribute_info_list_ref    (GFileAttributeInfoList *list);
 | 
					GFileAttributeInfoList *  g_file_attribute_info_list_ref    (GFileAttributeInfoList *list);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                      g_file_attribute_info_list_unref  (GFileAttributeInfoList *list);
 | 
					void                      g_file_attribute_info_list_unref  (GFileAttributeInfoList *list);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileAttributeInfoList *  g_file_attribute_info_list_dup    (GFileAttributeInfoList *list);
 | 
					GFileAttributeInfoList *  g_file_attribute_info_list_dup    (GFileAttributeInfoList *list);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const GFileAttributeInfo *g_file_attribute_info_list_lookup (GFileAttributeInfoList *list,
 | 
					const GFileAttributeInfo *g_file_attribute_info_list_lookup (GFileAttributeInfoList *list,
 | 
				
			||||||
							     const char             *name);
 | 
												     const char             *name);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                      g_file_attribute_info_list_add    (GFileAttributeInfoList *list,
 | 
					void                      g_file_attribute_info_list_add    (GFileAttributeInfoList *list,
 | 
				
			||||||
							     const char             *name,
 | 
												     const char             *name,
 | 
				
			||||||
							     GFileAttributeType      type,
 | 
												     GFileAttributeType      type,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -52,8 +52,10 @@ struct _GFileDescriptorBasedIface
 | 
				
			|||||||
  int (*get_fd) (GFileDescriptorBased *fd_based);
 | 
					  int (*get_fd) (GFileDescriptorBased *fd_based);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType    g_file_descriptor_based_get_type     (void) G_GNUC_CONST;
 | 
					GType    g_file_descriptor_based_get_type     (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
int      g_file_descriptor_based_get_fd       (GFileDescriptorBased *fd_based);
 | 
					int      g_file_descriptor_based_get_fd       (GFileDescriptorBased *fd_based);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -96,35 +96,46 @@ struct _GFileEnumeratorClass
 | 
				
			|||||||
  void (*_g_reserved7) (void);
 | 
					  void (*_g_reserved7) (void);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType      g_file_enumerator_get_type          (void) G_GNUC_CONST;
 | 
					GType      g_file_enumerator_get_type          (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileInfo *g_file_enumerator_next_file         (GFileEnumerator      *enumerator,
 | 
					GFileInfo *g_file_enumerator_next_file         (GFileEnumerator      *enumerator,
 | 
				
			||||||
						GCancellable         *cancellable,
 | 
											GCancellable         *cancellable,
 | 
				
			||||||
						GError              **error);
 | 
											GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean   g_file_enumerator_close             (GFileEnumerator      *enumerator,
 | 
					gboolean   g_file_enumerator_close             (GFileEnumerator      *enumerator,
 | 
				
			||||||
						GCancellable         *cancellable,
 | 
											GCancellable         *cancellable,
 | 
				
			||||||
						GError              **error);
 | 
											GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void       g_file_enumerator_next_files_async  (GFileEnumerator      *enumerator,
 | 
					void       g_file_enumerator_next_files_async  (GFileEnumerator      *enumerator,
 | 
				
			||||||
						int                   num_files,
 | 
											int                   num_files,
 | 
				
			||||||
						int                   io_priority,
 | 
											int                   io_priority,
 | 
				
			||||||
						GCancellable         *cancellable,
 | 
											GCancellable         *cancellable,
 | 
				
			||||||
						GAsyncReadyCallback   callback,
 | 
											GAsyncReadyCallback   callback,
 | 
				
			||||||
						gpointer              user_data);
 | 
											gpointer              user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GList *    g_file_enumerator_next_files_finish (GFileEnumerator      *enumerator,
 | 
					GList *    g_file_enumerator_next_files_finish (GFileEnumerator      *enumerator,
 | 
				
			||||||
						GAsyncResult         *result,
 | 
											GAsyncResult         *result,
 | 
				
			||||||
						GError              **error);
 | 
											GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void       g_file_enumerator_close_async       (GFileEnumerator      *enumerator,
 | 
					void       g_file_enumerator_close_async       (GFileEnumerator      *enumerator,
 | 
				
			||||||
						int                   io_priority,
 | 
											int                   io_priority,
 | 
				
			||||||
						GCancellable         *cancellable,
 | 
											GCancellable         *cancellable,
 | 
				
			||||||
						GAsyncReadyCallback   callback,
 | 
											GAsyncReadyCallback   callback,
 | 
				
			||||||
						gpointer              user_data);
 | 
											gpointer              user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean   g_file_enumerator_close_finish      (GFileEnumerator      *enumerator,
 | 
					gboolean   g_file_enumerator_close_finish      (GFileEnumerator      *enumerator,
 | 
				
			||||||
						GAsyncResult         *result,
 | 
											GAsyncResult         *result,
 | 
				
			||||||
						GError              **error);
 | 
											GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean   g_file_enumerator_is_closed         (GFileEnumerator      *enumerator);
 | 
					gboolean   g_file_enumerator_is_closed         (GFileEnumerator      *enumerator);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean   g_file_enumerator_has_pending       (GFileEnumerator      *enumerator);
 | 
					gboolean   g_file_enumerator_has_pending       (GFileEnumerator      *enumerator);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void       g_file_enumerator_set_pending       (GFileEnumerator      *enumerator,
 | 
					void       g_file_enumerator_set_pending       (GFileEnumerator      *enumerator,
 | 
				
			||||||
						gboolean              pending);
 | 
											gboolean              pending);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFile *    g_file_enumerator_get_container     (GFileEnumerator *enumerator);
 | 
					GFile *    g_file_enumerator_get_container     (GFileEnumerator *enumerator);
 | 
				
			||||||
GLIB_AVAILABLE_IN_2_36
 | 
					GLIB_AVAILABLE_IN_2_36
 | 
				
			||||||
GFile *    g_file_enumerator_get_child         (GFileEnumerator *enumerator,
 | 
					GFile *    g_file_enumerator_get_child         (GFileEnumerator *enumerator,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -45,10 +45,13 @@ G_BEGIN_DECLS
 | 
				
			|||||||
 **/
 | 
					 **/
 | 
				
			||||||
typedef struct _GFileIconClass   GFileIconClass;
 | 
					typedef struct _GFileIconClass   GFileIconClass;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType   g_file_icon_get_type (void) G_GNUC_CONST;
 | 
					GType   g_file_icon_get_type (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIcon * g_file_icon_new      (GFile     *file);
 | 
					GIcon * g_file_icon_new      (GFile     *file);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFile * g_file_icon_get_file (GFileIcon *icon);
 | 
					GFile * g_file_icon_get_file (GFileIcon *icon);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -829,153 +829,225 @@ typedef struct _GFileInfoClass   GFileInfoClass;
 | 
				
			|||||||
 **/
 | 
					 **/
 | 
				
			||||||
#define G_FILE_ATTRIBUTE_TRASH_DELETION_DATE "trash::deletion-date"  /* string */
 | 
					#define G_FILE_ATTRIBUTE_TRASH_DELETION_DATE "trash::deletion-date"  /* string */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType              g_file_info_get_type                  (void) G_GNUC_CONST;
 | 
					GType              g_file_info_get_type                  (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileInfo *        g_file_info_new                       (void);
 | 
					GFileInfo *        g_file_info_new                       (void);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileInfo *        g_file_info_dup                       (GFileInfo  *other);
 | 
					GFileInfo *        g_file_info_dup                       (GFileInfo  *other);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void               g_file_info_copy_into                 (GFileInfo  *src_info,
 | 
					void               g_file_info_copy_into                 (GFileInfo  *src_info,
 | 
				
			||||||
							  GFileInfo  *dest_info);
 | 
												  GFileInfo  *dest_info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean           g_file_info_has_attribute             (GFileInfo  *info,
 | 
					gboolean           g_file_info_has_attribute             (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute);
 | 
												  const char *attribute);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean           g_file_info_has_namespace             (GFileInfo  *info,
 | 
					gboolean           g_file_info_has_namespace             (GFileInfo  *info,
 | 
				
			||||||
							  const char *name_space);
 | 
												  const char *name_space);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char **            g_file_info_list_attributes           (GFileInfo  *info,
 | 
					char **            g_file_info_list_attributes           (GFileInfo  *info,
 | 
				
			||||||
							  const char *name_space);
 | 
												  const char *name_space);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean           g_file_info_get_attribute_data        (GFileInfo  *info,
 | 
					gboolean           g_file_info_get_attribute_data        (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute,
 | 
												  const char *attribute,
 | 
				
			||||||
							  GFileAttributeType *type,
 | 
												  GFileAttributeType *type,
 | 
				
			||||||
							  gpointer   *value_pp,
 | 
												  gpointer   *value_pp,
 | 
				
			||||||
							  GFileAttributeStatus *status);
 | 
												  GFileAttributeStatus *status);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileAttributeType g_file_info_get_attribute_type        (GFileInfo  *info,
 | 
					GFileAttributeType g_file_info_get_attribute_type        (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute);
 | 
												  const char *attribute);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void               g_file_info_remove_attribute          (GFileInfo  *info,
 | 
					void               g_file_info_remove_attribute          (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute);
 | 
												  const char *attribute);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileAttributeStatus g_file_info_get_attribute_status    (GFileInfo  *info,
 | 
					GFileAttributeStatus g_file_info_get_attribute_status    (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute);
 | 
												  const char *attribute);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean           g_file_info_set_attribute_status      (GFileInfo  *info,
 | 
					gboolean           g_file_info_set_attribute_status      (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute,
 | 
												  const char *attribute,
 | 
				
			||||||
							  GFileAttributeStatus status);
 | 
												  GFileAttributeStatus status);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char *             g_file_info_get_attribute_as_string   (GFileInfo  *info,
 | 
					char *             g_file_info_get_attribute_as_string   (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute);
 | 
												  const char *attribute);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const char *       g_file_info_get_attribute_string      (GFileInfo  *info,
 | 
					const char *       g_file_info_get_attribute_string      (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute);
 | 
												  const char *attribute);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const char *       g_file_info_get_attribute_byte_string (GFileInfo  *info,
 | 
					const char *       g_file_info_get_attribute_byte_string (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute);
 | 
												  const char *attribute);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean           g_file_info_get_attribute_boolean     (GFileInfo  *info,
 | 
					gboolean           g_file_info_get_attribute_boolean     (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute);
 | 
												  const char *attribute);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint32            g_file_info_get_attribute_uint32      (GFileInfo  *info,
 | 
					guint32            g_file_info_get_attribute_uint32      (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute);
 | 
												  const char *attribute);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gint32             g_file_info_get_attribute_int32       (GFileInfo  *info,
 | 
					gint32             g_file_info_get_attribute_int32       (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute);
 | 
												  const char *attribute);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint64            g_file_info_get_attribute_uint64      (GFileInfo  *info,
 | 
					guint64            g_file_info_get_attribute_uint64      (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute);
 | 
												  const char *attribute);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gint64             g_file_info_get_attribute_int64       (GFileInfo  *info,
 | 
					gint64             g_file_info_get_attribute_int64       (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute);
 | 
												  const char *attribute);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GObject *          g_file_info_get_attribute_object      (GFileInfo  *info,
 | 
					GObject *          g_file_info_get_attribute_object      (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute);
 | 
												  const char *attribute);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char **            g_file_info_get_attribute_stringv     (GFileInfo  *info,
 | 
					char **            g_file_info_get_attribute_stringv     (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute);
 | 
												  const char *attribute);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void               g_file_info_set_attribute             (GFileInfo  *info,
 | 
					void               g_file_info_set_attribute             (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute,
 | 
												  const char *attribute,
 | 
				
			||||||
							  GFileAttributeType type,
 | 
												  GFileAttributeType type,
 | 
				
			||||||
							  gpointer    value_p);
 | 
												  gpointer    value_p);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void               g_file_info_set_attribute_string      (GFileInfo  *info,
 | 
					void               g_file_info_set_attribute_string      (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute,
 | 
												  const char *attribute,
 | 
				
			||||||
							  const char *attr_value);
 | 
												  const char *attr_value);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void               g_file_info_set_attribute_byte_string (GFileInfo  *info,
 | 
					void               g_file_info_set_attribute_byte_string (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute,
 | 
												  const char *attribute,
 | 
				
			||||||
							  const char *attr_value);
 | 
												  const char *attr_value);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void               g_file_info_set_attribute_boolean     (GFileInfo  *info,
 | 
					void               g_file_info_set_attribute_boolean     (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute,
 | 
												  const char *attribute,
 | 
				
			||||||
							  gboolean    attr_value);
 | 
												  gboolean    attr_value);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void               g_file_info_set_attribute_uint32      (GFileInfo  *info,
 | 
					void               g_file_info_set_attribute_uint32      (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute,
 | 
												  const char *attribute,
 | 
				
			||||||
							  guint32     attr_value);
 | 
												  guint32     attr_value);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void               g_file_info_set_attribute_int32       (GFileInfo  *info,
 | 
					void               g_file_info_set_attribute_int32       (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute,
 | 
												  const char *attribute,
 | 
				
			||||||
							  gint32      attr_value);
 | 
												  gint32      attr_value);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void               g_file_info_set_attribute_uint64      (GFileInfo  *info,
 | 
					void               g_file_info_set_attribute_uint64      (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute,
 | 
												  const char *attribute,
 | 
				
			||||||
							  guint64     attr_value);
 | 
												  guint64     attr_value);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void               g_file_info_set_attribute_int64       (GFileInfo  *info,
 | 
					void               g_file_info_set_attribute_int64       (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute,
 | 
												  const char *attribute,
 | 
				
			||||||
							  gint64      attr_value);
 | 
												  gint64      attr_value);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void               g_file_info_set_attribute_object      (GFileInfo  *info,
 | 
					void               g_file_info_set_attribute_object      (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute,
 | 
												  const char *attribute,
 | 
				
			||||||
							  GObject    *attr_value);
 | 
												  GObject    *attr_value);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void               g_file_info_set_attribute_stringv     (GFileInfo  *info,
 | 
					void               g_file_info_set_attribute_stringv     (GFileInfo  *info,
 | 
				
			||||||
							  const char *attribute,
 | 
												  const char *attribute,
 | 
				
			||||||
							  char      **attr_value);
 | 
												  char      **attr_value);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void               g_file_info_clear_status              (GFileInfo  *info);
 | 
					void               g_file_info_clear_status              (GFileInfo  *info);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Helper getters: */
 | 
					/* Helper getters: */
 | 
				
			||||||
GLIB_AVAILABLE_IN_2_36
 | 
					GLIB_AVAILABLE_IN_2_36
 | 
				
			||||||
GDateTime *       g_file_info_get_deletion_date      (GFileInfo         *info);
 | 
					GDateTime *       g_file_info_get_deletion_date      (GFileInfo         *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileType         g_file_info_get_file_type          (GFileInfo         *info);
 | 
					GFileType         g_file_info_get_file_type          (GFileInfo         *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean          g_file_info_get_is_hidden          (GFileInfo         *info);
 | 
					gboolean          g_file_info_get_is_hidden          (GFileInfo         *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean          g_file_info_get_is_backup          (GFileInfo         *info);
 | 
					gboolean          g_file_info_get_is_backup          (GFileInfo         *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean          g_file_info_get_is_symlink         (GFileInfo         *info);
 | 
					gboolean          g_file_info_get_is_symlink         (GFileInfo         *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const char *      g_file_info_get_name               (GFileInfo         *info);
 | 
					const char *      g_file_info_get_name               (GFileInfo         *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const char *      g_file_info_get_display_name       (GFileInfo         *info);
 | 
					const char *      g_file_info_get_display_name       (GFileInfo         *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const char *      g_file_info_get_edit_name          (GFileInfo         *info);
 | 
					const char *      g_file_info_get_edit_name          (GFileInfo         *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIcon *           g_file_info_get_icon               (GFileInfo         *info);
 | 
					GIcon *           g_file_info_get_icon               (GFileInfo         *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIcon *           g_file_info_get_symbolic_icon      (GFileInfo         *info);
 | 
					GIcon *           g_file_info_get_symbolic_icon      (GFileInfo         *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const char *      g_file_info_get_content_type       (GFileInfo         *info);
 | 
					const char *      g_file_info_get_content_type       (GFileInfo         *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
goffset           g_file_info_get_size               (GFileInfo         *info);
 | 
					goffset           g_file_info_get_size               (GFileInfo         *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void              g_file_info_get_modification_time  (GFileInfo         *info,
 | 
					void              g_file_info_get_modification_time  (GFileInfo         *info,
 | 
				
			||||||
						      GTimeVal          *result);
 | 
											      GTimeVal          *result);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const char *      g_file_info_get_symlink_target     (GFileInfo         *info);
 | 
					const char *      g_file_info_get_symlink_target     (GFileInfo         *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const char *      g_file_info_get_etag               (GFileInfo         *info);
 | 
					const char *      g_file_info_get_etag               (GFileInfo         *info);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gint32            g_file_info_get_sort_order         (GFileInfo         *info);
 | 
					gint32            g_file_info_get_sort_order         (GFileInfo         *info);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void              g_file_info_set_attribute_mask     (GFileInfo         *info,
 | 
					void              g_file_info_set_attribute_mask     (GFileInfo         *info,
 | 
				
			||||||
						      GFileAttributeMatcher *mask);
 | 
											      GFileAttributeMatcher *mask);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void              g_file_info_unset_attribute_mask   (GFileInfo         *info);
 | 
					void              g_file_info_unset_attribute_mask   (GFileInfo         *info);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Helper setters: */
 | 
					/* Helper setters: */
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void              g_file_info_set_file_type          (GFileInfo         *info,
 | 
					void              g_file_info_set_file_type          (GFileInfo         *info,
 | 
				
			||||||
						      GFileType          type);
 | 
											      GFileType          type);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void              g_file_info_set_is_hidden          (GFileInfo         *info,
 | 
					void              g_file_info_set_is_hidden          (GFileInfo         *info,
 | 
				
			||||||
						      gboolean           is_hidden);
 | 
											      gboolean           is_hidden);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void              g_file_info_set_is_symlink         (GFileInfo         *info,
 | 
					void              g_file_info_set_is_symlink         (GFileInfo         *info,
 | 
				
			||||||
						      gboolean           is_symlink);
 | 
											      gboolean           is_symlink);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void              g_file_info_set_name               (GFileInfo         *info,
 | 
					void              g_file_info_set_name               (GFileInfo         *info,
 | 
				
			||||||
						      const char        *name);
 | 
											      const char        *name);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void              g_file_info_set_display_name       (GFileInfo         *info,
 | 
					void              g_file_info_set_display_name       (GFileInfo         *info,
 | 
				
			||||||
						      const char        *display_name);
 | 
											      const char        *display_name);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void              g_file_info_set_edit_name          (GFileInfo         *info,
 | 
					void              g_file_info_set_edit_name          (GFileInfo         *info,
 | 
				
			||||||
						      const char        *edit_name);
 | 
											      const char        *edit_name);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void              g_file_info_set_icon               (GFileInfo         *info,
 | 
					void              g_file_info_set_icon               (GFileInfo         *info,
 | 
				
			||||||
						      GIcon             *icon);
 | 
											      GIcon             *icon);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void              g_file_info_set_symbolic_icon      (GFileInfo         *info,
 | 
					void              g_file_info_set_symbolic_icon      (GFileInfo         *info,
 | 
				
			||||||
						      GIcon             *icon);
 | 
											      GIcon             *icon);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void              g_file_info_set_content_type       (GFileInfo         *info,
 | 
					void              g_file_info_set_content_type       (GFileInfo         *info,
 | 
				
			||||||
						      const char        *content_type);
 | 
											      const char        *content_type);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void              g_file_info_set_size               (GFileInfo         *info,
 | 
					void              g_file_info_set_size               (GFileInfo         *info,
 | 
				
			||||||
						      goffset            size);
 | 
											      goffset            size);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void              g_file_info_set_modification_time  (GFileInfo         *info,
 | 
					void              g_file_info_set_modification_time  (GFileInfo         *info,
 | 
				
			||||||
						      GTimeVal          *mtime);
 | 
											      GTimeVal          *mtime);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void              g_file_info_set_symlink_target     (GFileInfo         *info,
 | 
					void              g_file_info_set_symlink_target     (GFileInfo         *info,
 | 
				
			||||||
						      const char        *symlink_target);
 | 
											      const char        *symlink_target);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void              g_file_info_set_sort_order         (GFileInfo         *info,
 | 
					void              g_file_info_set_sort_order         (GFileInfo         *info,
 | 
				
			||||||
						      gint32             sort_order);
 | 
											      gint32             sort_order);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define G_TYPE_FILE_ATTRIBUTE_MATCHER (g_file_attribute_matcher_get_type ())
 | 
					#define G_TYPE_FILE_ATTRIBUTE_MATCHER (g_file_attribute_matcher_get_type ())
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType g_file_attribute_matcher_get_type (void) G_GNUC_CONST;
 | 
					GType g_file_attribute_matcher_get_type (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileAttributeMatcher *g_file_attribute_matcher_new            (const char            *attributes);
 | 
					GFileAttributeMatcher *g_file_attribute_matcher_new            (const char            *attributes);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileAttributeMatcher *g_file_attribute_matcher_ref            (GFileAttributeMatcher *matcher);
 | 
					GFileAttributeMatcher *g_file_attribute_matcher_ref            (GFileAttributeMatcher *matcher);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                   g_file_attribute_matcher_unref          (GFileAttributeMatcher *matcher);
 | 
					void                   g_file_attribute_matcher_unref          (GFileAttributeMatcher *matcher);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileAttributeMatcher *g_file_attribute_matcher_subtract       (GFileAttributeMatcher *matcher,
 | 
					GFileAttributeMatcher *g_file_attribute_matcher_subtract       (GFileAttributeMatcher *matcher,
 | 
				
			||||||
                                                                GFileAttributeMatcher *subtract);
 | 
					                                                                GFileAttributeMatcher *subtract);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean               g_file_attribute_matcher_matches        (GFileAttributeMatcher *matcher,
 | 
					gboolean               g_file_attribute_matcher_matches        (GFileAttributeMatcher *matcher,
 | 
				
			||||||
								const char            *attribute);
 | 
													const char            *attribute);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean               g_file_attribute_matcher_matches_only   (GFileAttributeMatcher *matcher,
 | 
					gboolean               g_file_attribute_matcher_matches_only   (GFileAttributeMatcher *matcher,
 | 
				
			||||||
								const char            *attribute);
 | 
													const char            *attribute);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean               g_file_attribute_matcher_enumerate_namespace (GFileAttributeMatcher *matcher,
 | 
					gboolean               g_file_attribute_matcher_enumerate_namespace (GFileAttributeMatcher *matcher,
 | 
				
			||||||
								     const char            *ns);
 | 
													     const char            *ns);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const char *           g_file_attribute_matcher_enumerate_next (GFileAttributeMatcher *matcher);
 | 
					const char *           g_file_attribute_matcher_enumerate_next (GFileAttributeMatcher *matcher);
 | 
				
			||||||
GLIB_AVAILABLE_IN_2_32
 | 
					GLIB_AVAILABLE_IN_2_32
 | 
				
			||||||
char *                 g_file_attribute_matcher_to_string      (GFileAttributeMatcher *matcher);
 | 
					char *                 g_file_attribute_matcher_to_string      (GFileAttributeMatcher *matcher);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -91,18 +91,22 @@ struct _GFileInputStreamClass
 | 
				
			|||||||
  void (*_g_reserved5) (void);
 | 
					  void (*_g_reserved5) (void);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType      g_file_input_stream_get_type          (void) G_GNUC_CONST;
 | 
					GType      g_file_input_stream_get_type          (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileInfo *g_file_input_stream_query_info        (GFileInputStream     *stream,
 | 
					GFileInfo *g_file_input_stream_query_info        (GFileInputStream     *stream,
 | 
				
			||||||
						  const char           *attributes,
 | 
											  const char           *attributes,
 | 
				
			||||||
						  GCancellable         *cancellable,
 | 
											  GCancellable         *cancellable,
 | 
				
			||||||
						  GError              **error);
 | 
											  GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void       g_file_input_stream_query_info_async  (GFileInputStream     *stream,
 | 
					void       g_file_input_stream_query_info_async  (GFileInputStream     *stream,
 | 
				
			||||||
						  const char           *attributes,
 | 
											  const char           *attributes,
 | 
				
			||||||
						  int                   io_priority,
 | 
											  int                   io_priority,
 | 
				
			||||||
						  GCancellable         *cancellable,
 | 
											  GCancellable         *cancellable,
 | 
				
			||||||
						  GAsyncReadyCallback   callback,
 | 
											  GAsyncReadyCallback   callback,
 | 
				
			||||||
						  gpointer              user_data);
 | 
											  gpointer              user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileInfo *g_file_input_stream_query_info_finish (GFileInputStream     *stream,
 | 
					GFileInfo *g_file_input_stream_query_info_finish (GFileInputStream     *stream,
 | 
				
			||||||
						  GAsyncResult         *result,
 | 
											  GAsyncResult         *result,
 | 
				
			||||||
						  GError              **error);
 | 
											  GError              **error);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -96,21 +96,26 @@ struct _GFileIOStreamClass
 | 
				
			|||||||
  void (*_g_reserved5) (void);
 | 
					  void (*_g_reserved5) (void);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType      g_file_io_stream_get_type          (void) G_GNUC_CONST;
 | 
					GType      g_file_io_stream_get_type          (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileInfo *g_file_io_stream_query_info        (GFileIOStream    *stream,
 | 
					GFileInfo *g_file_io_stream_query_info        (GFileIOStream    *stream,
 | 
				
			||||||
					       const char           *attributes,
 | 
										       const char           *attributes,
 | 
				
			||||||
					       GCancellable         *cancellable,
 | 
										       GCancellable         *cancellable,
 | 
				
			||||||
					       GError              **error);
 | 
										       GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void       g_file_io_stream_query_info_async  (GFileIOStream    *stream,
 | 
					void       g_file_io_stream_query_info_async  (GFileIOStream    *stream,
 | 
				
			||||||
					       const char           *attributes,
 | 
										       const char           *attributes,
 | 
				
			||||||
					       int                   io_priority,
 | 
										       int                   io_priority,
 | 
				
			||||||
					       GCancellable         *cancellable,
 | 
										       GCancellable         *cancellable,
 | 
				
			||||||
					       GAsyncReadyCallback   callback,
 | 
										       GAsyncReadyCallback   callback,
 | 
				
			||||||
					       gpointer              user_data);
 | 
										       gpointer              user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileInfo *g_file_io_stream_query_info_finish (GFileIOStream    *stream,
 | 
					GFileInfo *g_file_io_stream_query_info_finish (GFileIOStream    *stream,
 | 
				
			||||||
					       GAsyncResult         *result,
 | 
										       GAsyncResult         *result,
 | 
				
			||||||
					       GError              **error);
 | 
										       GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char *     g_file_io_stream_get_etag          (GFileIOStream    *stream);
 | 
					char *     g_file_io_stream_get_etag          (GFileIOStream    *stream);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -76,15 +76,20 @@ struct _GFileMonitorClass
 | 
				
			|||||||
  void (*_g_reserved5) (void);
 | 
					  void (*_g_reserved5) (void);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType    g_file_monitor_get_type       (void) G_GNUC_CONST;
 | 
					GType    g_file_monitor_get_type       (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_file_monitor_cancel         (GFileMonitor      *monitor);
 | 
					gboolean g_file_monitor_cancel         (GFileMonitor      *monitor);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_file_monitor_is_cancelled   (GFileMonitor      *monitor);
 | 
					gboolean g_file_monitor_is_cancelled   (GFileMonitor      *monitor);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void     g_file_monitor_set_rate_limit (GFileMonitor      *monitor,
 | 
					void     g_file_monitor_set_rate_limit (GFileMonitor      *monitor,
 | 
				
			||||||
                                        gint               limit_msecs);
 | 
					                                        gint               limit_msecs);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* For implementations */
 | 
					/* For implementations */
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void     g_file_monitor_emit_event     (GFileMonitor      *monitor,
 | 
					void     g_file_monitor_emit_event     (GFileMonitor      *monitor,
 | 
				
			||||||
                                        GFile             *child,
 | 
					                                        GFile             *child,
 | 
				
			||||||
                                        GFile             *other_file,
 | 
					                                        GFile             *other_file,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -60,14 +60,19 @@ struct _GFilenameCompleterClass
 | 
				
			|||||||
  void (*_g_reserved3) (void);
 | 
					  void (*_g_reserved3) (void);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType               g_filename_completer_get_type              (void) G_GNUC_CONST;
 | 
					GType               g_filename_completer_get_type              (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFilenameCompleter *g_filename_completer_new                   (void);
 | 
					GFilenameCompleter *g_filename_completer_new                   (void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char *              g_filename_completer_get_completion_suffix (GFilenameCompleter *completer,
 | 
					char *              g_filename_completer_get_completion_suffix (GFilenameCompleter *completer,
 | 
				
			||||||
                                                                const char *initial_text);
 | 
					                                                                const char *initial_text);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char **             g_filename_completer_get_completions       (GFilenameCompleter *completer,
 | 
					char **             g_filename_completer_get_completions       (GFilenameCompleter *completer,
 | 
				
			||||||
                                                                const char *initial_text);
 | 
					                                                                const char *initial_text);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                g_filename_completer_set_dirs_only         (GFilenameCompleter *completer,
 | 
					void                g_filename_completer_set_dirs_only         (GFilenameCompleter *completer,
 | 
				
			||||||
                                                                gboolean dirs_only);
 | 
					                                                                gboolean dirs_only);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -96,22 +96,27 @@ struct _GFileOutputStreamClass
 | 
				
			|||||||
  void (*_g_reserved5) (void);
 | 
					  void (*_g_reserved5) (void);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType      g_file_output_stream_get_type          (void) G_GNUC_CONST;
 | 
					GType      g_file_output_stream_get_type          (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileInfo *g_file_output_stream_query_info        (GFileOutputStream    *stream,
 | 
					GFileInfo *g_file_output_stream_query_info        (GFileOutputStream    *stream,
 | 
				
			||||||
                                                   const char           *attributes,
 | 
					                                                   const char           *attributes,
 | 
				
			||||||
                                                   GCancellable         *cancellable,
 | 
					                                                   GCancellable         *cancellable,
 | 
				
			||||||
                                                   GError              **error);
 | 
					                                                   GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void       g_file_output_stream_query_info_async  (GFileOutputStream    *stream,
 | 
					void       g_file_output_stream_query_info_async  (GFileOutputStream    *stream,
 | 
				
			||||||
						   const char           *attributes,
 | 
											   const char           *attributes,
 | 
				
			||||||
						   int                   io_priority,
 | 
											   int                   io_priority,
 | 
				
			||||||
						   GCancellable         *cancellable,
 | 
											   GCancellable         *cancellable,
 | 
				
			||||||
						   GAsyncReadyCallback   callback,
 | 
											   GAsyncReadyCallback   callback,
 | 
				
			||||||
						   gpointer              user_data);
 | 
											   gpointer              user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileInfo *g_file_output_stream_query_info_finish (GFileOutputStream    *stream,
 | 
					GFileInfo *g_file_output_stream_query_info_finish (GFileOutputStream    *stream,
 | 
				
			||||||
						   GAsyncResult         *result,
 | 
											   GAsyncResult         *result,
 | 
				
			||||||
						   GError              **error);
 | 
											   GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char *     g_file_output_stream_get_etag          (GFileOutputStream    *stream);
 | 
					char *     g_file_output_stream_get_etag          (GFileOutputStream    *stream);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -65,9 +65,13 @@ struct _GFilterInputStreamClass
 | 
				
			|||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType          g_filter_input_stream_get_type              (void) G_GNUC_CONST;
 | 
					GType          g_filter_input_stream_get_type              (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GInputStream * g_filter_input_stream_get_base_stream       (GFilterInputStream *stream);
 | 
					GInputStream * g_filter_input_stream_get_base_stream       (GFilterInputStream *stream);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean       g_filter_input_stream_get_close_base_stream (GFilterInputStream *stream);
 | 
					gboolean       g_filter_input_stream_get_close_base_stream (GFilterInputStream *stream);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void           g_filter_input_stream_set_close_base_stream (GFilterInputStream *stream,
 | 
					void           g_filter_input_stream_set_close_base_stream (GFilterInputStream *stream,
 | 
				
			||||||
                                                            gboolean            close_base);
 | 
					                                                            gboolean            close_base);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -65,9 +65,13 @@ struct _GFilterOutputStreamClass
 | 
				
			|||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType           g_filter_output_stream_get_type              (void) G_GNUC_CONST;
 | 
					GType           g_filter_output_stream_get_type              (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GOutputStream * g_filter_output_stream_get_base_stream       (GFilterOutputStream *stream);
 | 
					GOutputStream * g_filter_output_stream_get_base_stream       (GFilterOutputStream *stream);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean        g_filter_output_stream_get_close_base_stream (GFilterOutputStream *stream);
 | 
					gboolean        g_filter_output_stream_get_close_base_stream (GFilterOutputStream *stream);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void            g_filter_output_stream_set_close_base_stream (GFilterOutputStream *stream,
 | 
					void            g_filter_output_stream_set_close_base_stream (GFilterOutputStream *stream,
 | 
				
			||||||
                                                              gboolean             close_base);
 | 
					                                                              gboolean             close_base);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -77,12 +77,17 @@ struct _GIconIface
 | 
				
			|||||||
                               GError **error);
 | 
					                               GError **error);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType    g_icon_get_type  (void) G_GNUC_CONST;
 | 
					GType    g_icon_get_type  (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint    g_icon_hash            (gconstpointer  icon);
 | 
					guint    g_icon_hash            (gconstpointer  icon);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_icon_equal           (GIcon         *icon1,
 | 
					gboolean g_icon_equal           (GIcon         *icon1,
 | 
				
			||||||
                                 GIcon         *icon2);
 | 
					                                 GIcon         *icon2);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar   *g_icon_to_string       (GIcon         *icon);
 | 
					gchar   *g_icon_to_string       (GIcon         *icon);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIcon   *g_icon_new_for_string  (const gchar   *str,
 | 
					GIcon   *g_icon_new_for_string  (const gchar   *str,
 | 
				
			||||||
                                 GError       **error);
 | 
					                                 GError       **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -58,46 +58,66 @@ struct _GInetAddressClass
 | 
				
			|||||||
  const guint8 * (*to_bytes)  (GInetAddress *address);
 | 
					  const guint8 * (*to_bytes)  (GInetAddress *address);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                 g_inet_address_get_type             (void) G_GNUC_CONST;
 | 
					GType                 g_inet_address_get_type             (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GInetAddress *        g_inet_address_new_from_string      (const gchar          *string);
 | 
					GInetAddress *        g_inet_address_new_from_string      (const gchar          *string);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GInetAddress *        g_inet_address_new_from_bytes       (const guint8         *bytes,
 | 
					GInetAddress *        g_inet_address_new_from_bytes       (const guint8         *bytes,
 | 
				
			||||||
							   GSocketFamily         family);
 | 
												   GSocketFamily         family);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GInetAddress *        g_inet_address_new_loopback         (GSocketFamily         family);
 | 
					GInetAddress *        g_inet_address_new_loopback         (GSocketFamily         family);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GInetAddress *        g_inet_address_new_any              (GSocketFamily         family);
 | 
					GInetAddress *        g_inet_address_new_any              (GSocketFamily         family);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean              g_inet_address_equal                (GInetAddress         *address,
 | 
					gboolean              g_inet_address_equal                (GInetAddress         *address,
 | 
				
			||||||
                                                           GInetAddress         *other_address);
 | 
					                                                           GInetAddress         *other_address);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar *               g_inet_address_to_string            (GInetAddress         *address);
 | 
					gchar *               g_inet_address_to_string            (GInetAddress         *address);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const guint8 *        g_inet_address_to_bytes             (GInetAddress         *address);
 | 
					const guint8 *        g_inet_address_to_bytes             (GInetAddress         *address);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gsize                 g_inet_address_get_native_size      (GInetAddress         *address);
 | 
					gsize                 g_inet_address_get_native_size      (GInetAddress         *address);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketFamily         g_inet_address_get_family           (GInetAddress         *address);
 | 
					GSocketFamily         g_inet_address_get_family           (GInetAddress         *address);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean              g_inet_address_get_is_any           (GInetAddress         *address);
 | 
					gboolean              g_inet_address_get_is_any           (GInetAddress         *address);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean              g_inet_address_get_is_loopback      (GInetAddress         *address);
 | 
					gboolean              g_inet_address_get_is_loopback      (GInetAddress         *address);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean              g_inet_address_get_is_link_local    (GInetAddress         *address);
 | 
					gboolean              g_inet_address_get_is_link_local    (GInetAddress         *address);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean              g_inet_address_get_is_site_local    (GInetAddress         *address);
 | 
					gboolean              g_inet_address_get_is_site_local    (GInetAddress         *address);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean              g_inet_address_get_is_multicast     (GInetAddress         *address);
 | 
					gboolean              g_inet_address_get_is_multicast     (GInetAddress         *address);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean              g_inet_address_get_is_mc_global     (GInetAddress         *address);
 | 
					gboolean              g_inet_address_get_is_mc_global     (GInetAddress         *address);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean              g_inet_address_get_is_mc_link_local (GInetAddress         *address);
 | 
					gboolean              g_inet_address_get_is_mc_link_local (GInetAddress         *address);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean              g_inet_address_get_is_mc_node_local (GInetAddress         *address);
 | 
					gboolean              g_inet_address_get_is_mc_node_local (GInetAddress         *address);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean              g_inet_address_get_is_mc_org_local  (GInetAddress         *address);
 | 
					gboolean              g_inet_address_get_is_mc_org_local  (GInetAddress         *address);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean              g_inet_address_get_is_mc_site_local (GInetAddress         *address);
 | 
					gboolean              g_inet_address_get_is_mc_site_local (GInetAddress         *address);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -55,12 +55,16 @@ struct _GInetSocketAddressClass
 | 
				
			|||||||
  GSocketAddressClass parent_class;
 | 
					  GSocketAddressClass parent_class;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType           g_inet_socket_address_get_type     (void) G_GNUC_CONST;
 | 
					GType           g_inet_socket_address_get_type     (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketAddress *g_inet_socket_address_new          (GInetAddress       *address,
 | 
					GSocketAddress *g_inet_socket_address_new          (GInetAddress       *address,
 | 
				
			||||||
						    guint16             port);
 | 
											    guint16             port);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GInetAddress *  g_inet_socket_address_get_address  (GInetSocketAddress *address);
 | 
					GInetAddress *  g_inet_socket_address_get_address  (GInetSocketAddress *address);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint16         g_inet_socket_address_get_port     (GInetSocketAddress *address);
 | 
					guint16         g_inet_socket_address_get_port     (GInetSocketAddress *address);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GLIB_AVAILABLE_IN_2_32
 | 
					GLIB_AVAILABLE_IN_2_32
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -68,22 +68,27 @@ struct _GInitableIface
 | 
				
			|||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType    g_initable_get_type   (void) G_GNUC_CONST;
 | 
					GType    g_initable_get_type   (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_initable_init       (GInitable     *initable,
 | 
					gboolean g_initable_init       (GInitable     *initable,
 | 
				
			||||||
				GCancellable  *cancellable,
 | 
									GCancellable  *cancellable,
 | 
				
			||||||
				GError       **error);
 | 
									GError       **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gpointer g_initable_new        (GType          object_type,
 | 
					gpointer g_initable_new        (GType          object_type,
 | 
				
			||||||
				GCancellable  *cancellable,
 | 
									GCancellable  *cancellable,
 | 
				
			||||||
				GError       **error,
 | 
									GError       **error,
 | 
				
			||||||
				const gchar   *first_property_name,
 | 
									const gchar   *first_property_name,
 | 
				
			||||||
				...);
 | 
									...);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gpointer g_initable_newv       (GType          object_type,
 | 
					gpointer g_initable_newv       (GType          object_type,
 | 
				
			||||||
				guint          n_parameters,
 | 
									guint          n_parameters,
 | 
				
			||||||
				GParameter    *parameters,
 | 
									GParameter    *parameters,
 | 
				
			||||||
				GCancellable  *cancellable,
 | 
									GCancellable  *cancellable,
 | 
				
			||||||
				GError       **error);
 | 
									GError       **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GObject* g_initable_new_valist (GType          object_type,
 | 
					GObject* g_initable_new_valist (GType          object_type,
 | 
				
			||||||
				const gchar   *first_property_name,
 | 
									const gchar   *first_property_name,
 | 
				
			||||||
				va_list        var_args,
 | 
									va_list        var_args,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -111,13 +111,16 @@ struct _GInputStreamClass
 | 
				
			|||||||
  void (*_g_reserved5) (void);
 | 
					  void (*_g_reserved5) (void);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType    g_input_stream_get_type      (void) G_GNUC_CONST;
 | 
					GType    g_input_stream_get_type      (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gssize   g_input_stream_read          (GInputStream          *stream,
 | 
					gssize   g_input_stream_read          (GInputStream          *stream,
 | 
				
			||||||
				       void                  *buffer,
 | 
									       void                  *buffer,
 | 
				
			||||||
				       gsize                  count,
 | 
									       gsize                  count,
 | 
				
			||||||
				       GCancellable          *cancellable,
 | 
									       GCancellable          *cancellable,
 | 
				
			||||||
				       GError               **error);
 | 
									       GError               **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_input_stream_read_all      (GInputStream          *stream,
 | 
					gboolean g_input_stream_read_all      (GInputStream          *stream,
 | 
				
			||||||
				       void                  *buffer,
 | 
									       void                  *buffer,
 | 
				
			||||||
				       gsize                  count,
 | 
									       gsize                  count,
 | 
				
			||||||
@@ -129,13 +132,16 @@ GBytes  *g_input_stream_read_bytes    (GInputStream          *stream,
 | 
				
			|||||||
				       gsize                  count,
 | 
									       gsize                  count,
 | 
				
			||||||
				       GCancellable          *cancellable,
 | 
									       GCancellable          *cancellable,
 | 
				
			||||||
				       GError               **error);
 | 
									       GError               **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gssize   g_input_stream_skip          (GInputStream          *stream,
 | 
					gssize   g_input_stream_skip          (GInputStream          *stream,
 | 
				
			||||||
				       gsize                  count,
 | 
									       gsize                  count,
 | 
				
			||||||
				       GCancellable          *cancellable,
 | 
									       GCancellable          *cancellable,
 | 
				
			||||||
				       GError               **error);
 | 
									       GError               **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_input_stream_close         (GInputStream          *stream,
 | 
					gboolean g_input_stream_close         (GInputStream          *stream,
 | 
				
			||||||
				       GCancellable          *cancellable,
 | 
									       GCancellable          *cancellable,
 | 
				
			||||||
				       GError               **error);
 | 
									       GError               **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void     g_input_stream_read_async    (GInputStream          *stream,
 | 
					void     g_input_stream_read_async    (GInputStream          *stream,
 | 
				
			||||||
				       void                  *buffer,
 | 
									       void                  *buffer,
 | 
				
			||||||
				       gsize                  count,
 | 
									       gsize                  count,
 | 
				
			||||||
@@ -143,6 +149,7 @@ void     g_input_stream_read_async    (GInputStream          *stream,
 | 
				
			|||||||
				       GCancellable          *cancellable,
 | 
									       GCancellable          *cancellable,
 | 
				
			||||||
				       GAsyncReadyCallback    callback,
 | 
									       GAsyncReadyCallback    callback,
 | 
				
			||||||
				       gpointer               user_data);
 | 
									       gpointer               user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gssize   g_input_stream_read_finish   (GInputStream          *stream,
 | 
					gssize   g_input_stream_read_finish   (GInputStream          *stream,
 | 
				
			||||||
				       GAsyncResult          *result,
 | 
									       GAsyncResult          *result,
 | 
				
			||||||
				       GError               **error);
 | 
									       GError               **error);
 | 
				
			||||||
@@ -157,30 +164,38 @@ GLIB_AVAILABLE_IN_2_34
 | 
				
			|||||||
GBytes  *g_input_stream_read_bytes_finish (GInputStream          *stream,
 | 
					GBytes  *g_input_stream_read_bytes_finish (GInputStream          *stream,
 | 
				
			||||||
					   GAsyncResult          *result,
 | 
										   GAsyncResult          *result,
 | 
				
			||||||
					   GError               **error);
 | 
										   GError               **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void     g_input_stream_skip_async    (GInputStream          *stream,
 | 
					void     g_input_stream_skip_async    (GInputStream          *stream,
 | 
				
			||||||
				       gsize                  count,
 | 
									       gsize                  count,
 | 
				
			||||||
				       int                    io_priority,
 | 
									       int                    io_priority,
 | 
				
			||||||
				       GCancellable          *cancellable,
 | 
									       GCancellable          *cancellable,
 | 
				
			||||||
				       GAsyncReadyCallback    callback,
 | 
									       GAsyncReadyCallback    callback,
 | 
				
			||||||
				       gpointer               user_data);
 | 
									       gpointer               user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gssize   g_input_stream_skip_finish   (GInputStream          *stream,
 | 
					gssize   g_input_stream_skip_finish   (GInputStream          *stream,
 | 
				
			||||||
				       GAsyncResult          *result,
 | 
									       GAsyncResult          *result,
 | 
				
			||||||
				       GError               **error);
 | 
									       GError               **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void     g_input_stream_close_async   (GInputStream          *stream,
 | 
					void     g_input_stream_close_async   (GInputStream          *stream,
 | 
				
			||||||
				       int                    io_priority,
 | 
									       int                    io_priority,
 | 
				
			||||||
				       GCancellable          *cancellable,
 | 
									       GCancellable          *cancellable,
 | 
				
			||||||
				       GAsyncReadyCallback    callback,
 | 
									       GAsyncReadyCallback    callback,
 | 
				
			||||||
				       gpointer               user_data);
 | 
									       gpointer               user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_input_stream_close_finish  (GInputStream          *stream,
 | 
					gboolean g_input_stream_close_finish  (GInputStream          *stream,
 | 
				
			||||||
				       GAsyncResult          *result,
 | 
									       GAsyncResult          *result,
 | 
				
			||||||
				       GError               **error);
 | 
									       GError               **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* For implementations: */
 | 
					/* For implementations: */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_input_stream_is_closed     (GInputStream          *stream);
 | 
					gboolean g_input_stream_is_closed     (GInputStream          *stream);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_input_stream_has_pending   (GInputStream          *stream);
 | 
					gboolean g_input_stream_has_pending   (GInputStream          *stream);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_input_stream_set_pending   (GInputStream          *stream,
 | 
					gboolean g_input_stream_set_pending   (GInputStream          *stream,
 | 
				
			||||||
				       GError               **error);
 | 
									       GError               **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void     g_input_stream_clear_pending (GInputStream          *stream);
 | 
					void     g_input_stream_clear_pending (GInputStream          *stream);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -40,10 +40,13 @@ G_BEGIN_DECLS
 | 
				
			|||||||
 **/
 | 
					 **/
 | 
				
			||||||
#define G_IO_ERROR g_io_error_quark()
 | 
					#define G_IO_ERROR g_io_error_quark()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GQuark       g_io_error_quark      (void);
 | 
					GQuark       g_io_error_quark      (void);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIOErrorEnum g_io_error_from_errno (gint err_no);
 | 
					GIOErrorEnum g_io_error_from_errno (gint err_no);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef G_OS_WIN32
 | 
					#ifdef G_OS_WIN32
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIOErrorEnum g_io_error_from_win32_error (gint error_code);
 | 
					GIOErrorEnum g_io_error_from_win32_error (gint error_code);
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -56,10 +56,14 @@ void               g_io_module_scope_block   (GIOModuleScope      *scope,
 | 
				
			|||||||
 **/
 | 
					 **/
 | 
				
			||||||
typedef struct _GIOModuleClass GIOModuleClass;
 | 
					typedef struct _GIOModuleClass GIOModuleClass;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType              g_io_module_get_type                       (void) G_GNUC_CONST;
 | 
					GType              g_io_module_get_type                       (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIOModule         *g_io_module_new                            (const gchar       *filename);
 | 
					GIOModule         *g_io_module_new                            (const gchar       *filename);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void               g_io_modules_scan_all_in_directory         (const char        *dirname);
 | 
					void               g_io_modules_scan_all_in_directory         (const char        *dirname);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GList             *g_io_modules_load_all_in_directory         (const gchar       *dirname);
 | 
					GList             *g_io_modules_load_all_in_directory         (const gchar       *dirname);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GLIB_AVAILABLE_IN_2_30
 | 
					GLIB_AVAILABLE_IN_2_30
 | 
				
			||||||
@@ -69,22 +73,33 @@ GLIB_AVAILABLE_IN_2_30
 | 
				
			|||||||
GList             *g_io_modules_load_all_in_directory_with_scope   (const gchar       *dirname,
 | 
					GList             *g_io_modules_load_all_in_directory_with_scope   (const gchar       *dirname,
 | 
				
			||||||
                                                                    GIOModuleScope    *scope);
 | 
					                                                                    GIOModuleScope    *scope);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIOExtensionPoint *g_io_extension_point_register              (const char        *name);
 | 
					GIOExtensionPoint *g_io_extension_point_register              (const char        *name);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIOExtensionPoint *g_io_extension_point_lookup                (const char        *name);
 | 
					GIOExtensionPoint *g_io_extension_point_lookup                (const char        *name);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void               g_io_extension_point_set_required_type     (GIOExtensionPoint *extension_point,
 | 
					void               g_io_extension_point_set_required_type     (GIOExtensionPoint *extension_point,
 | 
				
			||||||
							       GType              type);
 | 
												       GType              type);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType              g_io_extension_point_get_required_type     (GIOExtensionPoint *extension_point);
 | 
					GType              g_io_extension_point_get_required_type     (GIOExtensionPoint *extension_point);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GList             *g_io_extension_point_get_extensions        (GIOExtensionPoint *extension_point);
 | 
					GList             *g_io_extension_point_get_extensions        (GIOExtensionPoint *extension_point);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIOExtension *     g_io_extension_point_get_extension_by_name (GIOExtensionPoint *extension_point,
 | 
					GIOExtension *     g_io_extension_point_get_extension_by_name (GIOExtensionPoint *extension_point,
 | 
				
			||||||
							       const char        *name);
 | 
												       const char        *name);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIOExtension *     g_io_extension_point_implement             (const char        *extension_point_name,
 | 
					GIOExtension *     g_io_extension_point_implement             (const char        *extension_point_name,
 | 
				
			||||||
							       GType              type,
 | 
												       GType              type,
 | 
				
			||||||
							       const char        *extension_name,
 | 
												       const char        *extension_name,
 | 
				
			||||||
							       gint               priority);
 | 
												       gint               priority);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType              g_io_extension_get_type                    (GIOExtension      *extension);
 | 
					GType              g_io_extension_get_type                    (GIOExtension      *extension);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const char *       g_io_extension_get_name                    (GIOExtension      *extension);
 | 
					const char *       g_io_extension_get_name                    (GIOExtension      *extension);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gint               g_io_extension_get_priority                (GIOExtension      *extension);
 | 
					gint               g_io_extension_get_priority                (GIOExtension      *extension);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GTypeClass*        g_io_extension_ref_class                   (GIOExtension      *extension);
 | 
					GTypeClass*        g_io_extension_ref_class                   (GIOExtension      *extension);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -98,6 +113,7 @@ GTypeClass*        g_io_extension_ref_class                   (GIOExtension
 | 
				
			|||||||
 * This function is ran after the module has been loaded into GIO,
 | 
					 * This function is ran after the module has been loaded into GIO,
 | 
				
			||||||
 * to initialize the module.
 | 
					 * to initialize the module.
 | 
				
			||||||
 **/
 | 
					 **/
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void   g_io_module_load   (GIOModule *module);
 | 
					void   g_io_module_load   (GIOModule *module);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
@@ -108,6 +124,7 @@ void   g_io_module_load   (GIOModule *module);
 | 
				
			|||||||
 * This function is ran when the module is being unloaded from GIO,
 | 
					 * This function is ran when the module is being unloaded from GIO,
 | 
				
			||||||
 * to finalize the module.
 | 
					 * to finalize the module.
 | 
				
			||||||
 **/
 | 
					 **/
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void   g_io_module_unload (GIOModule *module);
 | 
					void   g_io_module_unload (GIOModule *module);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
@@ -142,6 +159,7 @@ void   g_io_module_unload (GIOModule *module);
 | 
				
			|||||||
 *
 | 
					 *
 | 
				
			||||||
 * Since: 2.24
 | 
					 * Since: 2.24
 | 
				
			||||||
 **/
 | 
					 **/
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char **g_io_module_query (void);
 | 
					char **g_io_module_query (void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -83,11 +83,15 @@ struct _GIOStreamClass
 | 
				
			|||||||
  void (*_g_reserved10) (void);
 | 
					  void (*_g_reserved10) (void);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType          g_io_stream_get_type          (void)  G_GNUC_CONST;
 | 
					GType          g_io_stream_get_type          (void)  G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GInputStream * g_io_stream_get_input_stream  (GIOStream            *stream);
 | 
					GInputStream * g_io_stream_get_input_stream  (GIOStream            *stream);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GOutputStream *g_io_stream_get_output_stream (GIOStream            *stream);
 | 
					GOutputStream *g_io_stream_get_output_stream (GIOStream            *stream);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void           g_io_stream_splice_async      (GIOStream            *stream1,
 | 
					void           g_io_stream_splice_async      (GIOStream            *stream1,
 | 
				
			||||||
					      GIOStream            *stream2,
 | 
										      GIOStream            *stream2,
 | 
				
			||||||
					      GIOStreamSpliceFlags  flags,
 | 
										      GIOStreamSpliceFlags  flags,
 | 
				
			||||||
@@ -96,26 +100,34 @@ void           g_io_stream_splice_async      (GIOStream            *stream1,
 | 
				
			|||||||
					      GAsyncReadyCallback   callback,
 | 
										      GAsyncReadyCallback   callback,
 | 
				
			||||||
					      gpointer              user_data);
 | 
										      gpointer              user_data);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean       g_io_stream_splice_finish     (GAsyncResult         *result,
 | 
					gboolean       g_io_stream_splice_finish     (GAsyncResult         *result,
 | 
				
			||||||
                                              GError              **error);
 | 
					                                              GError              **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean       g_io_stream_close             (GIOStream            *stream,
 | 
					gboolean       g_io_stream_close             (GIOStream            *stream,
 | 
				
			||||||
					      GCancellable         *cancellable,
 | 
										      GCancellable         *cancellable,
 | 
				
			||||||
					      GError              **error);
 | 
										      GError              **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void           g_io_stream_close_async       (GIOStream            *stream,
 | 
					void           g_io_stream_close_async       (GIOStream            *stream,
 | 
				
			||||||
					      int                   io_priority,
 | 
										      int                   io_priority,
 | 
				
			||||||
					      GCancellable         *cancellable,
 | 
										      GCancellable         *cancellable,
 | 
				
			||||||
					      GAsyncReadyCallback   callback,
 | 
										      GAsyncReadyCallback   callback,
 | 
				
			||||||
					      gpointer              user_data);
 | 
										      gpointer              user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean       g_io_stream_close_finish      (GIOStream            *stream,
 | 
					gboolean       g_io_stream_close_finish      (GIOStream            *stream,
 | 
				
			||||||
					      GAsyncResult         *result,
 | 
										      GAsyncResult         *result,
 | 
				
			||||||
					      GError              **error);
 | 
										      GError              **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean       g_io_stream_is_closed         (GIOStream            *stream);
 | 
					gboolean       g_io_stream_is_closed         (GIOStream            *stream);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean       g_io_stream_has_pending       (GIOStream            *stream);
 | 
					gboolean       g_io_stream_has_pending       (GIOStream            *stream);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean       g_io_stream_set_pending       (GIOStream            *stream,
 | 
					gboolean       g_io_stream_set_pending       (GIOStream            *stream,
 | 
				
			||||||
					      GError              **error);
 | 
										      GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void           g_io_stream_clear_pending     (GIOStream            *stream);
 | 
					void           g_io_stream_clear_pending     (GIOStream            *stream);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -75,18 +75,22 @@ struct _GLoadableIconIface
 | 
				
			|||||||
                                  GError             **error);
 | 
					                                  GError             **error);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType         g_loadable_icon_get_type    (void) G_GNUC_CONST;
 | 
					GType         g_loadable_icon_get_type    (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GInputStream *g_loadable_icon_load        (GLoadableIcon        *icon,
 | 
					GInputStream *g_loadable_icon_load        (GLoadableIcon        *icon,
 | 
				
			||||||
					   int                   size,
 | 
										   int                   size,
 | 
				
			||||||
					   char                **type,
 | 
										   char                **type,
 | 
				
			||||||
					   GCancellable         *cancellable,
 | 
										   GCancellable         *cancellable,
 | 
				
			||||||
					   GError              **error);
 | 
										   GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void          g_loadable_icon_load_async  (GLoadableIcon        *icon,
 | 
					void          g_loadable_icon_load_async  (GLoadableIcon        *icon,
 | 
				
			||||||
					   int                   size,
 | 
										   int                   size,
 | 
				
			||||||
					   GCancellable         *cancellable,
 | 
										   GCancellable         *cancellable,
 | 
				
			||||||
					   GAsyncReadyCallback   callback,
 | 
										   GAsyncReadyCallback   callback,
 | 
				
			||||||
					   gpointer              user_data);
 | 
										   gpointer              user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GInputStream *g_loadable_icon_load_finish (GLoadableIcon        *icon,
 | 
					GInputStream *g_loadable_icon_load_finish (GLoadableIcon        *icon,
 | 
				
			||||||
					   GAsyncResult         *res,
 | 
										   GAsyncResult         *res,
 | 
				
			||||||
					   char                **type,
 | 
										   char                **type,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -60,6 +60,7 @@ struct _GLocalDirectoryMonitorClass
 | 
				
			|||||||
  gboolean (* is_supported) (void);
 | 
					  gboolean (* is_supported) (void);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType           g_local_directory_monitor_get_type (void) G_GNUC_CONST;
 | 
					GType           g_local_directory_monitor_get_type (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GFileMonitor * _g_local_directory_monitor_new      (const char         *dirname,
 | 
					GFileMonitor * _g_local_directory_monitor_new      (const char         *dirname,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -51,9 +51,12 @@ struct _GLocalFileInputStreamClass
 | 
				
			|||||||
  GFileInputStreamClass parent_class;
 | 
					  GFileInputStreamClass parent_class;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType              _g_local_file_input_stream_get_type (void) G_GNUC_CONST;
 | 
					GType              _g_local_file_input_stream_get_type (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileInputStream *_g_local_file_input_stream_new          (int                    fd);
 | 
					GFileInputStream *_g_local_file_input_stream_new          (int                    fd);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void              _g_local_file_input_stream_set_do_close (GLocalFileInputStream *in,
 | 
					void              _g_local_file_input_stream_set_do_close (GLocalFileInputStream *in,
 | 
				
			||||||
							   gboolean               do_close);
 | 
												   gboolean               do_close);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -52,7 +52,9 @@ struct _GLocalFileIOStreamClass
 | 
				
			|||||||
  GFileIOStreamClass parent_class;
 | 
					  GFileIOStreamClass parent_class;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType           _g_local_file_io_stream_get_type (void) G_GNUC_CONST;
 | 
					GType           _g_local_file_io_stream_get_type (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFileIOStream * _g_local_file_io_stream_new (GLocalFileOutputStream *output_stream);
 | 
					GFileIOStream * _g_local_file_io_stream_new (GLocalFileOutputStream *output_stream);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -53,6 +53,7 @@ struct _GLocalFileMonitorClass
 | 
				
			|||||||
  gboolean (* is_supported) (void);
 | 
					  gboolean (* is_supported) (void);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType           g_local_file_monitor_get_type (void) G_GNUC_CONST;
 | 
					GType           g_local_file_monitor_get_type (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GFileMonitor * _g_local_file_monitor_new      (const char         *pathname,
 | 
					GFileMonitor * _g_local_file_monitor_new      (const char         *pathname,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -67,14 +67,18 @@ struct _GMemoryInputStreamClass
 | 
				
			|||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType          g_memory_input_stream_get_type      (void) G_GNUC_CONST;
 | 
					GType          g_memory_input_stream_get_type      (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GInputStream * g_memory_input_stream_new           (void);
 | 
					GInputStream * g_memory_input_stream_new           (void);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GInputStream * g_memory_input_stream_new_from_data (const void         *data,
 | 
					GInputStream * g_memory_input_stream_new_from_data (const void         *data,
 | 
				
			||||||
                                                    gssize              len,
 | 
					                                                    gssize              len,
 | 
				
			||||||
                                                    GDestroyNotify      destroy);
 | 
					                                                    GDestroyNotify      destroy);
 | 
				
			||||||
GLIB_AVAILABLE_IN_2_34
 | 
					GLIB_AVAILABLE_IN_2_34
 | 
				
			||||||
GInputStream * g_memory_input_stream_new_from_bytes (GBytes            *bytes);
 | 
					GInputStream * g_memory_input_stream_new_from_bytes (GBytes            *bytes);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void           g_memory_input_stream_add_data      (GMemoryInputStream *stream,
 | 
					void           g_memory_input_stream_add_data      (GMemoryInputStream *stream,
 | 
				
			||||||
                                                    const void         *data,
 | 
					                                                    const void         *data,
 | 
				
			||||||
                                                    gssize              len,
 | 
					                                                    gssize              len,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -82,17 +82,23 @@ struct _GMemoryOutputStreamClass
 | 
				
			|||||||
typedef gpointer (* GReallocFunc) (gpointer data,
 | 
					typedef gpointer (* GReallocFunc) (gpointer data,
 | 
				
			||||||
                                   gsize    size);
 | 
					                                   gsize    size);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType          g_memory_output_stream_get_type      (void) G_GNUC_CONST;
 | 
					GType          g_memory_output_stream_get_type      (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GOutputStream *g_memory_output_stream_new           (gpointer             data,
 | 
					GOutputStream *g_memory_output_stream_new           (gpointer             data,
 | 
				
			||||||
                                                     gsize                size,
 | 
					                                                     gsize                size,
 | 
				
			||||||
                                                     GReallocFunc         realloc_function,
 | 
					                                                     GReallocFunc         realloc_function,
 | 
				
			||||||
                                                     GDestroyNotify       destroy_function);
 | 
					                                                     GDestroyNotify       destroy_function);
 | 
				
			||||||
GLIB_AVAILABLE_IN_2_36
 | 
					GLIB_AVAILABLE_IN_2_36
 | 
				
			||||||
GOutputStream *g_memory_output_stream_new_resizable (void);
 | 
					GOutputStream *g_memory_output_stream_new_resizable (void);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gpointer       g_memory_output_stream_get_data      (GMemoryOutputStream *ostream);
 | 
					gpointer       g_memory_output_stream_get_data      (GMemoryOutputStream *ostream);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gsize          g_memory_output_stream_get_size      (GMemoryOutputStream *ostream);
 | 
					gsize          g_memory_output_stream_get_size      (GMemoryOutputStream *ostream);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gsize          g_memory_output_stream_get_data_size (GMemoryOutputStream *ostream);
 | 
					gsize          g_memory_output_stream_get_data_size (GMemoryOutputStream *ostream);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gpointer       g_memory_output_stream_steal_data    (GMemoryOutputStream *ostream);
 | 
					gpointer       g_memory_output_stream_steal_data    (GMemoryOutputStream *ostream);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GLIB_AVAILABLE_IN_2_34
 | 
					GLIB_AVAILABLE_IN_2_34
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										24
									
								
								gio/gmount.h
									
									
									
									
									
								
							
							
						
						
									
										24
									
								
								gio/gmount.h
									
									
									
									
									
								
							@@ -163,17 +163,28 @@ struct _GMountIface
 | 
				
			|||||||
  GIcon       * (* get_symbolic_icon)       (GMount              *mount);
 | 
					  GIcon       * (* get_symbolic_icon)       (GMount              *mount);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType       g_mount_get_type                  (void) G_GNUC_CONST;
 | 
					GType       g_mount_get_type                  (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFile     * g_mount_get_root                  (GMount              *mount);
 | 
					GFile     * g_mount_get_root                  (GMount              *mount);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GFile     * g_mount_get_default_location      (GMount              *mount);
 | 
					GFile     * g_mount_get_default_location      (GMount              *mount);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char      * g_mount_get_name                  (GMount              *mount);
 | 
					char      * g_mount_get_name                  (GMount              *mount);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIcon     * g_mount_get_icon                  (GMount              *mount);
 | 
					GIcon     * g_mount_get_icon                  (GMount              *mount);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIcon     * g_mount_get_symbolic_icon         (GMount              *mount);
 | 
					GIcon     * g_mount_get_symbolic_icon         (GMount              *mount);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
char      * g_mount_get_uuid                  (GMount              *mount);
 | 
					char      * g_mount_get_uuid                  (GMount              *mount);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GVolume   * g_mount_get_volume                (GMount              *mount);
 | 
					GVolume   * g_mount_get_volume                (GMount              *mount);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GDrive    * g_mount_get_drive                 (GMount              *mount);
 | 
					GDrive    * g_mount_get_drive                 (GMount              *mount);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean    g_mount_can_unmount               (GMount              *mount);
 | 
					gboolean    g_mount_can_unmount               (GMount              *mount);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean    g_mount_can_eject                 (GMount              *mount);
 | 
					gboolean    g_mount_can_eject                 (GMount              *mount);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GLIB_DEPRECATED_FOR(g_mount_unmount_with_operation)
 | 
					GLIB_DEPRECATED_FOR(g_mount_unmount_with_operation)
 | 
				
			||||||
@@ -200,53 +211,66 @@ gboolean    g_mount_eject_finish              (GMount              *mount,
 | 
				
			|||||||
                                               GAsyncResult        *result,
 | 
					                                               GAsyncResult        *result,
 | 
				
			||||||
                                               GError             **error);
 | 
					                                               GError             **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void        g_mount_remount                   (GMount              *mount,
 | 
					void        g_mount_remount                   (GMount              *mount,
 | 
				
			||||||
                                               GMountMountFlags     flags,
 | 
					                                               GMountMountFlags     flags,
 | 
				
			||||||
                                               GMountOperation     *mount_operation,
 | 
					                                               GMountOperation     *mount_operation,
 | 
				
			||||||
                                               GCancellable        *cancellable,
 | 
					                                               GCancellable        *cancellable,
 | 
				
			||||||
                                               GAsyncReadyCallback  callback,
 | 
					                                               GAsyncReadyCallback  callback,
 | 
				
			||||||
                                               gpointer             user_data);
 | 
					                                               gpointer             user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean    g_mount_remount_finish            (GMount              *mount,
 | 
					gboolean    g_mount_remount_finish            (GMount              *mount,
 | 
				
			||||||
                                               GAsyncResult        *result,
 | 
					                                               GAsyncResult        *result,
 | 
				
			||||||
                                               GError             **error);
 | 
					                                               GError             **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void        g_mount_guess_content_type        (GMount              *mount,
 | 
					void        g_mount_guess_content_type        (GMount              *mount,
 | 
				
			||||||
                                               gboolean             force_rescan,
 | 
					                                               gboolean             force_rescan,
 | 
				
			||||||
                                               GCancellable        *cancellable,
 | 
					                                               GCancellable        *cancellable,
 | 
				
			||||||
                                               GAsyncReadyCallback  callback,
 | 
					                                               GAsyncReadyCallback  callback,
 | 
				
			||||||
                                               gpointer             user_data);
 | 
					                                               gpointer             user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar    ** g_mount_guess_content_type_finish (GMount              *mount,
 | 
					gchar    ** g_mount_guess_content_type_finish (GMount              *mount,
 | 
				
			||||||
                                               GAsyncResult        *result,
 | 
					                                               GAsyncResult        *result,
 | 
				
			||||||
                                               GError             **error);
 | 
					                                               GError             **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar    ** g_mount_guess_content_type_sync   (GMount              *mount,
 | 
					gchar    ** g_mount_guess_content_type_sync   (GMount              *mount,
 | 
				
			||||||
                                               gboolean             force_rescan,
 | 
					                                               gboolean             force_rescan,
 | 
				
			||||||
                                               GCancellable        *cancellable,
 | 
					                                               GCancellable        *cancellable,
 | 
				
			||||||
                                               GError             **error);
 | 
					                                               GError             **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean    g_mount_is_shadowed               (GMount              *mount);
 | 
					gboolean    g_mount_is_shadowed               (GMount              *mount);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void        g_mount_shadow                    (GMount              *mount);
 | 
					void        g_mount_shadow                    (GMount              *mount);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void        g_mount_unshadow                  (GMount              *mount);
 | 
					void        g_mount_unshadow                  (GMount              *mount);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void        g_mount_unmount_with_operation    (GMount              *mount,
 | 
					void        g_mount_unmount_with_operation    (GMount              *mount,
 | 
				
			||||||
                                               GMountUnmountFlags   flags,
 | 
					                                               GMountUnmountFlags   flags,
 | 
				
			||||||
                                               GMountOperation     *mount_operation,
 | 
					                                               GMountOperation     *mount_operation,
 | 
				
			||||||
                                               GCancellable        *cancellable,
 | 
					                                               GCancellable        *cancellable,
 | 
				
			||||||
                                               GAsyncReadyCallback  callback,
 | 
					                                               GAsyncReadyCallback  callback,
 | 
				
			||||||
                                               gpointer             user_data);
 | 
					                                               gpointer             user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean    g_mount_unmount_with_operation_finish (GMount          *mount,
 | 
					gboolean    g_mount_unmount_with_operation_finish (GMount          *mount,
 | 
				
			||||||
                                               GAsyncResult        *result,
 | 
					                                               GAsyncResult        *result,
 | 
				
			||||||
                                               GError             **error);
 | 
					                                               GError             **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void        g_mount_eject_with_operation      (GMount              *mount,
 | 
					void        g_mount_eject_with_operation      (GMount              *mount,
 | 
				
			||||||
                                               GMountUnmountFlags   flags,
 | 
					                                               GMountUnmountFlags   flags,
 | 
				
			||||||
                                               GMountOperation     *mount_operation,
 | 
					                                               GMountOperation     *mount_operation,
 | 
				
			||||||
                                               GCancellable        *cancellable,
 | 
					                                               GCancellable        *cancellable,
 | 
				
			||||||
                                               GAsyncReadyCallback  callback,
 | 
					                                               GAsyncReadyCallback  callback,
 | 
				
			||||||
                                               gpointer             user_data);
 | 
					                                               gpointer             user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean    g_mount_eject_with_operation_finish (GMount            *mount,
 | 
					gboolean    g_mount_eject_with_operation_finish (GMount            *mount,
 | 
				
			||||||
                                               GAsyncResult        *result,
 | 
					                                               GAsyncResult        *result,
 | 
				
			||||||
                                               GError             **error);
 | 
					                                               GError             **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar *g_mount_get_sort_key             (GMount              *mount);
 | 
					const gchar *g_mount_get_sort_key             (GMount              *mount);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -98,27 +98,42 @@ struct _GMountOperationClass
 | 
				
			|||||||
  void (*_g_reserved9) (void);
 | 
					  void (*_g_reserved9) (void);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType             g_mount_operation_get_type      (void) G_GNUC_CONST;
 | 
					GType             g_mount_operation_get_type      (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GMountOperation * g_mount_operation_new           (void);
 | 
					GMountOperation * g_mount_operation_new           (void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const char *  g_mount_operation_get_username      (GMountOperation *op);
 | 
					const char *  g_mount_operation_get_username      (GMountOperation *op);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void          g_mount_operation_set_username      (GMountOperation *op,
 | 
					void          g_mount_operation_set_username      (GMountOperation *op,
 | 
				
			||||||
						   const char      *username);
 | 
											   const char      *username);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const char *  g_mount_operation_get_password      (GMountOperation *op);
 | 
					const char *  g_mount_operation_get_password      (GMountOperation *op);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void          g_mount_operation_set_password      (GMountOperation *op,
 | 
					void          g_mount_operation_set_password      (GMountOperation *op,
 | 
				
			||||||
						   const char      *password);
 | 
											   const char      *password);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean      g_mount_operation_get_anonymous     (GMountOperation *op);
 | 
					gboolean      g_mount_operation_get_anonymous     (GMountOperation *op);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void          g_mount_operation_set_anonymous     (GMountOperation *op,
 | 
					void          g_mount_operation_set_anonymous     (GMountOperation *op,
 | 
				
			||||||
						   gboolean         anonymous);
 | 
											   gboolean         anonymous);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const char *  g_mount_operation_get_domain        (GMountOperation *op);
 | 
					const char *  g_mount_operation_get_domain        (GMountOperation *op);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void          g_mount_operation_set_domain        (GMountOperation *op,
 | 
					void          g_mount_operation_set_domain        (GMountOperation *op,
 | 
				
			||||||
						   const char      *domain);
 | 
											   const char      *domain);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GPasswordSave g_mount_operation_get_password_save (GMountOperation *op);
 | 
					GPasswordSave g_mount_operation_get_password_save (GMountOperation *op);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void          g_mount_operation_set_password_save (GMountOperation *op,
 | 
					void          g_mount_operation_set_password_save (GMountOperation *op,
 | 
				
			||||||
						   GPasswordSave    save);
 | 
											   GPasswordSave    save);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
int           g_mount_operation_get_choice        (GMountOperation *op);
 | 
					int           g_mount_operation_get_choice        (GMountOperation *op);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void          g_mount_operation_set_choice        (GMountOperation *op,
 | 
					void          g_mount_operation_set_choice        (GMountOperation *op,
 | 
				
			||||||
						   int              choice);
 | 
											   int              choice);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void          g_mount_operation_reply             (GMountOperation *op,
 | 
					void          g_mount_operation_reply             (GMountOperation *op,
 | 
				
			||||||
						   GMountOperationResult result);
 | 
											   GMountOperationResult result);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -55,6 +55,7 @@ struct _GNativeVolumeMonitorClass
 | 
				
			|||||||
                                         GCancellable *cancellable);
 | 
					                                         GCancellable *cancellable);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType g_native_volume_monitor_get_type (void) G_GNUC_CONST;
 | 
					GType g_native_volume_monitor_get_type (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -53,18 +53,25 @@ struct _GNetworkAddressClass
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType               g_network_address_get_type     (void) G_GNUC_CONST;
 | 
					GType               g_network_address_get_type     (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketConnectable *g_network_address_new          (const gchar      *hostname,
 | 
					GSocketConnectable *g_network_address_new          (const gchar      *hostname,
 | 
				
			||||||
						    guint16           port);
 | 
											    guint16           port);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketConnectable *g_network_address_parse        (const gchar      *host_and_port,
 | 
					GSocketConnectable *g_network_address_parse        (const gchar      *host_and_port,
 | 
				
			||||||
						    guint16           default_port,
 | 
											    guint16           default_port,
 | 
				
			||||||
						    GError          **error);
 | 
											    GError          **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketConnectable *g_network_address_parse_uri    (const gchar      *uri,
 | 
					GSocketConnectable *g_network_address_parse_uri    (const gchar      *uri,
 | 
				
			||||||
    						    guint16           default_port,
 | 
					    						    guint16           default_port,
 | 
				
			||||||
						    GError          **error);
 | 
											    GError          **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar        *g_network_address_get_hostname (GNetworkAddress  *addr);
 | 
					const gchar        *g_network_address_get_hostname (GNetworkAddress  *addr);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint16             g_network_address_get_port     (GNetworkAddress  *addr);
 | 
					guint16             g_network_address_get_port     (GNetworkAddress  *addr);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar        *g_network_address_get_scheme   (GNetworkAddress  *addr);
 | 
					const gchar        *g_network_address_get_scheme   (GNetworkAddress  *addr);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -71,17 +71,21 @@ GType            g_network_monitor_get_type              (void) G_GNUC_CONST;
 | 
				
			|||||||
GLIB_AVAILABLE_IN_2_32
 | 
					GLIB_AVAILABLE_IN_2_32
 | 
				
			||||||
GNetworkMonitor *g_network_monitor_get_default           (void);
 | 
					GNetworkMonitor *g_network_monitor_get_default           (void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean         g_network_monitor_get_network_available (GNetworkMonitor     *monitor);
 | 
					gboolean         g_network_monitor_get_network_available (GNetworkMonitor     *monitor);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean         g_network_monitor_can_reach             (GNetworkMonitor     *monitor,
 | 
					gboolean         g_network_monitor_can_reach             (GNetworkMonitor     *monitor,
 | 
				
			||||||
							  GSocketConnectable  *connectable,
 | 
												  GSocketConnectable  *connectable,
 | 
				
			||||||
							  GCancellable        *cancellable,
 | 
												  GCancellable        *cancellable,
 | 
				
			||||||
							  GError             **error);
 | 
												  GError             **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void             g_network_monitor_can_reach_async       (GNetworkMonitor     *monitor,
 | 
					void             g_network_monitor_can_reach_async       (GNetworkMonitor     *monitor,
 | 
				
			||||||
							  GSocketConnectable  *connectable,
 | 
												  GSocketConnectable  *connectable,
 | 
				
			||||||
							  GCancellable        *cancellable,
 | 
												  GCancellable        *cancellable,
 | 
				
			||||||
							  GAsyncReadyCallback  callback,
 | 
												  GAsyncReadyCallback  callback,
 | 
				
			||||||
							  gpointer             user_data);
 | 
												  gpointer             user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean         g_network_monitor_can_reach_finish      (GNetworkMonitor     *monitor,
 | 
					gboolean         g_network_monitor_can_reach_finish      (GNetworkMonitor     *monitor,
 | 
				
			||||||
							  GAsyncResult        *result,
 | 
												  GAsyncResult        *result,
 | 
				
			||||||
							  GError             **error);
 | 
												  GError             **error);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -50,6 +50,7 @@ struct _GNetworkMonitorBaseClass {
 | 
				
			|||||||
  gpointer padding[8];
 | 
					  gpointer padding[8];
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType g_network_monitor_base_get_type (void);
 | 
					GType g_network_monitor_base_get_type (void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*< protected >*/
 | 
					/*< protected >*/
 | 
				
			||||||
@@ -59,6 +60,7 @@ void g_network_monitor_base_add_network    (GNetworkMonitorBase  *monitor,
 | 
				
			|||||||
GLIB_AVAILABLE_IN_2_32
 | 
					GLIB_AVAILABLE_IN_2_32
 | 
				
			||||||
void g_network_monitor_base_remove_network (GNetworkMonitorBase  *monitor,
 | 
					void g_network_monitor_base_remove_network (GNetworkMonitorBase  *monitor,
 | 
				
			||||||
					    GInetAddressMask     *network);
 | 
										    GInetAddressMask     *network);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void g_network_monitor_base_set_networks   (GNetworkMonitorBase  *monitor,
 | 
					void g_network_monitor_base_set_networks   (GNetworkMonitorBase  *monitor,
 | 
				
			||||||
					    GInetAddressMask    **networks,
 | 
										    GInetAddressMask    **networks,
 | 
				
			||||||
					    gint                  length);
 | 
										    gint                  length);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -53,16 +53,23 @@ struct _GNetworkServiceClass
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                g_network_service_get_type      (void) G_GNUC_CONST;
 | 
					GType                g_network_service_get_type      (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketConnectable  *g_network_service_new           (const gchar     *service,
 | 
					GSocketConnectable  *g_network_service_new           (const gchar     *service,
 | 
				
			||||||
						      const gchar     *protocol,
 | 
											      const gchar     *protocol,
 | 
				
			||||||
						      const gchar     *domain);
 | 
											      const gchar     *domain);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar         *g_network_service_get_service   (GNetworkService *srv);
 | 
					const gchar         *g_network_service_get_service   (GNetworkService *srv);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar         *g_network_service_get_protocol  (GNetworkService *srv);
 | 
					const gchar         *g_network_service_get_protocol  (GNetworkService *srv);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar         *g_network_service_get_domain    (GNetworkService *srv);
 | 
					const gchar         *g_network_service_get_domain    (GNetworkService *srv);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar         *g_network_service_get_scheme    (GNetworkService *srv);
 | 
					const gchar         *g_network_service_get_scheme    (GNetworkService *srv);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                 g_network_service_set_scheme    (GNetworkService *srv, const gchar *scheme);
 | 
					void                 g_network_service_set_scheme    (GNetworkService *srv, const gchar *scheme);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -133,13 +133,16 @@ struct _GOutputStreamClass
 | 
				
			|||||||
  void (*_g_reserved8) (void);
 | 
					  void (*_g_reserved8) (void);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType    g_output_stream_get_type      (void) G_GNUC_CONST;
 | 
					GType    g_output_stream_get_type      (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gssize   g_output_stream_write         (GOutputStream             *stream,
 | 
					gssize   g_output_stream_write         (GOutputStream             *stream,
 | 
				
			||||||
					const void                *buffer,
 | 
										const void                *buffer,
 | 
				
			||||||
					gsize                      count,
 | 
										gsize                      count,
 | 
				
			||||||
					GCancellable              *cancellable,
 | 
										GCancellable              *cancellable,
 | 
				
			||||||
					GError                   **error);
 | 
										GError                   **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_output_stream_write_all     (GOutputStream             *stream,
 | 
					gboolean g_output_stream_write_all     (GOutputStream             *stream,
 | 
				
			||||||
					const void                *buffer,
 | 
										const void                *buffer,
 | 
				
			||||||
					gsize                      count,
 | 
										gsize                      count,
 | 
				
			||||||
@@ -151,17 +154,21 @@ gssize   g_output_stream_write_bytes   (GOutputStream             *stream,
 | 
				
			|||||||
					GBytes                    *bytes,
 | 
										GBytes                    *bytes,
 | 
				
			||||||
					GCancellable              *cancellable,
 | 
										GCancellable              *cancellable,
 | 
				
			||||||
					GError                   **error);
 | 
										GError                   **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gssize   g_output_stream_splice        (GOutputStream             *stream,
 | 
					gssize   g_output_stream_splice        (GOutputStream             *stream,
 | 
				
			||||||
					GInputStream              *source,
 | 
										GInputStream              *source,
 | 
				
			||||||
					GOutputStreamSpliceFlags   flags,
 | 
										GOutputStreamSpliceFlags   flags,
 | 
				
			||||||
					GCancellable              *cancellable,
 | 
										GCancellable              *cancellable,
 | 
				
			||||||
					GError                   **error);
 | 
										GError                   **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_output_stream_flush         (GOutputStream             *stream,
 | 
					gboolean g_output_stream_flush         (GOutputStream             *stream,
 | 
				
			||||||
					GCancellable              *cancellable,
 | 
										GCancellable              *cancellable,
 | 
				
			||||||
					GError                   **error);
 | 
										GError                   **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_output_stream_close         (GOutputStream             *stream,
 | 
					gboolean g_output_stream_close         (GOutputStream             *stream,
 | 
				
			||||||
					GCancellable              *cancellable,
 | 
										GCancellable              *cancellable,
 | 
				
			||||||
					GError                   **error);
 | 
										GError                   **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void     g_output_stream_write_async   (GOutputStream             *stream,
 | 
					void     g_output_stream_write_async   (GOutputStream             *stream,
 | 
				
			||||||
					const void                *buffer,
 | 
										const void                *buffer,
 | 
				
			||||||
					gsize                      count,
 | 
										gsize                      count,
 | 
				
			||||||
@@ -169,6 +176,7 @@ void     g_output_stream_write_async   (GOutputStream             *stream,
 | 
				
			|||||||
					GCancellable              *cancellable,
 | 
										GCancellable              *cancellable,
 | 
				
			||||||
					GAsyncReadyCallback        callback,
 | 
										GAsyncReadyCallback        callback,
 | 
				
			||||||
					gpointer                   user_data);
 | 
										gpointer                   user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gssize   g_output_stream_write_finish  (GOutputStream             *stream,
 | 
					gssize   g_output_stream_write_finish  (GOutputStream             *stream,
 | 
				
			||||||
					GAsyncResult              *result,
 | 
										GAsyncResult              *result,
 | 
				
			||||||
					GError                   **error);
 | 
										GError                   **error);
 | 
				
			||||||
@@ -183,6 +191,7 @@ GLIB_AVAILABLE_IN_2_34
 | 
				
			|||||||
gssize   g_output_stream_write_bytes_finish (GOutputStream             *stream,
 | 
					gssize   g_output_stream_write_bytes_finish (GOutputStream             *stream,
 | 
				
			||||||
					     GAsyncResult              *result,
 | 
										     GAsyncResult              *result,
 | 
				
			||||||
					     GError                   **error);
 | 
										     GError                   **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void     g_output_stream_splice_async  (GOutputStream             *stream,
 | 
					void     g_output_stream_splice_async  (GOutputStream             *stream,
 | 
				
			||||||
					GInputStream              *source,
 | 
										GInputStream              *source,
 | 
				
			||||||
					GOutputStreamSpliceFlags   flags,
 | 
										GOutputStreamSpliceFlags   flags,
 | 
				
			||||||
@@ -190,31 +199,41 @@ void     g_output_stream_splice_async  (GOutputStream             *stream,
 | 
				
			|||||||
					GCancellable              *cancellable,
 | 
										GCancellable              *cancellable,
 | 
				
			||||||
					GAsyncReadyCallback        callback,
 | 
										GAsyncReadyCallback        callback,
 | 
				
			||||||
					gpointer                   user_data);
 | 
										gpointer                   user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gssize   g_output_stream_splice_finish (GOutputStream             *stream,
 | 
					gssize   g_output_stream_splice_finish (GOutputStream             *stream,
 | 
				
			||||||
					GAsyncResult              *result,
 | 
										GAsyncResult              *result,
 | 
				
			||||||
					GError                   **error);
 | 
										GError                   **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void     g_output_stream_flush_async   (GOutputStream             *stream,
 | 
					void     g_output_stream_flush_async   (GOutputStream             *stream,
 | 
				
			||||||
					int                        io_priority,
 | 
										int                        io_priority,
 | 
				
			||||||
					GCancellable              *cancellable,
 | 
										GCancellable              *cancellable,
 | 
				
			||||||
					GAsyncReadyCallback        callback,
 | 
										GAsyncReadyCallback        callback,
 | 
				
			||||||
					gpointer                   user_data);
 | 
										gpointer                   user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_output_stream_flush_finish  (GOutputStream             *stream,
 | 
					gboolean g_output_stream_flush_finish  (GOutputStream             *stream,
 | 
				
			||||||
					GAsyncResult              *result,
 | 
										GAsyncResult              *result,
 | 
				
			||||||
					GError                   **error);
 | 
										GError                   **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void     g_output_stream_close_async   (GOutputStream             *stream,
 | 
					void     g_output_stream_close_async   (GOutputStream             *stream,
 | 
				
			||||||
					int                        io_priority,
 | 
										int                        io_priority,
 | 
				
			||||||
					GCancellable              *cancellable,
 | 
										GCancellable              *cancellable,
 | 
				
			||||||
					GAsyncReadyCallback        callback,
 | 
										GAsyncReadyCallback        callback,
 | 
				
			||||||
					gpointer                   user_data);
 | 
										gpointer                   user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_output_stream_close_finish  (GOutputStream             *stream,
 | 
					gboolean g_output_stream_close_finish  (GOutputStream             *stream,
 | 
				
			||||||
					GAsyncResult              *result,
 | 
										GAsyncResult              *result,
 | 
				
			||||||
					GError                   **error);
 | 
										GError                   **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_output_stream_is_closed     (GOutputStream             *stream);
 | 
					gboolean g_output_stream_is_closed     (GOutputStream             *stream);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_output_stream_is_closing    (GOutputStream             *stream);
 | 
					gboolean g_output_stream_is_closing    (GOutputStream             *stream);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_output_stream_has_pending   (GOutputStream             *stream);
 | 
					gboolean g_output_stream_has_pending   (GOutputStream             *stream);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_output_stream_set_pending   (GOutputStream             *stream,
 | 
					gboolean g_output_stream_set_pending   (GOutputStream             *stream,
 | 
				
			||||||
					GError                   **error);
 | 
										GError                   **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void     g_output_stream_clear_pending (GOutputStream             *stream);
 | 
					void     g_output_stream_clear_pending (GOutputStream             *stream);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -81,33 +81,44 @@ struct _GPermissionClass {
 | 
				
			|||||||
  gpointer reserved[16];
 | 
					  gpointer reserved[16];
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType           g_permission_get_type           (void);
 | 
					GType           g_permission_get_type           (void);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean        g_permission_acquire            (GPermission          *permission,
 | 
					gboolean        g_permission_acquire            (GPermission          *permission,
 | 
				
			||||||
                                                 GCancellable         *cancellable,
 | 
					                                                 GCancellable         *cancellable,
 | 
				
			||||||
                                                 GError              **error);
 | 
					                                                 GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void            g_permission_acquire_async      (GPermission          *permission,
 | 
					void            g_permission_acquire_async      (GPermission          *permission,
 | 
				
			||||||
                                                 GCancellable         *cancellable,
 | 
					                                                 GCancellable         *cancellable,
 | 
				
			||||||
                                                 GAsyncReadyCallback   callback,
 | 
					                                                 GAsyncReadyCallback   callback,
 | 
				
			||||||
                                                 gpointer              user_data);
 | 
					                                                 gpointer              user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean        g_permission_acquire_finish     (GPermission          *permission,
 | 
					gboolean        g_permission_acquire_finish     (GPermission          *permission,
 | 
				
			||||||
                                                 GAsyncResult         *result,
 | 
					                                                 GAsyncResult         *result,
 | 
				
			||||||
                                                 GError              **error);
 | 
					                                                 GError              **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean        g_permission_release            (GPermission          *permission,
 | 
					gboolean        g_permission_release            (GPermission          *permission,
 | 
				
			||||||
                                                 GCancellable         *cancellable,
 | 
					                                                 GCancellable         *cancellable,
 | 
				
			||||||
                                                 GError              **error);
 | 
					                                                 GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void            g_permission_release_async      (GPermission          *permission,
 | 
					void            g_permission_release_async      (GPermission          *permission,
 | 
				
			||||||
                                                 GCancellable         *cancellable,
 | 
					                                                 GCancellable         *cancellable,
 | 
				
			||||||
                                                 GAsyncReadyCallback   callback,
 | 
					                                                 GAsyncReadyCallback   callback,
 | 
				
			||||||
                                                 gpointer              user_data);
 | 
					                                                 gpointer              user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean        g_permission_release_finish     (GPermission          *permission,
 | 
					gboolean        g_permission_release_finish     (GPermission          *permission,
 | 
				
			||||||
                                                 GAsyncResult         *result,
 | 
					                                                 GAsyncResult         *result,
 | 
				
			||||||
                                                 GError              **error);
 | 
					                                                 GError              **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean        g_permission_get_allowed        (GPermission   *permission);
 | 
					gboolean        g_permission_get_allowed        (GPermission   *permission);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean        g_permission_get_can_acquire    (GPermission   *permission);
 | 
					gboolean        g_permission_get_can_acquire    (GPermission   *permission);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean        g_permission_get_can_release    (GPermission   *permission);
 | 
					gboolean        g_permission_get_can_release    (GPermission   *permission);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void            g_permission_impl_update        (GPermission  *permission,
 | 
					void            g_permission_impl_update        (GPermission  *permission,
 | 
				
			||||||
                                                 gboolean      allowed,
 | 
					                                                 gboolean      allowed,
 | 
				
			||||||
                                                 gboolean      can_acquire,
 | 
					                                                 gboolean      can_acquire,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -81,14 +81,19 @@ struct _GPollableInputStreamInterface
 | 
				
			|||||||
				    GError               **error);
 | 
									    GError               **error);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType    g_pollable_input_stream_get_type         (void) G_GNUC_CONST;
 | 
					GType    g_pollable_input_stream_get_type         (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_pollable_input_stream_can_poll         (GPollableInputStream  *stream);
 | 
					gboolean g_pollable_input_stream_can_poll         (GPollableInputStream  *stream);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_pollable_input_stream_is_readable      (GPollableInputStream  *stream);
 | 
					gboolean g_pollable_input_stream_is_readable      (GPollableInputStream  *stream);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSource *g_pollable_input_stream_create_source    (GPollableInputStream  *stream,
 | 
					GSource *g_pollable_input_stream_create_source    (GPollableInputStream  *stream,
 | 
				
			||||||
						   GCancellable          *cancellable);
 | 
											   GCancellable          *cancellable);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gssize   g_pollable_input_stream_read_nonblocking (GPollableInputStream  *stream,
 | 
					gssize   g_pollable_input_stream_read_nonblocking (GPollableInputStream  *stream,
 | 
				
			||||||
						   void                  *buffer,
 | 
											   void                  *buffer,
 | 
				
			||||||
						   gsize                  count,
 | 
											   gsize                  count,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -81,14 +81,19 @@ struct _GPollableOutputStreamInterface
 | 
				
			|||||||
				     GError                **error);
 | 
									     GError                **error);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType    g_pollable_output_stream_get_type          (void) G_GNUC_CONST;
 | 
					GType    g_pollable_output_stream_get_type          (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_pollable_output_stream_can_poll          (GPollableOutputStream  *stream);
 | 
					gboolean g_pollable_output_stream_can_poll          (GPollableOutputStream  *stream);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_pollable_output_stream_is_writable       (GPollableOutputStream  *stream);
 | 
					gboolean g_pollable_output_stream_is_writable       (GPollableOutputStream  *stream);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSource *g_pollable_output_stream_create_source     (GPollableOutputStream  *stream,
 | 
					GSource *g_pollable_output_stream_create_source     (GPollableOutputStream  *stream,
 | 
				
			||||||
						     GCancellable           *cancellable);
 | 
											     GCancellable           *cancellable);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gssize   g_pollable_output_stream_write_nonblocking (GPollableOutputStream  *stream,
 | 
					gssize   g_pollable_output_stream_write_nonblocking (GPollableOutputStream  *stream,
 | 
				
			||||||
						     const void             *buffer,
 | 
											     const void             *buffer,
 | 
				
			||||||
						     gsize                   count,
 | 
											     gsize                   count,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -29,6 +29,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
G_BEGIN_DECLS
 | 
					G_BEGIN_DECLS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSource *g_pollable_source_new       (GObject        *pollable_stream);
 | 
					GSource *g_pollable_source_new       (GObject        *pollable_stream);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GLIB_AVAILABLE_IN_2_34
 | 
					GLIB_AVAILABLE_IN_2_34
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -96,16 +96,20 @@ struct _GProxyInterface
 | 
				
			|||||||
  gboolean    (* supports_hostname) (GProxy             *proxy);
 | 
					  gboolean    (* supports_hostname) (GProxy             *proxy);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType      g_proxy_get_type                 (void) G_GNUC_CONST;
 | 
					GType      g_proxy_get_type                 (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GProxy    *g_proxy_get_default_for_protocol (const gchar *protocol);
 | 
					GProxy    *g_proxy_get_default_for_protocol (const gchar *protocol);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIOStream *g_proxy_connect           (GProxy               *proxy,
 | 
					GIOStream *g_proxy_connect           (GProxy               *proxy,
 | 
				
			||||||
				      GIOStream            *connection,
 | 
									      GIOStream            *connection,
 | 
				
			||||||
				      GProxyAddress        *proxy_address,
 | 
									      GProxyAddress        *proxy_address,
 | 
				
			||||||
				      GCancellable         *cancellable,
 | 
									      GCancellable         *cancellable,
 | 
				
			||||||
				      GError              **error);
 | 
									      GError              **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void       g_proxy_connect_async     (GProxy               *proxy,
 | 
					void       g_proxy_connect_async     (GProxy               *proxy,
 | 
				
			||||||
				      GIOStream            *connection,
 | 
									      GIOStream            *connection,
 | 
				
			||||||
				      GProxyAddress        *proxy_address,
 | 
									      GProxyAddress        *proxy_address,
 | 
				
			||||||
@@ -113,10 +117,12 @@ void       g_proxy_connect_async     (GProxy               *proxy,
 | 
				
			|||||||
				      GAsyncReadyCallback   callback,
 | 
									      GAsyncReadyCallback   callback,
 | 
				
			||||||
				      gpointer              user_data);
 | 
									      gpointer              user_data);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIOStream *g_proxy_connect_finish    (GProxy               *proxy,
 | 
					GIOStream *g_proxy_connect_finish    (GProxy               *proxy,
 | 
				
			||||||
				      GAsyncResult         *result,
 | 
									      GAsyncResult         *result,
 | 
				
			||||||
				      GError              **error);
 | 
									      GError              **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean   g_proxy_supports_hostname (GProxy               *proxy);
 | 
					gboolean   g_proxy_supports_hostname (GProxy               *proxy);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -55,8 +55,10 @@ struct _GProxyAddressClass
 | 
				
			|||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType           g_proxy_address_get_type    (void) G_GNUC_CONST;
 | 
					GType           g_proxy_address_get_type    (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketAddress *g_proxy_address_new         (GInetAddress *inetaddr,
 | 
					GSocketAddress *g_proxy_address_new         (GInetAddress *inetaddr,
 | 
				
			||||||
					     guint16       port,
 | 
										     guint16       port,
 | 
				
			||||||
					     const gchar  *protocol,
 | 
										     const gchar  *protocol,
 | 
				
			||||||
@@ -65,12 +67,17 @@ GSocketAddress *g_proxy_address_new         (GInetAddress *inetaddr,
 | 
				
			|||||||
					     const gchar  *username,
 | 
										     const gchar  *username,
 | 
				
			||||||
					     const gchar  *password);
 | 
										     const gchar  *password);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar    *g_proxy_address_get_protocol                (GProxyAddress *proxy);
 | 
					const gchar    *g_proxy_address_get_protocol                (GProxyAddress *proxy);
 | 
				
			||||||
GLIB_AVAILABLE_IN_2_34
 | 
					GLIB_AVAILABLE_IN_2_34
 | 
				
			||||||
const gchar    *g_proxy_address_get_destination_protocol    (GProxyAddress *proxy);
 | 
					const gchar    *g_proxy_address_get_destination_protocol    (GProxyAddress *proxy);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar    *g_proxy_address_get_destination_hostname    (GProxyAddress *proxy);
 | 
					const gchar    *g_proxy_address_get_destination_hostname    (GProxyAddress *proxy);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint16         g_proxy_address_get_destination_port        (GProxyAddress *proxy);
 | 
					guint16         g_proxy_address_get_destination_port        (GProxyAddress *proxy);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar    *g_proxy_address_get_username                (GProxyAddress *proxy);
 | 
					const gchar    *g_proxy_address_get_username                (GProxyAddress *proxy);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar    *g_proxy_address_get_password                (GProxyAddress *proxy);
 | 
					const gchar    *g_proxy_address_get_password                (GProxyAddress *proxy);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GLIB_AVAILABLE_IN_2_34
 | 
					GLIB_AVAILABLE_IN_2_34
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -68,6 +68,7 @@ struct _GProxyAddressEnumeratorClass
 | 
				
			|||||||
  void (*_g_reserved7) (void);
 | 
					  void (*_g_reserved7) (void);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType           g_proxy_address_enumerator_get_type    (void) G_GNUC_CONST;
 | 
					GType           g_proxy_address_enumerator_get_type    (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -68,19 +68,25 @@ struct _GProxyResolverInterface {
 | 
				
			|||||||
			      GError              **error);
 | 
								      GError              **error);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType		g_proxy_resolver_get_type       (void) G_GNUC_CONST;
 | 
					GType		g_proxy_resolver_get_type       (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GProxyResolver *g_proxy_resolver_get_default    (void);
 | 
					GProxyResolver *g_proxy_resolver_get_default    (void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean        g_proxy_resolver_is_supported   (GProxyResolver       *resolver);
 | 
					gboolean        g_proxy_resolver_is_supported   (GProxyResolver       *resolver);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar	      **g_proxy_resolver_lookup		(GProxyResolver       *resolver,
 | 
					gchar	      **g_proxy_resolver_lookup		(GProxyResolver       *resolver,
 | 
				
			||||||
						 const gchar          *uri,
 | 
											 const gchar          *uri,
 | 
				
			||||||
						 GCancellable         *cancellable,
 | 
											 GCancellable         *cancellable,
 | 
				
			||||||
						 GError              **error);
 | 
											 GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void		g_proxy_resolver_lookup_async   (GProxyResolver       *resolver,
 | 
					void		g_proxy_resolver_lookup_async   (GProxyResolver       *resolver,
 | 
				
			||||||
						 const gchar          *uri,
 | 
											 const gchar          *uri,
 | 
				
			||||||
						 GCancellable         *cancellable,
 | 
											 GCancellable         *cancellable,
 | 
				
			||||||
						 GAsyncReadyCallback   callback,
 | 
											 GAsyncReadyCallback   callback,
 | 
				
			||||||
						 gpointer              user_data);
 | 
											 gpointer              user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar	      **g_proxy_resolver_lookup_finish  (GProxyResolver       *resolver,
 | 
					gchar	      **g_proxy_resolver_lookup_finish  (GProxyResolver       *resolver,
 | 
				
			||||||
						 GAsyncResult         *result,
 | 
											 GAsyncResult         *result,
 | 
				
			||||||
						 GError              **error);
 | 
											 GError              **error);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -115,44 +115,56 @@ struct _GResolverClass {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType      g_resolver_get_type                  (void) G_GNUC_CONST;
 | 
					GType      g_resolver_get_type                  (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GResolver *g_resolver_get_default               (void);
 | 
					GResolver *g_resolver_get_default               (void);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void       g_resolver_set_default               (GResolver            *resolver);
 | 
					void       g_resolver_set_default               (GResolver            *resolver);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GList     *g_resolver_lookup_by_name            (GResolver            *resolver,
 | 
					GList     *g_resolver_lookup_by_name            (GResolver            *resolver,
 | 
				
			||||||
						 const gchar          *hostname,
 | 
											 const gchar          *hostname,
 | 
				
			||||||
						 GCancellable         *cancellable,
 | 
											 GCancellable         *cancellable,
 | 
				
			||||||
						 GError              **error);
 | 
											 GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void       g_resolver_lookup_by_name_async      (GResolver            *resolver,
 | 
					void       g_resolver_lookup_by_name_async      (GResolver            *resolver,
 | 
				
			||||||
						 const gchar          *hostname,
 | 
											 const gchar          *hostname,
 | 
				
			||||||
						 GCancellable         *cancellable,
 | 
											 GCancellable         *cancellable,
 | 
				
			||||||
						 GAsyncReadyCallback   callback,
 | 
											 GAsyncReadyCallback   callback,
 | 
				
			||||||
						 gpointer              user_data);
 | 
											 gpointer              user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GList     *g_resolver_lookup_by_name_finish     (GResolver            *resolver,
 | 
					GList     *g_resolver_lookup_by_name_finish     (GResolver            *resolver,
 | 
				
			||||||
						 GAsyncResult         *result,
 | 
											 GAsyncResult         *result,
 | 
				
			||||||
						 GError              **error);
 | 
											 GError              **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void       g_resolver_free_addresses            (GList                *addresses);
 | 
					void       g_resolver_free_addresses            (GList                *addresses);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar     *g_resolver_lookup_by_address         (GResolver            *resolver,
 | 
					gchar     *g_resolver_lookup_by_address         (GResolver            *resolver,
 | 
				
			||||||
						 GInetAddress         *address,
 | 
											 GInetAddress         *address,
 | 
				
			||||||
						 GCancellable         *cancellable,
 | 
											 GCancellable         *cancellable,
 | 
				
			||||||
						 GError              **error);
 | 
											 GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void       g_resolver_lookup_by_address_async   (GResolver            *resolver,
 | 
					void       g_resolver_lookup_by_address_async   (GResolver            *resolver,
 | 
				
			||||||
						 GInetAddress         *address,
 | 
											 GInetAddress         *address,
 | 
				
			||||||
						 GCancellable         *cancellable,
 | 
											 GCancellable         *cancellable,
 | 
				
			||||||
						 GAsyncReadyCallback   callback,
 | 
											 GAsyncReadyCallback   callback,
 | 
				
			||||||
						 gpointer              user_data);
 | 
											 gpointer              user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar     *g_resolver_lookup_by_address_finish  (GResolver            *resolver,
 | 
					gchar     *g_resolver_lookup_by_address_finish  (GResolver            *resolver,
 | 
				
			||||||
						 GAsyncResult         *result,
 | 
											 GAsyncResult         *result,
 | 
				
			||||||
						 GError              **error);
 | 
											 GError              **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GList     *g_resolver_lookup_service            (GResolver            *resolver,
 | 
					GList     *g_resolver_lookup_service            (GResolver            *resolver,
 | 
				
			||||||
						 const gchar          *service,
 | 
											 const gchar          *service,
 | 
				
			||||||
						 const gchar          *protocol,
 | 
											 const gchar          *protocol,
 | 
				
			||||||
						 const gchar          *domain,
 | 
											 const gchar          *domain,
 | 
				
			||||||
						 GCancellable         *cancellable,
 | 
											 GCancellable         *cancellable,
 | 
				
			||||||
						 GError              **error);
 | 
											 GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void       g_resolver_lookup_service_async      (GResolver            *resolver,
 | 
					void       g_resolver_lookup_service_async      (GResolver            *resolver,
 | 
				
			||||||
						 const gchar          *service,
 | 
											 const gchar          *service,
 | 
				
			||||||
						 const gchar          *protocol,
 | 
											 const gchar          *protocol,
 | 
				
			||||||
@@ -160,6 +172,7 @@ void       g_resolver_lookup_service_async      (GResolver            *resolver,
 | 
				
			|||||||
						 GCancellable         *cancellable,
 | 
											 GCancellable         *cancellable,
 | 
				
			||||||
						 GAsyncReadyCallback   callback,
 | 
											 GAsyncReadyCallback   callback,
 | 
				
			||||||
						 gpointer              user_data);
 | 
											 gpointer              user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GList     *g_resolver_lookup_service_finish     (GResolver            *resolver,
 | 
					GList     *g_resolver_lookup_service_finish     (GResolver            *resolver,
 | 
				
			||||||
						 GAsyncResult         *result,
 | 
											 GAsyncResult         *result,
 | 
				
			||||||
						 GError              **error);
 | 
											 GError              **error);
 | 
				
			||||||
@@ -182,6 +195,7 @@ GList     *g_resolver_lookup_records_finish     (GResolver            *resolver,
 | 
				
			|||||||
                                                 GAsyncResult         *result,
 | 
					                                                 GAsyncResult         *result,
 | 
				
			||||||
                                                 GError              **error);
 | 
					                                                 GError              **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void       g_resolver_free_targets              (GList                *targets);
 | 
					void       g_resolver_free_targets              (GList                *targets);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
@@ -192,6 +206,7 @@ void       g_resolver_free_targets              (GList                *targets);
 | 
				
			|||||||
 * error domains.
 | 
					 * error domains.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
#define G_RESOLVER_ERROR (g_resolver_error_quark ())
 | 
					#define G_RESOLVER_ERROR (g_resolver_error_quark ())
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GQuark g_resolver_error_quark (void);
 | 
					GQuark g_resolver_error_quark (void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -78,16 +78,22 @@ struct _GSeekableIface
 | 
				
			|||||||
  /* TODO: Async seek/truncate */
 | 
					  /* TODO: Async seek/truncate */
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType    g_seekable_get_type     (void) G_GNUC_CONST;
 | 
					GType    g_seekable_get_type     (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
goffset  g_seekable_tell         (GSeekable     *seekable);
 | 
					goffset  g_seekable_tell         (GSeekable     *seekable);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_seekable_can_seek     (GSeekable     *seekable);
 | 
					gboolean g_seekable_can_seek     (GSeekable     *seekable);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_seekable_seek         (GSeekable     *seekable,
 | 
					gboolean g_seekable_seek         (GSeekable     *seekable,
 | 
				
			||||||
				  goffset        offset,
 | 
									  goffset        offset,
 | 
				
			||||||
				  GSeekType      type,
 | 
									  GSeekType      type,
 | 
				
			||||||
				  GCancellable  *cancellable,
 | 
									  GCancellable  *cancellable,
 | 
				
			||||||
				  GError       **error);
 | 
									  GError       **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_seekable_can_truncate (GSeekable     *seekable);
 | 
					gboolean g_seekable_can_truncate (GSeekable     *seekable);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean g_seekable_truncate     (GSeekable     *seekable,
 | 
					gboolean g_seekable_truncate     (GSeekable     *seekable,
 | 
				
			||||||
				  goffset        offset,
 | 
									  goffset        offset,
 | 
				
			||||||
				  GCancellable  *cancellable,
 | 
									  GCancellable  *cancellable,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -69,15 +69,22 @@ struct _GSettings
 | 
				
			|||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                   g_settings_get_type                             (void);
 | 
					GType                   g_settings_get_type                             (void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar * const *   g_settings_list_schemas                         (void);
 | 
					const gchar * const *   g_settings_list_schemas                         (void);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
const gchar * const *   g_settings_list_relocatable_schemas             (void);
 | 
					const gchar * const *   g_settings_list_relocatable_schemas             (void);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSettings *             g_settings_new                                  (const gchar        *schema_id);
 | 
					GSettings *             g_settings_new                                  (const gchar        *schema_id);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSettings *             g_settings_new_with_path                        (const gchar        *schema_id,
 | 
					GSettings *             g_settings_new_with_path                        (const gchar        *schema_id,
 | 
				
			||||||
                                                                         const gchar        *path);
 | 
					                                                                         const gchar        *path);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSettings *             g_settings_new_with_backend                     (const gchar        *schema_id,
 | 
					GSettings *             g_settings_new_with_backend                     (const gchar        *schema_id,
 | 
				
			||||||
                                                                         GSettingsBackend   *backend);
 | 
					                                                                         GSettingsBackend   *backend);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSettings *             g_settings_new_with_backend_and_path            (const gchar        *schema_id,
 | 
					GSettings *             g_settings_new_with_backend_and_path            (const gchar        *schema_id,
 | 
				
			||||||
                                                                         GSettingsBackend   *backend,
 | 
					                                                                         GSettingsBackend   *backend,
 | 
				
			||||||
                                                                         const gchar        *path);
 | 
					                                                                         const gchar        *path);
 | 
				
			||||||
@@ -85,81 +92,113 @@ GLIB_AVAILABLE_IN_2_32
 | 
				
			|||||||
GSettings *             g_settings_new_full                             (GSettingsSchema    *schema,
 | 
					GSettings *             g_settings_new_full                             (GSettingsSchema    *schema,
 | 
				
			||||||
                                                                         GSettingsBackend   *backend,
 | 
					                                                                         GSettingsBackend   *backend,
 | 
				
			||||||
                                                                         const gchar        *path);
 | 
					                                                                         const gchar        *path);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar **                g_settings_list_children                        (GSettings          *settings);
 | 
					gchar **                g_settings_list_children                        (GSettings          *settings);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar **                g_settings_list_keys                            (GSettings          *settings);
 | 
					gchar **                g_settings_list_keys                            (GSettings          *settings);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GVariant *              g_settings_get_range                            (GSettings          *settings,
 | 
					GVariant *              g_settings_get_range                            (GSettings          *settings,
 | 
				
			||||||
                                                                         const gchar        *key);
 | 
					                                                                         const gchar        *key);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_settings_range_check                          (GSettings          *settings,
 | 
					gboolean                g_settings_range_check                          (GSettings          *settings,
 | 
				
			||||||
                                                                         const gchar        *key,
 | 
					                                                                         const gchar        *key,
 | 
				
			||||||
                                                                         GVariant           *value);
 | 
					                                                                         GVariant           *value);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_settings_set_value                            (GSettings          *settings,
 | 
					gboolean                g_settings_set_value                            (GSettings          *settings,
 | 
				
			||||||
                                                                         const gchar        *key,
 | 
					                                                                         const gchar        *key,
 | 
				
			||||||
                                                                         GVariant           *value);
 | 
					                                                                         GVariant           *value);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GVariant *              g_settings_get_value                            (GSettings          *settings,
 | 
					GVariant *              g_settings_get_value                            (GSettings          *settings,
 | 
				
			||||||
                                                                         const gchar        *key);
 | 
					                                                                         const gchar        *key);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_settings_set                                  (GSettings          *settings,
 | 
					gboolean                g_settings_set                                  (GSettings          *settings,
 | 
				
			||||||
                                                                         const gchar        *key,
 | 
					                                                                         const gchar        *key,
 | 
				
			||||||
                                                                         const gchar        *format,
 | 
					                                                                         const gchar        *format,
 | 
				
			||||||
                                                                         ...);
 | 
					                                                                         ...);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_settings_get                                  (GSettings          *settings,
 | 
					void                    g_settings_get                                  (GSettings          *settings,
 | 
				
			||||||
                                                                         const gchar        *key,
 | 
					                                                                         const gchar        *key,
 | 
				
			||||||
                                                                         const gchar        *format,
 | 
					                                                                         const gchar        *format,
 | 
				
			||||||
                                                                         ...);
 | 
					                                                                         ...);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_settings_reset                                (GSettings          *settings,
 | 
					void                    g_settings_reset                                (GSettings          *settings,
 | 
				
			||||||
                                                                         const gchar        *key);
 | 
					                                                                         const gchar        *key);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gint                    g_settings_get_int                              (GSettings          *settings,
 | 
					gint                    g_settings_get_int                              (GSettings          *settings,
 | 
				
			||||||
                                                                         const gchar        *key);
 | 
					                                                                         const gchar        *key);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_settings_set_int                              (GSettings          *settings,
 | 
					gboolean                g_settings_set_int                              (GSettings          *settings,
 | 
				
			||||||
                                                                         const gchar        *key,
 | 
					                                                                         const gchar        *key,
 | 
				
			||||||
                                                                         gint                value);
 | 
					                                                                         gint                value);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint                   g_settings_get_uint                             (GSettings          *settings,
 | 
					guint                   g_settings_get_uint                             (GSettings          *settings,
 | 
				
			||||||
                                                                         const gchar        *key);
 | 
					                                                                         const gchar        *key);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_settings_set_uint                             (GSettings          *settings,
 | 
					gboolean                g_settings_set_uint                             (GSettings          *settings,
 | 
				
			||||||
                                                                         const gchar        *key,
 | 
					                                                                         const gchar        *key,
 | 
				
			||||||
                                                                         guint               value);
 | 
					                                                                         guint               value);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar *                 g_settings_get_string                           (GSettings          *settings,
 | 
					gchar *                 g_settings_get_string                           (GSettings          *settings,
 | 
				
			||||||
                                                                         const gchar        *key);
 | 
					                                                                         const gchar        *key);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_settings_set_string                           (GSettings          *settings,
 | 
					gboolean                g_settings_set_string                           (GSettings          *settings,
 | 
				
			||||||
                                                                         const gchar        *key,
 | 
					                                                                         const gchar        *key,
 | 
				
			||||||
                                                                         const gchar        *value);
 | 
					                                                                         const gchar        *value);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_settings_get_boolean                          (GSettings          *settings,
 | 
					gboolean                g_settings_get_boolean                          (GSettings          *settings,
 | 
				
			||||||
                                                                         const gchar        *key);
 | 
					                                                                         const gchar        *key);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_settings_set_boolean                          (GSettings          *settings,
 | 
					gboolean                g_settings_set_boolean                          (GSettings          *settings,
 | 
				
			||||||
                                                                         const gchar        *key,
 | 
					                                                                         const gchar        *key,
 | 
				
			||||||
                                                                         gboolean            value);
 | 
					                                                                         gboolean            value);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gdouble                 g_settings_get_double                           (GSettings          *settings,
 | 
					gdouble                 g_settings_get_double                           (GSettings          *settings,
 | 
				
			||||||
                                                                         const gchar        *key);
 | 
					                                                                         const gchar        *key);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_settings_set_double                           (GSettings          *settings,
 | 
					gboolean                g_settings_set_double                           (GSettings          *settings,
 | 
				
			||||||
                                                                         const gchar        *key,
 | 
					                                                                         const gchar        *key,
 | 
				
			||||||
                                                                         gdouble             value);
 | 
					                                                                         gdouble             value);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gchar **                g_settings_get_strv                             (GSettings          *settings,
 | 
					gchar **                g_settings_get_strv                             (GSettings          *settings,
 | 
				
			||||||
                                                                         const gchar        *key);
 | 
					                                                                         const gchar        *key);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_settings_set_strv                             (GSettings          *settings,
 | 
					gboolean                g_settings_set_strv                             (GSettings          *settings,
 | 
				
			||||||
                                                                         const gchar        *key,
 | 
					                                                                         const gchar        *key,
 | 
				
			||||||
                                                                         const gchar *const *value);
 | 
					                                                                         const gchar *const *value);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gint                    g_settings_get_enum                             (GSettings          *settings,
 | 
					gint                    g_settings_get_enum                             (GSettings          *settings,
 | 
				
			||||||
                                                                         const gchar        *key);
 | 
					                                                                         const gchar        *key);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_settings_set_enum                             (GSettings          *settings,
 | 
					gboolean                g_settings_set_enum                             (GSettings          *settings,
 | 
				
			||||||
                                                                         const gchar        *key,
 | 
					                                                                         const gchar        *key,
 | 
				
			||||||
                                                                         gint                value);
 | 
					                                                                         gint                value);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint                   g_settings_get_flags                            (GSettings          *settings,
 | 
					guint                   g_settings_get_flags                            (GSettings          *settings,
 | 
				
			||||||
                                                                         const gchar        *key);
 | 
					                                                                         const gchar        *key);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_settings_set_flags                            (GSettings          *settings,
 | 
					gboolean                g_settings_set_flags                            (GSettings          *settings,
 | 
				
			||||||
                                                                         const gchar        *key,
 | 
					                                                                         const gchar        *key,
 | 
				
			||||||
                                                                         guint               value);
 | 
					                                                                         guint               value);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSettings *             g_settings_get_child                            (GSettings          *settings,
 | 
					GSettings *             g_settings_get_child                            (GSettings          *settings,
 | 
				
			||||||
                                                                         const gchar        *name);
 | 
					                                                                         const gchar        *name);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_settings_is_writable                          (GSettings          *settings,
 | 
					gboolean                g_settings_is_writable                          (GSettings          *settings,
 | 
				
			||||||
                                                                         const gchar        *name);
 | 
					                                                                         const gchar        *name);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_settings_delay                                (GSettings          *settings);
 | 
					void                    g_settings_delay                                (GSettings          *settings);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_settings_apply                                (GSettings          *settings);
 | 
					void                    g_settings_apply                                (GSettings          *settings);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_settings_revert                               (GSettings          *settings);
 | 
					void                    g_settings_revert                               (GSettings          *settings);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_settings_get_has_unapplied                    (GSettings          *settings);
 | 
					gboolean                g_settings_get_has_unapplied                    (GSettings          *settings);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_settings_sync                                 (void);
 | 
					void                    g_settings_sync                                 (void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
@@ -246,11 +285,13 @@ typedef enum
 | 
				
			|||||||
  G_SETTINGS_BIND_INVERT_BOOLEAN = (1<<4)
 | 
					  G_SETTINGS_BIND_INVERT_BOOLEAN = (1<<4)
 | 
				
			||||||
} GSettingsBindFlags;
 | 
					} GSettingsBindFlags;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_settings_bind                                 (GSettings               *settings,
 | 
					void                    g_settings_bind                                 (GSettings               *settings,
 | 
				
			||||||
                                                                         const gchar             *key,
 | 
					                                                                         const gchar             *key,
 | 
				
			||||||
                                                                         gpointer                 object,
 | 
					                                                                         gpointer                 object,
 | 
				
			||||||
                                                                         const gchar             *property,
 | 
					                                                                         const gchar             *property,
 | 
				
			||||||
                                                                         GSettingsBindFlags       flags);
 | 
					                                                                         GSettingsBindFlags       flags);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_settings_bind_with_mapping                    (GSettings               *settings,
 | 
					void                    g_settings_bind_with_mapping                    (GSettings               *settings,
 | 
				
			||||||
                                                                         const gchar             *key,
 | 
					                                                                         const gchar             *key,
 | 
				
			||||||
                                                                         gpointer                 object,
 | 
					                                                                         gpointer                 object,
 | 
				
			||||||
@@ -260,11 +301,13 @@ void                    g_settings_bind_with_mapping                    (GSettin
 | 
				
			|||||||
                                                                         GSettingsBindSetMapping  set_mapping,
 | 
					                                                                         GSettingsBindSetMapping  set_mapping,
 | 
				
			||||||
                                                                         gpointer                 user_data,
 | 
					                                                                         gpointer                 user_data,
 | 
				
			||||||
                                                                         GDestroyNotify           destroy);
 | 
					                                                                         GDestroyNotify           destroy);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_settings_bind_writable                        (GSettings               *settings,
 | 
					void                    g_settings_bind_writable                        (GSettings               *settings,
 | 
				
			||||||
                                                                         const gchar             *key,
 | 
					                                                                         const gchar             *key,
 | 
				
			||||||
                                                                         gpointer                 object,
 | 
					                                                                         gpointer                 object,
 | 
				
			||||||
                                                                         const gchar             *property,
 | 
					                                                                         const gchar             *property,
 | 
				
			||||||
                                                                         gboolean                 inverted);
 | 
					                                                                         gboolean                 inverted);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_settings_unbind                               (gpointer                 object,
 | 
					void                    g_settings_unbind                               (gpointer                 object,
 | 
				
			||||||
                                                                         const gchar             *property);
 | 
					                                                                         const gchar             *property);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -272,6 +315,7 @@ GLIB_AVAILABLE_IN_2_32
 | 
				
			|||||||
GAction *               g_settings_create_action                        (GSettings               *settings,
 | 
					GAction *               g_settings_create_action                        (GSettings               *settings,
 | 
				
			||||||
                                                                         const gchar             *key);
 | 
					                                                                         const gchar             *key);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gpointer                g_settings_get_mapped                           (GSettings               *settings,
 | 
					gpointer                g_settings_get_mapped                           (GSettings               *settings,
 | 
				
			||||||
                                                                         const gchar             *key,
 | 
					                                                                         const gchar             *key,
 | 
				
			||||||
                                                                         GSettingsGetMapping      mapping,
 | 
					                                                                         GSettingsGetMapping      mapping,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -104,39 +104,51 @@ struct _GSettingsBackend
 | 
				
			|||||||
  GSettingsBackendPrivate *priv;
 | 
					  GSettingsBackendPrivate *priv;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                   g_settings_backend_get_type                     (void);
 | 
					GType                   g_settings_backend_get_type                     (void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_settings_backend_changed                      (GSettingsBackend    *backend,
 | 
					void                    g_settings_backend_changed                      (GSettingsBackend    *backend,
 | 
				
			||||||
                                                                         const gchar         *key,
 | 
					                                                                         const gchar         *key,
 | 
				
			||||||
                                                                         gpointer             origin_tag);
 | 
					                                                                         gpointer             origin_tag);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_settings_backend_path_changed                 (GSettingsBackend    *backend,
 | 
					void                    g_settings_backend_path_changed                 (GSettingsBackend    *backend,
 | 
				
			||||||
                                                                         const gchar         *path,
 | 
					                                                                         const gchar         *path,
 | 
				
			||||||
                                                                         gpointer             origin_tag);
 | 
					                                                                         gpointer             origin_tag);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_settings_backend_flatten_tree                 (GTree               *tree,
 | 
					void                    g_settings_backend_flatten_tree                 (GTree               *tree,
 | 
				
			||||||
                                                                         gchar              **path,
 | 
					                                                                         gchar              **path,
 | 
				
			||||||
                                                                         const gchar       ***keys,
 | 
					                                                                         const gchar       ***keys,
 | 
				
			||||||
                                                                         GVariant          ***values);
 | 
					                                                                         GVariant          ***values);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_settings_backend_keys_changed                 (GSettingsBackend    *backend,
 | 
					void                    g_settings_backend_keys_changed                 (GSettingsBackend    *backend,
 | 
				
			||||||
                                                                         const gchar         *path,
 | 
					                                                                         const gchar         *path,
 | 
				
			||||||
                                                                         gchar const * const *items,
 | 
					                                                                         gchar const * const *items,
 | 
				
			||||||
                                                                         gpointer             origin_tag);
 | 
					                                                                         gpointer             origin_tag);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_settings_backend_path_writable_changed        (GSettingsBackend    *backend,
 | 
					void                    g_settings_backend_path_writable_changed        (GSettingsBackend    *backend,
 | 
				
			||||||
                                                                         const gchar         *path);
 | 
					                                                                         const gchar         *path);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_settings_backend_writable_changed             (GSettingsBackend    *backend,
 | 
					void                    g_settings_backend_writable_changed             (GSettingsBackend    *backend,
 | 
				
			||||||
                                                                         const gchar         *key);
 | 
					                                                                         const gchar         *key);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_settings_backend_changed_tree                 (GSettingsBackend    *backend,
 | 
					void                    g_settings_backend_changed_tree                 (GSettingsBackend    *backend,
 | 
				
			||||||
                                                                         GTree               *tree,
 | 
					                                                                         GTree               *tree,
 | 
				
			||||||
                                                                         gpointer             origin_tag);
 | 
					                                                                         gpointer             origin_tag);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSettingsBackend *      g_settings_backend_get_default                  (void);
 | 
					GSettingsBackend *      g_settings_backend_get_default                  (void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSettingsBackend *      g_keyfile_settings_backend_new                  (const gchar         *filename,
 | 
					GSettingsBackend *      g_keyfile_settings_backend_new                  (const gchar         *filename,
 | 
				
			||||||
                                                                         const gchar         *root_path,
 | 
					                                                                         const gchar         *root_path,
 | 
				
			||||||
                                                                         const gchar         *root_group);
 | 
					                                                                         const gchar         *root_group);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSettingsBackend *      g_null_settings_backend_new                     (void);
 | 
					GSettingsBackend *      g_null_settings_backend_new                     (void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSettingsBackend *      g_memory_settings_backend_new                   (void);
 | 
					GSettingsBackend *      g_memory_settings_backend_new                   (void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -36,15 +36,19 @@ G_BEGIN_DECLS
 | 
				
			|||||||
#define G_IS_SIMPLE_ACTION(inst)                            (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
 | 
					#define G_IS_SIMPLE_ACTION(inst)                            (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
 | 
				
			||||||
                                                             G_TYPE_SIMPLE_ACTION))
 | 
					                                                             G_TYPE_SIMPLE_ACTION))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                   g_simple_action_get_type                        (void) G_GNUC_CONST;
 | 
					GType                   g_simple_action_get_type                        (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSimpleAction *         g_simple_action_new                             (const gchar        *name,
 | 
					GSimpleAction *         g_simple_action_new                             (const gchar        *name,
 | 
				
			||||||
                                                                         const GVariantType *parameter_type);
 | 
					                                                                         const GVariantType *parameter_type);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSimpleAction *         g_simple_action_new_stateful                    (const gchar        *name,
 | 
					GSimpleAction *         g_simple_action_new_stateful                    (const gchar        *name,
 | 
				
			||||||
                                                                         const GVariantType *parameter_type,
 | 
					                                                                         const GVariantType *parameter_type,
 | 
				
			||||||
                                                                         GVariant           *state);
 | 
					                                                                         GVariant           *state);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_simple_action_set_enabled                     (GSimpleAction      *simple,
 | 
					void                    g_simple_action_set_enabled                     (GSimpleAction      *simple,
 | 
				
			||||||
                                                                         gboolean            enabled);
 | 
					                                                                         gboolean            enabled);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -70,16 +70,21 @@ struct _GSimpleActionGroupClass
 | 
				
			|||||||
  gpointer padding[12];
 | 
					  gpointer padding[12];
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                   g_simple_action_group_get_type                  (void) G_GNUC_CONST;
 | 
					GType                   g_simple_action_group_get_type                  (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSimpleActionGroup *    g_simple_action_group_new                       (void);
 | 
					GSimpleActionGroup *    g_simple_action_group_new                       (void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GAction *               g_simple_action_group_lookup                    (GSimpleActionGroup *simple,
 | 
					GAction *               g_simple_action_group_lookup                    (GSimpleActionGroup *simple,
 | 
				
			||||||
                                                                         const gchar        *action_name);
 | 
					                                                                         const gchar        *action_name);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_simple_action_group_insert                    (GSimpleActionGroup *simple,
 | 
					void                    g_simple_action_group_insert                    (GSimpleActionGroup *simple,
 | 
				
			||||||
                                                                         GAction            *action);
 | 
					                                                                         GAction            *action);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_simple_action_group_remove                    (GSimpleActionGroup *simple,
 | 
					void                    g_simple_action_group_remove                    (GSimpleActionGroup *simple,
 | 
				
			||||||
                                                                         const gchar        *action_name);
 | 
					                                                                         const gchar        *action_name);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -46,12 +46,15 @@ G_BEGIN_DECLS
 | 
				
			|||||||
typedef struct _GSimpleAsyncResultClass   GSimpleAsyncResultClass;
 | 
					typedef struct _GSimpleAsyncResultClass   GSimpleAsyncResultClass;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType               g_simple_async_result_get_type         (void) G_GNUC_CONST;
 | 
					GType               g_simple_async_result_get_type         (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSimpleAsyncResult *g_simple_async_result_new              (GObject                 *source_object,
 | 
					GSimpleAsyncResult *g_simple_async_result_new              (GObject                 *source_object,
 | 
				
			||||||
							    GAsyncReadyCallback      callback,
 | 
												    GAsyncReadyCallback      callback,
 | 
				
			||||||
							    gpointer                 user_data,
 | 
												    gpointer                 user_data,
 | 
				
			||||||
							    gpointer                 source_tag);
 | 
												    gpointer                 source_tag);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSimpleAsyncResult *g_simple_async_result_new_error        (GObject                 *source_object,
 | 
					GSimpleAsyncResult *g_simple_async_result_new_error        (GObject                 *source_object,
 | 
				
			||||||
							    GAsyncReadyCallback      callback,
 | 
												    GAsyncReadyCallback      callback,
 | 
				
			||||||
							    gpointer                 user_data,
 | 
												    gpointer                 user_data,
 | 
				
			||||||
@@ -59,26 +62,34 @@ GSimpleAsyncResult *g_simple_async_result_new_error        (GObject
 | 
				
			|||||||
							    gint                     code,
 | 
												    gint                     code,
 | 
				
			||||||
							    const char              *format,
 | 
												    const char              *format,
 | 
				
			||||||
							    ...) G_GNUC_PRINTF (6, 7);
 | 
												    ...) G_GNUC_PRINTF (6, 7);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSimpleAsyncResult *g_simple_async_result_new_from_error   (GObject                 *source_object,
 | 
					GSimpleAsyncResult *g_simple_async_result_new_from_error   (GObject                 *source_object,
 | 
				
			||||||
							    GAsyncReadyCallback      callback,
 | 
												    GAsyncReadyCallback      callback,
 | 
				
			||||||
							    gpointer                 user_data,
 | 
												    gpointer                 user_data,
 | 
				
			||||||
							    const GError            *error);
 | 
												    const GError            *error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSimpleAsyncResult *g_simple_async_result_new_take_error   (GObject                 *source_object,
 | 
					GSimpleAsyncResult *g_simple_async_result_new_take_error   (GObject                 *source_object,
 | 
				
			||||||
							    GAsyncReadyCallback      callback,
 | 
												    GAsyncReadyCallback      callback,
 | 
				
			||||||
							    gpointer                 user_data,
 | 
												    gpointer                 user_data,
 | 
				
			||||||
							    GError                  *error);
 | 
												    GError                  *error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                g_simple_async_result_set_op_res_gpointer (GSimpleAsyncResult      *simple,
 | 
					void                g_simple_async_result_set_op_res_gpointer (GSimpleAsyncResult      *simple,
 | 
				
			||||||
                                                               gpointer                 op_res,
 | 
					                                                               gpointer                 op_res,
 | 
				
			||||||
                                                               GDestroyNotify           destroy_op_res);
 | 
					                                                               GDestroyNotify           destroy_op_res);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gpointer            g_simple_async_result_get_op_res_gpointer (GSimpleAsyncResult      *simple);
 | 
					gpointer            g_simple_async_result_get_op_res_gpointer (GSimpleAsyncResult      *simple);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                g_simple_async_result_set_op_res_gssize   (GSimpleAsyncResult      *simple,
 | 
					void                g_simple_async_result_set_op_res_gssize   (GSimpleAsyncResult      *simple,
 | 
				
			||||||
                                                               gssize                   op_res);
 | 
					                                                               gssize                   op_res);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gssize              g_simple_async_result_get_op_res_gssize   (GSimpleAsyncResult      *simple);
 | 
					gssize              g_simple_async_result_get_op_res_gssize   (GSimpleAsyncResult      *simple);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                g_simple_async_result_set_op_res_gboolean (GSimpleAsyncResult      *simple,
 | 
					void                g_simple_async_result_set_op_res_gboolean (GSimpleAsyncResult      *simple,
 | 
				
			||||||
                                                               gboolean                 op_res);
 | 
					                                                               gboolean                 op_res);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean            g_simple_async_result_get_op_res_gboolean (GSimpleAsyncResult      *simple);
 | 
					gboolean            g_simple_async_result_get_op_res_gboolean (GSimpleAsyncResult      *simple);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -86,36 +97,48 @@ gboolean            g_simple_async_result_get_op_res_gboolean (GSimpleAsyncResul
 | 
				
			|||||||
GLIB_AVAILABLE_IN_2_32
 | 
					GLIB_AVAILABLE_IN_2_32
 | 
				
			||||||
void                g_simple_async_result_set_check_cancellable (GSimpleAsyncResult *simple,
 | 
					void                g_simple_async_result_set_check_cancellable (GSimpleAsyncResult *simple,
 | 
				
			||||||
                                                                 GCancellable       *check_cancellable);
 | 
					                                                                 GCancellable       *check_cancellable);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gpointer            g_simple_async_result_get_source_tag   (GSimpleAsyncResult      *simple);
 | 
					gpointer            g_simple_async_result_get_source_tag   (GSimpleAsyncResult      *simple);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                g_simple_async_result_set_handle_cancellation (GSimpleAsyncResult      *simple,
 | 
					void                g_simple_async_result_set_handle_cancellation (GSimpleAsyncResult      *simple,
 | 
				
			||||||
								   gboolean          handle_cancellation);
 | 
													   gboolean          handle_cancellation);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                g_simple_async_result_complete         (GSimpleAsyncResult      *simple);
 | 
					void                g_simple_async_result_complete         (GSimpleAsyncResult      *simple);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                g_simple_async_result_complete_in_idle (GSimpleAsyncResult      *simple);
 | 
					void                g_simple_async_result_complete_in_idle (GSimpleAsyncResult      *simple);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                g_simple_async_result_run_in_thread    (GSimpleAsyncResult      *simple,
 | 
					void                g_simple_async_result_run_in_thread    (GSimpleAsyncResult      *simple,
 | 
				
			||||||
							    GSimpleAsyncThreadFunc   func,
 | 
												    GSimpleAsyncThreadFunc   func,
 | 
				
			||||||
							    int                      io_priority,
 | 
												    int                      io_priority,
 | 
				
			||||||
							    GCancellable            *cancellable);
 | 
												    GCancellable            *cancellable);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                g_simple_async_result_set_from_error   (GSimpleAsyncResult      *simple,
 | 
					void                g_simple_async_result_set_from_error   (GSimpleAsyncResult      *simple,
 | 
				
			||||||
							    const GError            *error);
 | 
												    const GError            *error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                g_simple_async_result_take_error       (GSimpleAsyncResult      *simple,
 | 
					void                g_simple_async_result_take_error       (GSimpleAsyncResult      *simple,
 | 
				
			||||||
							    GError            *error);
 | 
												    GError            *error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean            g_simple_async_result_propagate_error  (GSimpleAsyncResult      *simple,
 | 
					gboolean            g_simple_async_result_propagate_error  (GSimpleAsyncResult      *simple,
 | 
				
			||||||
							    GError                 **dest);
 | 
												    GError                 **dest);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                g_simple_async_result_set_error        (GSimpleAsyncResult      *simple,
 | 
					void                g_simple_async_result_set_error        (GSimpleAsyncResult      *simple,
 | 
				
			||||||
							    GQuark                   domain,
 | 
												    GQuark                   domain,
 | 
				
			||||||
							    gint                     code,
 | 
												    gint                     code,
 | 
				
			||||||
							    const char              *format,
 | 
												    const char              *format,
 | 
				
			||||||
							    ...) G_GNUC_PRINTF (4, 5);
 | 
												    ...) G_GNUC_PRINTF (4, 5);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                g_simple_async_result_set_error_va     (GSimpleAsyncResult      *simple,
 | 
					void                g_simple_async_result_set_error_va     (GSimpleAsyncResult      *simple,
 | 
				
			||||||
							    GQuark                   domain,
 | 
												    GQuark                   domain,
 | 
				
			||||||
							    gint                     code,
 | 
												    gint                     code,
 | 
				
			||||||
							    const char              *format,
 | 
												    const char              *format,
 | 
				
			||||||
							    va_list                  args)
 | 
												    va_list                  args)
 | 
				
			||||||
							    G_GNUC_PRINTF(4, 0);
 | 
												    G_GNUC_PRINTF(4, 0);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean            g_simple_async_result_is_valid         (GAsyncResult            *result,
 | 
					gboolean            g_simple_async_result_is_valid         (GAsyncResult            *result,
 | 
				
			||||||
                                                            GObject                 *source,
 | 
					                                                            GObject                 *source,
 | 
				
			||||||
                                                            gpointer                 source_tag);
 | 
					                                                            gpointer                 source_tag);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void g_simple_async_report_error_in_idle  (GObject            *object,
 | 
					void g_simple_async_report_error_in_idle  (GObject            *object,
 | 
				
			||||||
					   GAsyncReadyCallback callback,
 | 
										   GAsyncReadyCallback callback,
 | 
				
			||||||
					   gpointer            user_data,
 | 
										   gpointer            user_data,
 | 
				
			||||||
@@ -123,10 +146,12 @@ void g_simple_async_report_error_in_idle  (GObject            *object,
 | 
				
			|||||||
					   gint                code,
 | 
										   gint                code,
 | 
				
			||||||
					   const char         *format,
 | 
										   const char         *format,
 | 
				
			||||||
					   ...) G_GNUC_PRINTF(6, 7);
 | 
										   ...) G_GNUC_PRINTF(6, 7);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void g_simple_async_report_gerror_in_idle (GObject            *object,
 | 
					void g_simple_async_report_gerror_in_idle (GObject            *object,
 | 
				
			||||||
					   GAsyncReadyCallback callback,
 | 
										   GAsyncReadyCallback callback,
 | 
				
			||||||
					   gpointer            user_data,
 | 
										   gpointer            user_data,
 | 
				
			||||||
					   const GError       *error);
 | 
										   const GError       *error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void g_simple_async_report_take_gerror_in_idle (GObject            *object,
 | 
					void g_simple_async_report_take_gerror_in_idle (GObject            *object,
 | 
				
			||||||
                                                GAsyncReadyCallback callback,
 | 
					                                                GAsyncReadyCallback callback,
 | 
				
			||||||
                                                gpointer            user_data,
 | 
					                                                gpointer            user_data,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -37,7 +37,9 @@ G_BEGIN_DECLS
 | 
				
			|||||||
#define G_IS_SIMPLE_PERMISSION(inst)  (G_TYPE_CHECK_INSTANCE_TYPE ((inst),   \
 | 
					#define G_IS_SIMPLE_PERMISSION(inst)  (G_TYPE_CHECK_INSTANCE_TYPE ((inst),   \
 | 
				
			||||||
                                       G_TYPE_SIMPLE_PERMISSION))
 | 
					                                       G_TYPE_SIMPLE_PERMISSION))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                   g_simple_permission_get_type            (void);
 | 
					GType                   g_simple_permission_get_type            (void);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GPermission *           g_simple_permission_new                 (gboolean allowed);
 | 
					GPermission *           g_simple_permission_new                 (gboolean allowed);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -73,31 +73,48 @@ struct _GSocket
 | 
				
			|||||||
  GSocketPrivate *priv;
 | 
					  GSocketPrivate *priv;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                  g_socket_get_type                (void) G_GNUC_CONST;
 | 
					GType                  g_socket_get_type                (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocket *              g_socket_new                     (GSocketFamily            family,
 | 
					GSocket *              g_socket_new                     (GSocketFamily            family,
 | 
				
			||||||
							 GSocketType              type,
 | 
												 GSocketType              type,
 | 
				
			||||||
							 GSocketProtocol          protocol,
 | 
												 GSocketProtocol          protocol,
 | 
				
			||||||
							 GError                 **error);
 | 
												 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocket *              g_socket_new_from_fd             (gint                     fd,
 | 
					GSocket *              g_socket_new_from_fd             (gint                     fd,
 | 
				
			||||||
							 GError                 **error);
 | 
												 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
int                    g_socket_get_fd                  (GSocket                 *socket);
 | 
					int                    g_socket_get_fd                  (GSocket                 *socket);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketFamily          g_socket_get_family              (GSocket                 *socket);
 | 
					GSocketFamily          g_socket_get_family              (GSocket                 *socket);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketType            g_socket_get_socket_type         (GSocket                 *socket);
 | 
					GSocketType            g_socket_get_socket_type         (GSocket                 *socket);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketProtocol        g_socket_get_protocol            (GSocket                 *socket);
 | 
					GSocketProtocol        g_socket_get_protocol            (GSocket                 *socket);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketAddress *       g_socket_get_local_address       (GSocket                 *socket,
 | 
					GSocketAddress *       g_socket_get_local_address       (GSocket                 *socket,
 | 
				
			||||||
							 GError                 **error);
 | 
												 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketAddress *       g_socket_get_remote_address      (GSocket                 *socket,
 | 
					GSocketAddress *       g_socket_get_remote_address      (GSocket                 *socket,
 | 
				
			||||||
							 GError                 **error);
 | 
												 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                   g_socket_set_blocking            (GSocket                 *socket,
 | 
					void                   g_socket_set_blocking            (GSocket                 *socket,
 | 
				
			||||||
							 gboolean                 blocking);
 | 
												 gboolean                 blocking);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean               g_socket_get_blocking            (GSocket                 *socket);
 | 
					gboolean               g_socket_get_blocking            (GSocket                 *socket);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                   g_socket_set_keepalive           (GSocket                 *socket,
 | 
					void                   g_socket_set_keepalive           (GSocket                 *socket,
 | 
				
			||||||
							 gboolean                 keepalive);
 | 
												 gboolean                 keepalive);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean               g_socket_get_keepalive           (GSocket                 *socket);
 | 
					gboolean               g_socket_get_keepalive           (GSocket                 *socket);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gint                   g_socket_get_listen_backlog      (GSocket                 *socket);
 | 
					gint                   g_socket_get_listen_backlog      (GSocket                 *socket);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                   g_socket_set_listen_backlog      (GSocket                 *socket,
 | 
					void                   g_socket_set_listen_backlog      (GSocket                 *socket,
 | 
				
			||||||
							 gint                     backlog);
 | 
												 gint                     backlog);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint                  g_socket_get_timeout             (GSocket                 *socket);
 | 
					guint                  g_socket_get_timeout             (GSocket                 *socket);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                   g_socket_set_timeout             (GSocket                 *socket,
 | 
					void                   g_socket_set_timeout             (GSocket                 *socket,
 | 
				
			||||||
							 guint                    timeout);
 | 
												 guint                    timeout);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -123,7 +140,9 @@ guint                  g_socket_get_multicast_ttl       (GSocket
 | 
				
			|||||||
GLIB_AVAILABLE_IN_2_32
 | 
					GLIB_AVAILABLE_IN_2_32
 | 
				
			||||||
void                   g_socket_set_multicast_ttl       (GSocket                 *socket,
 | 
					void                   g_socket_set_multicast_ttl       (GSocket                 *socket,
 | 
				
			||||||
                                                         guint                    ttl);
 | 
					                                                         guint                    ttl);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean               g_socket_is_connected            (GSocket                 *socket);
 | 
					gboolean               g_socket_is_connected            (GSocket                 *socket);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean               g_socket_bind                    (GSocket                 *socket,
 | 
					gboolean               g_socket_bind                    (GSocket                 *socket,
 | 
				
			||||||
							 GSocketAddress          *address,
 | 
												 GSocketAddress          *address,
 | 
				
			||||||
							 gboolean                 allow_reuse,
 | 
												 gboolean                 allow_reuse,
 | 
				
			||||||
@@ -140,17 +159,22 @@ gboolean               g_socket_leave_multicast_group   (GSocket
 | 
				
			|||||||
                                                         gboolean                 source_specific,
 | 
					                                                         gboolean                 source_specific,
 | 
				
			||||||
                                                         const gchar             *iface,
 | 
					                                                         const gchar             *iface,
 | 
				
			||||||
                                                         GError                 **error);
 | 
					                                                         GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean               g_socket_connect                 (GSocket                 *socket,
 | 
					gboolean               g_socket_connect                 (GSocket                 *socket,
 | 
				
			||||||
							 GSocketAddress          *address,
 | 
												 GSocketAddress          *address,
 | 
				
			||||||
							 GCancellable            *cancellable,
 | 
												 GCancellable            *cancellable,
 | 
				
			||||||
							 GError                 **error);
 | 
												 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean               g_socket_check_connect_result    (GSocket                 *socket,
 | 
					gboolean               g_socket_check_connect_result    (GSocket                 *socket,
 | 
				
			||||||
							 GError                 **error);
 | 
												 GError                 **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gssize                 g_socket_get_available_bytes     (GSocket                 *socket);
 | 
					gssize                 g_socket_get_available_bytes     (GSocket                 *socket);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GIOCondition           g_socket_condition_check         (GSocket                 *socket,
 | 
					GIOCondition           g_socket_condition_check         (GSocket                 *socket,
 | 
				
			||||||
							 GIOCondition             condition);
 | 
												 GIOCondition             condition);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean               g_socket_condition_wait          (GSocket                 *socket,
 | 
					gboolean               g_socket_condition_wait          (GSocket                 *socket,
 | 
				
			||||||
							 GIOCondition             condition,
 | 
												 GIOCondition             condition,
 | 
				
			||||||
							 GCancellable            *cancellable,
 | 
												 GCancellable            *cancellable,
 | 
				
			||||||
@@ -161,33 +185,40 @@ gboolean               g_socket_condition_timed_wait    (GSocket
 | 
				
			|||||||
							 gint64                   timeout,
 | 
												 gint64                   timeout,
 | 
				
			||||||
							 GCancellable            *cancellable,
 | 
												 GCancellable            *cancellable,
 | 
				
			||||||
							 GError                 **error);
 | 
												 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocket *              g_socket_accept                  (GSocket                 *socket,
 | 
					GSocket *              g_socket_accept                  (GSocket                 *socket,
 | 
				
			||||||
							 GCancellable            *cancellable,
 | 
												 GCancellable            *cancellable,
 | 
				
			||||||
							 GError                 **error);
 | 
												 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean               g_socket_listen                  (GSocket                 *socket,
 | 
					gboolean               g_socket_listen                  (GSocket                 *socket,
 | 
				
			||||||
							 GError                 **error);
 | 
												 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gssize                 g_socket_receive                 (GSocket                 *socket,
 | 
					gssize                 g_socket_receive                 (GSocket                 *socket,
 | 
				
			||||||
							 gchar                   *buffer,
 | 
												 gchar                   *buffer,
 | 
				
			||||||
							 gsize                    size,
 | 
												 gsize                    size,
 | 
				
			||||||
							 GCancellable            *cancellable,
 | 
												 GCancellable            *cancellable,
 | 
				
			||||||
							 GError                 **error);
 | 
												 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gssize                 g_socket_receive_from            (GSocket                 *socket,
 | 
					gssize                 g_socket_receive_from            (GSocket                 *socket,
 | 
				
			||||||
							 GSocketAddress         **address,
 | 
												 GSocketAddress         **address,
 | 
				
			||||||
							 gchar                   *buffer,
 | 
												 gchar                   *buffer,
 | 
				
			||||||
							 gsize                    size,
 | 
												 gsize                    size,
 | 
				
			||||||
							 GCancellable            *cancellable,
 | 
												 GCancellable            *cancellable,
 | 
				
			||||||
							 GError                 **error);
 | 
												 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gssize                 g_socket_send                    (GSocket                 *socket,
 | 
					gssize                 g_socket_send                    (GSocket                 *socket,
 | 
				
			||||||
							 const gchar             *buffer,
 | 
												 const gchar             *buffer,
 | 
				
			||||||
							 gsize                    size,
 | 
												 gsize                    size,
 | 
				
			||||||
							 GCancellable            *cancellable,
 | 
												 GCancellable            *cancellable,
 | 
				
			||||||
							 GError                 **error);
 | 
												 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gssize                 g_socket_send_to                 (GSocket                 *socket,
 | 
					gssize                 g_socket_send_to                 (GSocket                 *socket,
 | 
				
			||||||
							 GSocketAddress          *address,
 | 
												 GSocketAddress          *address,
 | 
				
			||||||
							 const gchar             *buffer,
 | 
												 const gchar             *buffer,
 | 
				
			||||||
							 gsize                    size,
 | 
												 gsize                    size,
 | 
				
			||||||
							 GCancellable            *cancellable,
 | 
												 GCancellable            *cancellable,
 | 
				
			||||||
							 GError                 **error);
 | 
												 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gssize                 g_socket_receive_message         (GSocket                 *socket,
 | 
					gssize                 g_socket_receive_message         (GSocket                 *socket,
 | 
				
			||||||
							 GSocketAddress         **address,
 | 
												 GSocketAddress         **address,
 | 
				
			||||||
							 GInputVector            *vectors,
 | 
												 GInputVector            *vectors,
 | 
				
			||||||
@@ -197,6 +228,7 @@ gssize                 g_socket_receive_message         (GSocket
 | 
				
			|||||||
							 gint                    *flags,
 | 
												 gint                    *flags,
 | 
				
			||||||
							 GCancellable            *cancellable,
 | 
												 GCancellable            *cancellable,
 | 
				
			||||||
							 GError                 **error);
 | 
												 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gssize                 g_socket_send_message            (GSocket                 *socket,
 | 
					gssize                 g_socket_send_message            (GSocket                 *socket,
 | 
				
			||||||
							 GSocketAddress          *address,
 | 
												 GSocketAddress          *address,
 | 
				
			||||||
							 GOutputVector           *vectors,
 | 
												 GOutputVector           *vectors,
 | 
				
			||||||
@@ -206,26 +238,34 @@ gssize                 g_socket_send_message            (GSocket
 | 
				
			|||||||
							 gint                     flags,
 | 
												 gint                     flags,
 | 
				
			||||||
							 GCancellable            *cancellable,
 | 
												 GCancellable            *cancellable,
 | 
				
			||||||
							 GError                 **error);
 | 
												 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean               g_socket_close                   (GSocket                 *socket,
 | 
					gboolean               g_socket_close                   (GSocket                 *socket,
 | 
				
			||||||
							 GError                 **error);
 | 
												 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean               g_socket_shutdown                (GSocket                 *socket,
 | 
					gboolean               g_socket_shutdown                (GSocket                 *socket,
 | 
				
			||||||
							 gboolean                 shutdown_read,
 | 
												 gboolean                 shutdown_read,
 | 
				
			||||||
							 gboolean                 shutdown_write,
 | 
												 gboolean                 shutdown_write,
 | 
				
			||||||
							 GError                 **error);
 | 
												 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean               g_socket_is_closed               (GSocket                 *socket);
 | 
					gboolean               g_socket_is_closed               (GSocket                 *socket);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSource *              g_socket_create_source           (GSocket                 *socket,
 | 
					GSource *              g_socket_create_source           (GSocket                 *socket,
 | 
				
			||||||
							 GIOCondition             condition,
 | 
												 GIOCondition             condition,
 | 
				
			||||||
							 GCancellable            *cancellable);
 | 
												 GCancellable            *cancellable);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean               g_socket_speaks_ipv4             (GSocket                 *socket);
 | 
					gboolean               g_socket_speaks_ipv4             (GSocket                 *socket);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GCredentials          *g_socket_get_credentials         (GSocket                 *socket,
 | 
					GCredentials          *g_socket_get_credentials         (GSocket                 *socket,
 | 
				
			||||||
                                                         GError                 **error);
 | 
					                                                         GError                 **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gssize                 g_socket_receive_with_blocking   (GSocket                 *socket,
 | 
					gssize                 g_socket_receive_with_blocking   (GSocket                 *socket,
 | 
				
			||||||
							 gchar                   *buffer,
 | 
												 gchar                   *buffer,
 | 
				
			||||||
							 gsize                    size,
 | 
												 gsize                    size,
 | 
				
			||||||
							 gboolean                 blocking,
 | 
												 gboolean                 blocking,
 | 
				
			||||||
							 GCancellable            *cancellable,
 | 
												 GCancellable            *cancellable,
 | 
				
			||||||
							 GError                 **error);
 | 
												 GError                 **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gssize                 g_socket_send_with_blocking      (GSocket                 *socket,
 | 
					gssize                 g_socket_send_with_blocking      (GSocket                 *socket,
 | 
				
			||||||
							 const gchar             *buffer,
 | 
												 const gchar             *buffer,
 | 
				
			||||||
							 gsize                    size,
 | 
												 gsize                    size,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -60,18 +60,23 @@ struct _GSocketAddressClass
 | 
				
			|||||||
				     GError        **error);
 | 
									     GError        **error);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                 g_socket_address_get_type        (void) G_GNUC_CONST;
 | 
					GType                 g_socket_address_get_type        (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketFamily         g_socket_address_get_family      (GSocketAddress *address);
 | 
					GSocketFamily         g_socket_address_get_family      (GSocketAddress *address);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketAddress *      g_socket_address_new_from_native (gpointer        native,
 | 
					GSocketAddress *      g_socket_address_new_from_native (gpointer        native,
 | 
				
			||||||
                                                        gsize           len);
 | 
					                                                        gsize           len);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean              g_socket_address_to_native       (GSocketAddress *address,
 | 
					gboolean              g_socket_address_to_native       (GSocketAddress *address,
 | 
				
			||||||
                                                        gpointer        dest,
 | 
					                                                        gpointer        dest,
 | 
				
			||||||
                                                        gsize           destlen,
 | 
					                                                        gsize           destlen,
 | 
				
			||||||
							GError        **error);
 | 
												GError        **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gssize                g_socket_address_get_native_size (GSocketAddress *address);
 | 
					gssize                g_socket_address_get_native_size (GSocketAddress *address);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
G_END_DECLS
 | 
					G_END_DECLS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -69,16 +69,20 @@ struct _GSocketAddressEnumeratorClass
 | 
				
			|||||||
				    GError                   **error);
 | 
									    GError                   **error);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType           g_socket_address_enumerator_get_type        (void) G_GNUC_CONST;
 | 
					GType           g_socket_address_enumerator_get_type        (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketAddress *g_socket_address_enumerator_next        (GSocketAddressEnumerator  *enumerator,
 | 
					GSocketAddress *g_socket_address_enumerator_next        (GSocketAddressEnumerator  *enumerator,
 | 
				
			||||||
							 GCancellable              *cancellable,
 | 
												 GCancellable              *cancellable,
 | 
				
			||||||
							 GError                   **error);
 | 
												 GError                   **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void            g_socket_address_enumerator_next_async  (GSocketAddressEnumerator  *enumerator,
 | 
					void            g_socket_address_enumerator_next_async  (GSocketAddressEnumerator  *enumerator,
 | 
				
			||||||
							 GCancellable              *cancellable,
 | 
												 GCancellable              *cancellable,
 | 
				
			||||||
							 GAsyncReadyCallback        callback,
 | 
												 GAsyncReadyCallback        callback,
 | 
				
			||||||
							 gpointer                   user_data);
 | 
												 gpointer                   user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketAddress *g_socket_address_enumerator_next_finish (GSocketAddressEnumerator  *enumerator,
 | 
					GSocketAddress *g_socket_address_enumerator_next_finish (GSocketAddressEnumerator  *enumerator,
 | 
				
			||||||
							 GAsyncResult              *result,
 | 
												 GAsyncResult              *result,
 | 
				
			||||||
							 GError                   **error);
 | 
												 GError                   **error);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -70,91 +70,122 @@ struct _GSocketClient
 | 
				
			|||||||
  GSocketClientPrivate *priv;
 | 
					  GSocketClientPrivate *priv;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GType                   g_socket_client_get_type                        (void) G_GNUC_CONST;
 | 
					GType                   g_socket_client_get_type                        (void) G_GNUC_CONST;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketClient          *g_socket_client_new                             (void);
 | 
					GSocketClient          *g_socket_client_new                             (void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketFamily           g_socket_client_get_family                      (GSocketClient        *client);
 | 
					GSocketFamily           g_socket_client_get_family                      (GSocketClient        *client);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_socket_client_set_family                      (GSocketClient        *client,
 | 
					void                    g_socket_client_set_family                      (GSocketClient        *client,
 | 
				
			||||||
									 GSocketFamily         family);
 | 
														 GSocketFamily         family);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketType             g_socket_client_get_socket_type                 (GSocketClient        *client);
 | 
					GSocketType             g_socket_client_get_socket_type                 (GSocketClient        *client);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_socket_client_set_socket_type                 (GSocketClient        *client,
 | 
					void                    g_socket_client_set_socket_type                 (GSocketClient        *client,
 | 
				
			||||||
									 GSocketType           type);
 | 
														 GSocketType           type);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketProtocol         g_socket_client_get_protocol                    (GSocketClient        *client);
 | 
					GSocketProtocol         g_socket_client_get_protocol                    (GSocketClient        *client);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_socket_client_set_protocol                    (GSocketClient        *client,
 | 
					void                    g_socket_client_set_protocol                    (GSocketClient        *client,
 | 
				
			||||||
									 GSocketProtocol       protocol);
 | 
														 GSocketProtocol       protocol);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketAddress         *g_socket_client_get_local_address               (GSocketClient        *client);
 | 
					GSocketAddress         *g_socket_client_get_local_address               (GSocketClient        *client);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_socket_client_set_local_address               (GSocketClient        *client,
 | 
					void                    g_socket_client_set_local_address               (GSocketClient        *client,
 | 
				
			||||||
									 GSocketAddress       *address);
 | 
														 GSocketAddress       *address);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
guint                   g_socket_client_get_timeout                     (GSocketClient        *client);
 | 
					guint                   g_socket_client_get_timeout                     (GSocketClient        *client);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_socket_client_set_timeout                     (GSocketClient        *client,
 | 
					void                    g_socket_client_set_timeout                     (GSocketClient        *client,
 | 
				
			||||||
									 guint                 timeout);
 | 
														 guint                 timeout);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_socket_client_get_enable_proxy                (GSocketClient        *client);
 | 
					gboolean                g_socket_client_get_enable_proxy                (GSocketClient        *client);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_socket_client_set_enable_proxy                (GSocketClient        *client,
 | 
					void                    g_socket_client_set_enable_proxy                (GSocketClient        *client,
 | 
				
			||||||
    									 gboolean	      enable);
 | 
					    									 gboolean	      enable);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
gboolean                g_socket_client_get_tls                         (GSocketClient        *client);
 | 
					gboolean                g_socket_client_get_tls                         (GSocketClient        *client);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_socket_client_set_tls                         (GSocketClient        *client,
 | 
					void                    g_socket_client_set_tls                         (GSocketClient        *client,
 | 
				
			||||||
									 gboolean              tls);
 | 
														 gboolean              tls);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GTlsCertificateFlags    g_socket_client_get_tls_validation_flags        (GSocketClient        *client);
 | 
					GTlsCertificateFlags    g_socket_client_get_tls_validation_flags        (GSocketClient        *client);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_socket_client_set_tls_validation_flags        (GSocketClient        *client,
 | 
					void                    g_socket_client_set_tls_validation_flags        (GSocketClient        *client,
 | 
				
			||||||
									 GTlsCertificateFlags  flags);
 | 
														 GTlsCertificateFlags  flags);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketConnection *     g_socket_client_connect                         (GSocketClient        *client,
 | 
					GSocketConnection *     g_socket_client_connect                         (GSocketClient        *client,
 | 
				
			||||||
                                                                         GSocketConnectable   *connectable,
 | 
					                                                                         GSocketConnectable   *connectable,
 | 
				
			||||||
                                                                         GCancellable         *cancellable,
 | 
					                                                                         GCancellable         *cancellable,
 | 
				
			||||||
                                                                         GError              **error);
 | 
					                                                                         GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketConnection *     g_socket_client_connect_to_host                 (GSocketClient        *client,
 | 
					GSocketConnection *     g_socket_client_connect_to_host                 (GSocketClient        *client,
 | 
				
			||||||
									 const gchar          *host_and_port,
 | 
														 const gchar          *host_and_port,
 | 
				
			||||||
									 guint16               default_port,
 | 
														 guint16               default_port,
 | 
				
			||||||
                                                                         GCancellable         *cancellable,
 | 
					                                                                         GCancellable         *cancellable,
 | 
				
			||||||
                                                                         GError              **error);
 | 
					                                                                         GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketConnection *     g_socket_client_connect_to_service              (GSocketClient        *client,
 | 
					GSocketConnection *     g_socket_client_connect_to_service              (GSocketClient        *client,
 | 
				
			||||||
									 const gchar          *domain,
 | 
														 const gchar          *domain,
 | 
				
			||||||
									 const gchar          *service,
 | 
														 const gchar          *service,
 | 
				
			||||||
                                                                         GCancellable         *cancellable,
 | 
					                                                                         GCancellable         *cancellable,
 | 
				
			||||||
                                                                         GError              **error);
 | 
					                                                                         GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketConnection *     g_socket_client_connect_to_uri                  (GSocketClient        *client,
 | 
					GSocketConnection *     g_socket_client_connect_to_uri                  (GSocketClient        *client,
 | 
				
			||||||
									 const gchar          *uri,
 | 
														 const gchar          *uri,
 | 
				
			||||||
									 guint16               default_port,
 | 
														 guint16               default_port,
 | 
				
			||||||
                                                                         GCancellable         *cancellable,
 | 
					                                                                         GCancellable         *cancellable,
 | 
				
			||||||
                                                                         GError              **error);
 | 
					                                                                         GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_socket_client_connect_async                   (GSocketClient        *client,
 | 
					void                    g_socket_client_connect_async                   (GSocketClient        *client,
 | 
				
			||||||
                                                                         GSocketConnectable   *connectable,
 | 
					                                                                         GSocketConnectable   *connectable,
 | 
				
			||||||
                                                                         GCancellable         *cancellable,
 | 
					                                                                         GCancellable         *cancellable,
 | 
				
			||||||
                                                                         GAsyncReadyCallback   callback,
 | 
					                                                                         GAsyncReadyCallback   callback,
 | 
				
			||||||
                                                                         gpointer              user_data);
 | 
					                                                                         gpointer              user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketConnection *     g_socket_client_connect_finish                  (GSocketClient        *client,
 | 
					GSocketConnection *     g_socket_client_connect_finish                  (GSocketClient        *client,
 | 
				
			||||||
                                                                         GAsyncResult         *result,
 | 
					                                                                         GAsyncResult         *result,
 | 
				
			||||||
                                                                         GError              **error);
 | 
					                                                                         GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_socket_client_connect_to_host_async           (GSocketClient        *client,
 | 
					void                    g_socket_client_connect_to_host_async           (GSocketClient        *client,
 | 
				
			||||||
									 const gchar          *host_and_port,
 | 
														 const gchar          *host_and_port,
 | 
				
			||||||
									 guint16               default_port,
 | 
														 guint16               default_port,
 | 
				
			||||||
                                                                         GCancellable         *cancellable,
 | 
					                                                                         GCancellable         *cancellable,
 | 
				
			||||||
                                                                         GAsyncReadyCallback   callback,
 | 
					                                                                         GAsyncReadyCallback   callback,
 | 
				
			||||||
                                                                         gpointer              user_data);
 | 
					                                                                         gpointer              user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketConnection *     g_socket_client_connect_to_host_finish          (GSocketClient        *client,
 | 
					GSocketConnection *     g_socket_client_connect_to_host_finish          (GSocketClient        *client,
 | 
				
			||||||
                                                                         GAsyncResult         *result,
 | 
					                                                                         GAsyncResult         *result,
 | 
				
			||||||
                                                                         GError              **error);
 | 
					                                                                         GError              **error);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_socket_client_connect_to_service_async        (GSocketClient        *client,
 | 
					void                    g_socket_client_connect_to_service_async        (GSocketClient        *client,
 | 
				
			||||||
									 const gchar          *domain,
 | 
														 const gchar          *domain,
 | 
				
			||||||
									 const gchar          *service,
 | 
														 const gchar          *service,
 | 
				
			||||||
                                                                         GCancellable         *cancellable,
 | 
					                                                                         GCancellable         *cancellable,
 | 
				
			||||||
                                                                         GAsyncReadyCallback   callback,
 | 
					                                                                         GAsyncReadyCallback   callback,
 | 
				
			||||||
                                                                         gpointer              user_data);
 | 
					                                                                         gpointer              user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketConnection *     g_socket_client_connect_to_service_finish       (GSocketClient        *client,
 | 
					GSocketConnection *     g_socket_client_connect_to_service_finish       (GSocketClient        *client,
 | 
				
			||||||
                                                                         GAsyncResult         *result,
 | 
					                                                                         GAsyncResult         *result,
 | 
				
			||||||
                                                                         GError              **error);
 | 
					                                                                         GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void                    g_socket_client_connect_to_uri_async            (GSocketClient        *client,
 | 
					void                    g_socket_client_connect_to_uri_async            (GSocketClient        *client,
 | 
				
			||||||
									 const gchar          *uri,
 | 
														 const gchar          *uri,
 | 
				
			||||||
									 guint16               default_port,
 | 
														 guint16               default_port,
 | 
				
			||||||
                                                                         GCancellable         *cancellable,
 | 
					                                                                         GCancellable         *cancellable,
 | 
				
			||||||
                                                                         GAsyncReadyCallback   callback,
 | 
					                                                                         GAsyncReadyCallback   callback,
 | 
				
			||||||
                                                                         gpointer              user_data);
 | 
					                                                                         gpointer              user_data);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
GSocketConnection *     g_socket_client_connect_to_uri_finish           (GSocketClient        *client,
 | 
					GSocketConnection *     g_socket_client_connect_to_uri_finish           (GSocketClient        *client,
 | 
				
			||||||
                                                                         GAsyncResult         *result,
 | 
					                                                                         GAsyncResult         *result,
 | 
				
			||||||
                                                                         GError              **error);
 | 
					                                                                         GError              **error);
 | 
				
			||||||
 | 
					GLIB_AVAILABLE_IN_ALL
 | 
				
			||||||
void			g_socket_client_add_application_proxy		(GSocketClient        *client,
 | 
					void			g_socket_client_add_application_proxy		(GSocketClient        *client,
 | 
				
			||||||
									 const gchar          *protocol);
 | 
														 const gchar          *protocol);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user