GNOME.org
 

glibmm r498 - in trunk: . gio/src tools/m4

Author: jjongsma
Date: Thu Jan 10 15:56:40 2008
New Revision: 498
URL: http://svn.gnome.org/viewvc/glibmm?rev=498&view=rev

Log:
2008-01-10  Jonathon Jongsma  <jjongsma gnome org>

	* gio/src/mountoperation.hg: api change in reply() virtual function and
	addition of MountOperationResult enumeration
	* tools/m4/convert_glib.m4: add MountOperationResult enum conversion
	* gio/src/gio_enums.defs: re-generate enums
	* gio/src/gio_methods.defs: re-generate methods


Modified:
   trunk/ChangeLog
   trunk/gio/src/gio_enums.defs
   trunk/gio/src/gio_methods.defs
   trunk/gio/src/mountoperation.hg
   trunk/tools/m4/convert_glib.m4

Modified: trunk/gio/src/gio_enums.defs
==============================================================================
--- trunk/gio/src/gio_enums.defs	(original)
+++ trunk/gio/src/gio_enums.defs	Thu Jan 10 15:56:40 2008
@@ -1,4 +1,4 @@
-;; From /home/murrayc/svn/gnome220/glib/gio/gappinfo.h
+;; From /opt/gnome2/include/glib-2.0/gio/gappinfo.h
 
 (define-enum-extended AppInfoCreateFlags
   (in-module "G")
@@ -8,7 +8,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/glib/gio/gdatainputstream.h
+;; From /opt/gnome2/include/glib-2.0/gio/gdatainputstream.h
 
 (define-enum-extended DataStreamByteOrder
   (in-module "G")
@@ -31,7 +31,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/glib/gio/gfileattribute.h
+;; From /opt/gnome2/include/glib-2.0/gio/gfileattribute.h
 
 (define-enum-extended FileAttributeType
   (in-module "G")
@@ -69,7 +69,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/glib/gio/gfile.h
+;; From /opt/gnome2/include/glib-2.0/gio/gfile.h
 
 (define-enum-extended FileQueryInfoFlags
   (in-module "G")
@@ -111,7 +111,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/glib/gio/gfileinfo.h
+;; From /opt/gnome2/include/glib-2.0/gio/gfileinfo.h
 
 (define-enum-extended FileType
   (in-module "G")
@@ -127,7 +127,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/glib/gio/gfilemonitor.h
+;; From /opt/gnome2/include/glib-2.0/gio/gfilemonitor.h
 
 (define-enum-extended FileMonitorEvent
   (in-module "G")
@@ -143,7 +143,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/glib/gio/gioerror.h
+;; From /opt/gnome2/include/glib-2.0/gio/gioerror.h
 
 (define-enum-extended IOErrorEnum
   (in-module "G")
@@ -183,7 +183,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/glib/gio/gmountoperation.h
+;; From /opt/gnome2/include/glib-2.0/gio/gmountoperation.h
 
 (define-flags-extended AskPasswordFlags
   (in-module "G")
@@ -207,7 +207,17 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/glib/gio/goutputstream.h
+(define-enum-extended MountOperationResult
+  (in-module "G")
+  (c-name "GMountOperationResult")
+  (values
+    '("handled" "G_MOUNT_OPERATION_HANDLED" "0")
+    '("aborted" "G_MOUNT_OPERATION_ABORTED" "1")
+    '("unhandled" "G_MOUNT_OPERATION_UNHANDLED" "2")
+  )
+)
+
+;; From /opt/gnome2/include/glib-2.0/gio/goutputstream.h
 
 (define-flags-extended OutputStreamSpliceFlags
   (in-module "G")

Modified: trunk/gio/src/gio_methods.defs
==============================================================================
--- trunk/gio/src/gio_methods.defs	(original)
+++ trunk/gio/src/gio_methods.defs	Thu Jan 10 15:56:40 2008
@@ -92,27 +92,6 @@
   (gtype-id "G_TYPE_LOADABLE_ICON")
 )
 
-(define-object DirectoryMonitor
-  (in-module "GLocal")
-  (parent "GFileMonitor")
-  (c-name "GLocalDirectoryMonitor")
-  (gtype-id "G_TYPE_LOCAL_DIRECTORY_MONITOR")
-)
-
-(define-object FileInputStream
-  (in-module "GLocal")
-  (parent "GFileInputStream")
-  (c-name "GLocalFileInputStream")
-  (gtype-id "G_TYPE_LOCAL_FILE_INPUT_STREAM")
-)
-
-(define-object FileMonitor
-  (in-module "GLocal")
-  (parent "GFileMonitor")
-  (c-name "GLocalFileMonitor")
-  (gtype-id "G_TYPE_LOCAL_FILE_MONITOR")
-)
-
 (define-object InputStream
   (in-module "GMemory")
   (parent "GInputStream")
@@ -168,33 +147,12 @@
   (gtype-id "G_TYPE_FILE_OUTPUT_STREAM")
 )
 
-(define-object FileOutputStream
-  (in-module "GLocal")
-  (parent "GFileOutputStream")
-  (c-name "GLocalFileOutputStream")
-  (gtype-id "G_TYPE_LOCAL_FILE_OUTPUT_STREAM")
-)
-
 (define-object e
   (in-module "GSeekabl")
   (c-name "GSeekable")
   (gtype-id "G_TYPE_SEEKABLE")
 )
 
-(define-object InputStream
-  (in-module "GUnix")
-  (parent "GInputStream")
-  (c-name "GUnixInputStream")
-  (gtype-id "G_TYPE_UNIX_INPUT_STREAM")
-)
-
-(define-object OutputStream
-  (in-module "GUnix")
-  (parent "GOutputStream")
-  (c-name "GUnixOutputStream")
-  (gtype-id "G_TYPE_UNIX_OUTPUT_STREAM")
-)
-
 (define-object s
   (in-module "GVf")
   (parent "GObject")
@@ -443,6 +401,17 @@
   )
 )
 
+(define-enum OperationResult
+  (in-module "GMount")
+  (c-name "GMountOperationResult")
+  (gtype-id "G_TYPE_MOUNT_OPERATION_RESULT")
+  (values
+    '("handled" "G_MOUNT_OPERATION_HANDLED")
+    '("aborted" "G_MOUNT_OPERATION_ABORTED")
+    '("unhandled" "G_MOUNT_OPERATION_UNHANDLED")
+  )
+)
+
 (define-flags StreamSpliceFlags
   (in-module "GOutput")
   (c-name "GOutputStreamSpliceFlags")
@@ -676,10 +645,6 @@
 
 
 
-;; From gasynchelper.h
-
-
-
 ;; From gasyncresult.h
 
 (define-function g_async_result_get_type
@@ -1013,10 +978,6 @@
 
 
 
-;; From gcontenttypeprivate.h
-
-
-
 ;; From gdatainputstream.h
 
 (define-function g_data_input_stream_get_type
@@ -1279,46 +1240,6 @@
 
 
 
-;; From gdesktopappinfo.h
-
-(define-function g_desktop_app_info_get_type
-  (c-name "g_desktop_app_info_get_type")
-  (return-type "GType")
-)
-
-(define-function g_desktop_app_info_new_from_filename
-  (c-name "g_desktop_app_info_new_from_filename")
-  (return-type "GDesktopAppInfo*")
-  (parameters
-    '("const-char*" "filename")
-  )
-)
-
-(define-function g_desktop_app_info_new
-  (c-name "g_desktop_app_info_new")
-  (is-constructor-of "GDesktopAppInfo")
-  (return-type "GDesktopAppInfo*")
-  (parameters
-    '("const-char*" "desktop_id")
-  )
-)
-
-(define-method get_is_hidden
-  (of-object "GDesktopAppInfo")
-  (c-name "g_desktop_app_info_get_is_hidden")
-  (return-type "gboolean")
-)
-
-(define-function g_desktop_app_info_set_desktop_env
-  (c-name "g_desktop_app_info_set_desktop_env")
-  (return-type "none")
-  (parameters
-    '("const-char*" "desktop_env")
-  )
-)
-
-
-
 ;; From gdrive.h
 
 (define-function g_drive_get_type
@@ -1425,10 +1346,6 @@
 
 
 
-;; From gdummyfile.h
-
-
-
 ;; From gfileattribute.h
 
 (define-function g_file_attribute_info_list_new
@@ -1477,10 +1394,6 @@
 
 
 
-;; From gfileattribute-priv.h
-
-
-
 ;; From gfileenumerator.h
 
 (define-function g_file_enumerator_get_type
@@ -3442,10 +3355,6 @@
 
 
 
-;; From gioalias.h
-
-
-
 ;; From gioenumtypes.h
 
 (define-function g_app_info_create_flags_get_type
@@ -3528,6 +3437,11 @@
   (return-type "GType")
 )
 
+(define-function g_mount_operation_result_get_type
+  (c-name "g_mount_operation_result_get_type")
+  (return-type "GType")
+)
+
 (define-function g_output_stream_splice_flags_get_type
   (c-name "g_output_stream_splice_flags_get_type")
   (return-type "GType")
@@ -3556,10 +3470,6 @@
 
 
 
-;; From gio-marshal.h
-
-
-
 ;; From giomodule.h
 
 (define-function g_io_module_get_type
@@ -3598,10 +3508,6 @@
 
 
 
-;; From giomodule-priv.h
-
-
-
 ;; From gioscheduler.h
 
 (define-function g_io_scheduler_push_job
@@ -3689,48 +3595,6 @@
 
 
 
-;; From glocaldirectorymonitor.h
-
-(define-function g_local_directory_monitor_get_type
-  (c-name "g_local_directory_monitor_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From glocalfileenumerator.h
-
-
-
-;; From glocalfile.h
-
-
-
-;; From glocalfileinfo.h
-
-
-
-;; From glocalfileinputstream.h
-
-
-
-;; From glocalfilemonitor.h
-
-(define-function g_local_file_monitor_get_type
-  (c-name "g_local_file_monitor_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From glocalfileoutputstream.h
-
-
-
-;; From glocalvfs.h
-
-
-
 ;; From gmemoryinputstream.h
 
 (define-function g_memory_input_stream_get_type
@@ -4031,16 +3895,12 @@
   (c-name "g_mount_operation_reply")
   (return-type "none")
   (parameters
-    '("gboolean" "abort")
+    '("GMountOperationResult" "result")
   )
 )
 
 
 
-;; From gmountprivate.h
-
-
-
 ;; From gnativevolumemonitor.h
 
 (define-function g_native_volume_monitor_get_type
@@ -4235,10 +4095,6 @@
 
 
 
-;; From gpollfilemonitor.h
-
-
-
 ;; From gseekable.h
 
 (define-function g_seekable_get_type
@@ -4502,285 +4358,25 @@
   )
 )
 
-(define-function g_themed_icon_new_from_names
-  (c-name "g_themed_icon_new_from_names")
+(define-function g_themed_icon_new_with_default_fallbacks
+  (c-name "g_themed_icon_new_with_default_fallbacks")
   (return-type "GIcon*")
   (parameters
-    '("char**" "iconnames")
-    '("int" "len")
-  )
-)
-
-
-
-;; From gunionvolumemonitor.h
-
-
-
-;; From gunixinputstream.h
-
-(define-function g_unix_input_stream_get_type
-  (c-name "g_unix_input_stream_get_type")
-  (return-type "GType")
-)
-
-(define-function g_unix_input_stream_new
-  (c-name "g_unix_input_stream_new")
-  (is-constructor-of "GUnixInputStream")
-  (return-type "GInputStream*")
-  (parameters
-    '("int" "fd")
-    '("gboolean" "close_fd_at_close")
-  )
-)
-
-
-
-;; From gunixmount.h
-
-
-
-;; From gunixmounts.h
-
-(define-function g_unix_mount_free
-  (c-name "g_unix_mount_free")
-  (return-type "none")
-  (parameters
-    '("GUnixMountEntry*" "mount_entry")
-  )
-)
-
-(define-method free
-  (of-object "GUnixMountPoint")
-  (c-name "g_unix_mount_point_free")
-  (return-type "none")
-)
-
-(define-function g_unix_mount_compare
-  (c-name "g_unix_mount_compare")
-  (return-type "gint")
-  (parameters
-    '("GUnixMountEntry*" "mount1")
-    '("GUnixMountEntry*" "mount2")
-  )
-)
-
-(define-function g_unix_mount_get_mount_path
-  (c-name "g_unix_mount_get_mount_path")
-  (return-type "const-char*")
-  (parameters
-    '("GUnixMountEntry*" "mount_entry")
-  )
-)
-
-(define-function g_unix_mount_get_device_path
-  (c-name "g_unix_mount_get_device_path")
-  (return-type "const-char*")
-  (parameters
-    '("GUnixMountEntry*" "mount_entry")
-  )
-)
-
-(define-function g_unix_mount_get_fs_type
-  (c-name "g_unix_mount_get_fs_type")
-  (return-type "const-char*")
-  (parameters
-    '("GUnixMountEntry*" "mount_entry")
-  )
-)
-
-(define-function g_unix_mount_is_readonly
-  (c-name "g_unix_mount_is_readonly")
-  (return-type "gboolean")
-  (parameters
-    '("GUnixMountEntry*" "mount_entry")
-  )
-)
-
-(define-function g_unix_mount_is_system_internal
-  (c-name "g_unix_mount_is_system_internal")
-  (return-type "gboolean")
-  (parameters
-    '("GUnixMountEntry*" "mount_entry")
-  )
-)
-
-(define-function g_unix_mount_guess_can_eject
-  (c-name "g_unix_mount_guess_can_eject")
-  (return-type "gboolean")
-  (parameters
-    '("GUnixMountEntry*" "mount_entry")
-  )
-)
-
-(define-function g_unix_mount_guess_name
-  (c-name "g_unix_mount_guess_name")
-  (return-type "char*")
-  (parameters
-    '("GUnixMountEntry*" "mount_entry")
-  )
-)
-
-(define-function g_unix_mount_guess_icon
-  (c-name "g_unix_mount_guess_icon")
-  (return-type "GIcon*")
-  (parameters
-    '("GUnixMountEntry*" "mount_entry")
-  )
-)
-
-(define-method compare
-  (of-object "GUnixMountPoint")
-  (c-name "g_unix_mount_point_compare")
-  (return-type "gint")
-  (parameters
-    '("GUnixMountPoint*" "mount2")
+    '("const-char*" "iconname")
   )
 )
 
-(define-method get_mount_path
-  (of-object "GUnixMountPoint")
-  (c-name "g_unix_mount_point_get_mount_path")
-  (return-type "const-char*")
-)
-
-(define-method get_device_path
-  (of-object "GUnixMountPoint")
-  (c-name "g_unix_mount_point_get_device_path")
-  (return-type "const-char*")
-)
-
-(define-method get_fs_type
-  (of-object "GUnixMountPoint")
-  (c-name "g_unix_mount_point_get_fs_type")
-  (return-type "const-char*")
-)
-
-(define-method is_readonly
-  (of-object "GUnixMountPoint")
-  (c-name "g_unix_mount_point_is_readonly")
-  (return-type "gboolean")
-)
-
-(define-method is_user_mountable
-  (of-object "GUnixMountPoint")
-  (c-name "g_unix_mount_point_is_user_mountable")
-  (return-type "gboolean")
-)
-
-(define-method is_loopback
-  (of-object "GUnixMountPoint")
-  (c-name "g_unix_mount_point_is_loopback")
-  (return-type "gboolean")
-)
-
-(define-method guess_can_eject
-  (of-object "GUnixMountPoint")
-  (c-name "g_unix_mount_point_guess_can_eject")
-  (return-type "gboolean")
-)
-
-(define-method guess_name
-  (of-object "GUnixMountPoint")
-  (c-name "g_unix_mount_point_guess_name")
-  (return-type "char*")
-)
-
-(define-method guess_icon
-  (of-object "GUnixMountPoint")
-  (c-name "g_unix_mount_point_guess_icon")
+(define-function g_themed_icon_new_from_names
+  (c-name "g_themed_icon_new_from_names")
   (return-type "GIcon*")
-)
-
-(define-function g_unix_mount_points_get
-  (c-name "g_unix_mount_points_get")
-  (return-type "GList*")
-  (parameters
-    '("guint64*" "time_read")
-  )
-)
-
-(define-function g_unix_mounts_get
-  (c-name "g_unix_mounts_get")
-  (return-type "GList*")
-  (parameters
-    '("guint64*" "time_read")
-  )
-)
-
-(define-function g_unix_mount_at
-  (c-name "g_unix_mount_at")
-  (return-type "GUnixMountEntry*")
-  (parameters
-    '("const-char*" "mount_path")
-    '("guint64*" "time_read")
-  )
-)
-
-(define-function g_unix_mounts_changed_since
-  (c-name "g_unix_mounts_changed_since")
-  (return-type "gboolean")
-  (parameters
-    '("guint64" "time")
-  )
-)
-
-(define-function g_unix_mount_points_changed_since
-  (c-name "g_unix_mount_points_changed_since")
-  (return-type "gboolean")
-  (parameters
-    '("guint64" "time")
-  )
-)
-
-(define-function g_unix_mount_monitor_get_type
-  (c-name "g_unix_mount_monitor_get_type")
-  (return-type "GType")
-)
-
-(define-function g_unix_mount_monitor_new
-  (c-name "g_unix_mount_monitor_new")
-  (is-constructor-of "GUnixMountMonitor")
-  (return-type "GUnixMountMonitor*")
-)
-
-(define-function g_unix_is_mount_path_system_internal
-  (c-name "g_unix_is_mount_path_system_internal")
-  (return-type "gboolean")
   (parameters
-    '("const-char*" "mount_path")
-  )
-)
-
-
-
-;; From gunixoutputstream.h
-
-(define-function g_unix_output_stream_get_type
-  (c-name "g_unix_output_stream_get_type")
-  (return-type "GType")
-)
-
-(define-function g_unix_output_stream_new
-  (c-name "g_unix_output_stream_new")
-  (is-constructor-of "GUnixOutputStream")
-  (return-type "GOutputStream*")
-  (parameters
-    '("int" "fd")
-    '("gboolean" "close_fd_at_close")
+    '("char**" "iconnames")
+    '("int" "len")
   )
 )
 
 
 
-;; From gunixvolume.h
-
-
-
-;; From gunixvolumemonitor.h
-
-
-
 ;; From gvfs.h
 
 (define-function g_vfs_get_type
@@ -4985,12 +4581,3 @@
 )
 
 
-
-;; From gwin32appinfo.h
-
-(define-function g_win32_app_info_get_type
-  (c-name "g_win32_app_info_get_type")
-  (return-type "GType")
-)
-
-

Modified: trunk/gio/src/mountoperation.hg
==============================================================================
--- trunk/gio/src/mountoperation.hg	(original)
+++ trunk/gio/src/mountoperation.hg	Thu Jan 10 15:56:40 2008
@@ -29,6 +29,7 @@
 
 _WRAP_ENUM(PasswordFlags, GPasswordFlags, NO_GTYPE)
 _WRAP_ENUM(PasswordSave, GPasswordSave, NO_GTYPE)
+_WRAP_ENUM(MountOperationResult, GMountOperationResult, NO_GTYPE)
 
 class MountOperation : public Glib::Object
 {
@@ -62,7 +63,7 @@
                g_mount_operation_set_password_save)
   _WRAP_METHOD(int get_choice() const, g_mount_operation_get_choice)
   _WRAP_METHOD(void set_choice(int choice), g_mount_operation_set_choice)
-  _WRAP_METHOD(void reply(bool abort = false), g_mount_operation_reply)
+  _WRAP_METHOD(void reply(MountOperationResult result), g_mount_operation_reply)
 };
 
 } // namespace Gio

Modified: trunk/tools/m4/convert_glib.m4
==============================================================================
--- trunk/tools/m4/convert_glib.m4	(original)
+++ trunk/tools/m4/convert_glib.m4	Thu Jan 10 15:56:40 2008
@@ -27,6 +27,7 @@
 _CONV_GLIB_ENUM(RegexMatchFlags)
 
 _CONV_ENUM(G,PasswordSave)
+_CONV_ENUM(G,MountOperationResult)
 _CONV_ENUM(G,FileAttributeType)
 _CONV_ENUM(G,FileAttributeInfoFlags)
 _CONV_ENUM(G,FileCopyFlags)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]