[glibmm/glibmm-2-20-mm-common: 163/179] Merge commit 'c93b028dcdf8d51357ac22607bea08ae72619fd0' into glibmm-2-20-mm-common

[Daniel Elstner <daniel src gnome org>]

commit 1cd0d0c20ed3540844f0ec09a88257ee20b9992c
Merge: 4c5fca8... c93b028...
Author: Daniel Elstner <daniel kitta gmail com>
Date:   Sat Sep 5 10:49:16 2009 +0200

    Merge commit 'c93b028dcdf8d51357ac22607bea08ae72619fd0' into glibmm-2-20-mm-common
    
    Conflicts:
    	gio/src/drive.hg

 ChangeLog        |   11 +++++++++++
 configure.ac     |    4 ----
 gio/src/drive.hg |    1 -
 3 files changed, 11 insertions(+), 5 deletions(-)
---
diff --cc ChangeLog
index 22e13d4,e489b8e..1aed146
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,68 +1,14 @@@
+ 2009-07-11  Daniel Elstner  <daniel kitta gmail com>
+ 
+ 	* configure.ac (GTKMM_ARG_ENABLE_FULLDOCS): Remove macro
+ 	call.  Its result is not used anywhere at all anymore.
+ 
+ 2009-07-11  Daniel Elstner  <daniel kitta gmail com>
+ 
+ 	* gio/src/drive.hg (Drive::start_finish): Remove stray
+ 	semicolon to get rid of compiler warning in pedantic mode.
+ 	(Drive::stop_finish): ditto.
+ 
 -2009-07-09  Jonathon Jongsma  <jonathon quotidian org>
 -
 -	* gio/src/volumemonitor.hg: implement Gio::VolumeMonitor::drive-stop-button
 -
 -2009-07-09  Jonathon Jongsma  <jonathon quotidian org>
 -
 -	* gio/src/drive.ccg: fix accidental bug in Gio::Drive::eject() that
 -	  the compiler warned me about
 -
 -2009-07-09  Jonathon Jongsma  <jonathon quotidian org>
 -
 -	* gio/src/volume.ccg:
 -	* gio/src/volume.hg: implement eject_with_operation()
 -	  similarly to the GDrive methods mentioned below
 -
 -2009-07-09  Jonathon Jongsma  <jonathon quotidian org>
 -
 -	* gio/src/mount.ccg:
 -	* gio/src/mount.hg: implement eject_with_operation() and
 -	  mount_with_operation similarly to the GDrive methods mentioned
 -	  below
 -
 -2009-07-09  Jonathon Jongsma  <jonathon quotidian org>
 -
 -	* gio/src/inetaddress.hg: implement get_native_size()
 -
 -2009-07-09  Jonathon Jongsma  <jonathon quotidian org>
 -
 -	* gio/src/drive.hg: implement GDrive::stop-button signal
 -
 -2009-07-09  Jonathon Jongsma  <jonathon quotidian org>
 -
 -	* gio/src/drive.ccg:
 -	* gio/src/drive.hg: Wrap the new eject_with_operation() methods and
 -	  implement the other eject() functions with
 -	  g_drive_eject_with_operation since g_drive_eject has been
 -	  deprecated in favor of eject_with_operation()
 -
 -2009-07-09  Jonathon Jongsma  <jonathon quotidian org>
 -
 -	* gio/src/drive.ccg:
 -	* gio/src/drive.hg:
 -	* gio/src/gio_enums.defs:
 -	* tools/m4/convert_gio.m4: wrap added GDrive methods: start(),
 -	  stop(), start_finish(), stop_finish(), can_start(), can_start(),
 -	  can_start_degraded()
 -
 -2009-07-09  Jonathon Jongsma  <jonathon quotidian org>
 -
 -	* gio/src/gio_methods.defs: re-generated defs
 -	* gio/src/socket.ccg:
 -	* gio/src/socket.hg: fix build breakage caused by the addition of a
 -	  bunch of cancellable parameters to GSocket methods.
 -
  2009-07-06  Daniel Elstner  <danielk openismus com>
  
  	Treat empty Glib::spawn*() working dir as unset
diff --cc gio/src/drive.hg
index 932da46,eaa750f..14a2a4c
--- a/gio/src/drive.hg
+++ b/gio/src/drive.hg
@@@ -112,7 -122,26 +112,6 @@@ public
    _WRAP_METHOD(std::string get_identifier(const std::string& kind) const, g_drive_get_identifier)
    _WRAP_METHOD(Glib::StringArrayHandle enumerate_identifiers() const, g_drive_enumerate_identifiers)
  
- 
 -  /** @newin2p22 */
 -  void start(const Glib::RefPtr<MountOperation>& mount_operation, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot, DriveStartFlags flags = DRIVE_START_NONE);
 -  /** @newin2p22 */
 -  void start(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, DriveStartFlags flags = DRIVE_START_NONE);
 -  _IGNORE(g_drive_start)
 -  _WRAP_METHOD(bool start_finish(const Glib::RefPtr<AsyncResult>& result), g_drive_start_finish, errthrow)
 -  /** @newin2p22 */
 -  _WRAP_METHOD(bool can_start() const, g_drive_can_start)
 -  /** @newin2p22 */
 -  _WRAP_METHOD(bool can_start_degraded() const, g_drive_can_start_degraded)
 -
 -  /** @newin2p22 */
 -  void stop(const Glib::RefPtr<MountOperation>& mount_operation, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot, MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
 -  /** @newin2p22 */
 -  void stop(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
 -  _IGNORE(g_drive_stop)
 -  _WRAP_METHOD(bool stop_finish(const Glib::RefPtr<AsyncResult>& result), g_drive_stop_finish, errthrow)
 -  /** @newin2p22 */
 -  _WRAP_METHOD(bool can_stop() const, g_drive_can_stop)
 -
    /** @newin2p20
     */
    _WRAP_SIGNAL(void changed(), changed, no_default_handler)