Export g_charset_converter_get_num_fallbacks in header

[platform/upstream/glib.git] / gio / gmountoperation.h

diff --git a/gio/gmountoperation.h b/gio/gmountoperation.h
index 3b3b42a..8432b80 100644 (file)
--- a/gio/gmountoperation.h
+++ b/gio/gmountoperation.h
@@ -1,5 +1,5 @@
 /* GIO - GLib Input, Output and Streaming Library
- * 
+ *
  * Copyright (C) 2006-2007 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -20,12 +20,14 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_MOUNT_OPERATION_H__
 #define __G_MOUNT_OPERATION_H__
 
-#include <sys/stat.h>
-
-#include <glib-object.h>
+#include <gio/giotypes.h>
 
 G_BEGIN_DECLS
 
@@ -38,11 +40,10 @@ G_BEGIN_DECLS
 
 /**
  * GMountOperation:
- * 
- * Class for providing authentication methods for mounting operations, 
+ *
+ * Class for providing authentication methods for mounting operations,
  * such as mounting a file locally, or authenticating with a server.
  **/
-typedef struct _GMountOperation        GMountOperation;
 typedef struct _GMountOperationClass   GMountOperationClass;
 typedef struct _GMountOperationPrivate GMountOperationPrivate;
 
@@ -53,60 +54,32 @@ struct _GMountOperation
   GMountOperationPrivate *priv;
 };
 
-/**
- * GPasswordFlags:
- * @G_PASSWORD_FLAGS_NEED_PASSWORD: operation requires a password.
- * @G_PASSWORD_FLAGS_NEED_USERNAME: operation requires a username.
- * @G_PASSWORD_FLAGS_NEED_DOMAIN: operation requires a domain.
- * @G_PASSWORD_FLAGS_SAVING_SUPPORTED: operation supports saving settings.
- * @G_PASSWORD_FLAGS_ANONYMOUS_SUPPORTED: operation supports anonymous users.
- * 
- * #GPasswordFlags are used to request specific information from the 
- * user, or to notify the user of their choices in an authentication
- * situation. 
- * 
- **/ 
-typedef enum {
-  G_PASSWORD_FLAGS_NEED_PASSWORD       = 1<<0,
-  G_PASSWORD_FLAGS_NEED_USERNAME       = 1<<1,
-  G_PASSWORD_FLAGS_NEED_DOMAIN         = 1<<2,
-  G_PASSWORD_FLAGS_SAVING_SUPPORTED    = 1<<3,
-  G_PASSWORD_FLAGS_ANONYMOUS_SUPPORTED = 1<<4
-} GPasswordFlags;
-
-/**
- * GPasswordSave:
- * @G_PASSWORD_SAVE_NEVER: never save a password.
- * @G_PASSWORD_SAVE_FOR_SESSION: save a password for the session.
- * @G_PASSWORD_SAVE_PERMANENTLY: save a password permanently.
- * 
- * #GPasswordSave is used to indicate the lifespan of a saved password.
- **/ 
-typedef enum {
-  G_PASSWORD_SAVE_NEVER,
-  G_PASSWORD_SAVE_FOR_SESSION,
-  G_PASSWORD_SAVE_PERMANENTLY
-} GPasswordSave;
-
 struct _GMountOperationClass
 {
   GObjectClass parent_class;
 
   /* signals: */
 
-  gboolean (* ask_password) (GMountOperation *op,
-                            const char      *message,
-                            const char      *default_user,
-                            const char      *default_domain,
-                            GPasswordFlags   flags);
-
-  gboolean (* ask_question) (GMountOperation *op,
-                            const char      *message,
-                            const char      *choices[]);
-  
-  void     (* reply)        (GMountOperation *op,
-                            gboolean         abort);
-  
+  void (* ask_password) (GMountOperation       *op,
+                        const char            *message,
+                        const char            *default_user,
+                        const char            *default_domain,
+                        GAskPasswordFlags      flags);
+
+  void (* ask_question) (GMountOperation       *op,
+                        const char            *message,
+                        const char            *choices[]);
+
+  void (* reply)        (GMountOperation       *op,
+                        GMountOperationResult  result);
+
+  void (* aborted)      (GMountOperation       *op);
+
+  void (* show_processes) (GMountOperation      *op,
+                           const gchar          *message,
+                           GArray               *processes,
+                           const gchar          *choices[]);
+
   /*< private >*/
   /* Padding for future expansion */
   void (*_g_reserved1) (void);
@@ -119,13 +92,10 @@ struct _GMountOperationClass
   void (*_g_reserved8) (void);
   void (*_g_reserved9) (void);
   void (*_g_reserved10) (void);
-  void (*_g_reserved11) (void);
-  void (*_g_reserved12) (void);
 };
 
-GType g_mount_operation_get_type (void) G_GNUC_CONST;
-  
-GMountOperation *  g_mount_operation_new (void);
+GType             g_mount_operation_get_type      (void) G_GNUC_CONST;
+GMountOperation * g_mount_operation_new           (void);
 
 const char *  g_mount_operation_get_username      (GMountOperation *op);
 void          g_mount_operation_set_username      (GMountOperation *op,
@@ -146,7 +116,7 @@ int           g_mount_operation_get_choice        (GMountOperation *op);
 void          g_mount_operation_set_choice        (GMountOperation *op,
                                                   int              choice);
 void          g_mount_operation_reply             (GMountOperation *op,
-                                                  gboolean         abort);
+                                                  GMountOperationResult result);
 
 G_END_DECLS