X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgvolumemonitor.h;h=1ee3a7e20d4a7b635e060770721ab9b9c3002ae9;hb=7103484017ff000d01ed94567539d37fa09b32b2;hp=6c9f71241f209dfbb16fb352eaa721d9786e4989;hpb=f2a2d6c9ac2d98b565005d446fde01aac47f7d88;p=platform%2Fupstream%2Fglib.git

diff --git a/gio/gvolumemonitor.h b/gio/gvolumemonitor.h
index 6c9f712..1ee3a7e 100644
--- a/gio/gvolumemonitor.h
+++ b/gio/gvolumemonitor.h
@@ -15,21 +15,19 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Alexander Larsson <alexl@redhat.com>
  *         David Zeuthen <davidz@redhat.com>
  */
 
+#ifndef __G_VOLUME_MONITOR_H__
+#define __G_VOLUME_MONITOR_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_VOLUME_MONITOR_H__
-#define __G_VOLUME_MONITOR_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
@@ -45,13 +43,12 @@ G_BEGIN_DECLS
  * G_VOLUME_MONITOR_EXTENSION_POINT_NAME:
  *
  * Extension point for volume monitor functionality.
- * See <link linkend="extending-gio">Extending GIO</link>.
+ * See [Extending GIO][extending-gio].
  */
 #define G_VOLUME_MONITOR_EXTENSION_POINT_NAME "gio-volume-monitor"
 
 /**
  * GVolumeMonitor:
- * @parent_instance: The parent instance.
  *
  * A Volume Monitor that watches for volume events.
  **/
@@ -109,7 +106,7 @@ struct _GVolumeMonitorClass
                                       const char     *uuid);
 
 
-  /* These arguments are unfortunately backwards by mistake (bug #520169) */
+  /* These arguments are unfortunately backwards by mistake (bug #520169). Deprecated in 2.20. */
   GVolume * (* adopt_orphan_mount)   (GMount         *mount,
                                       GVolumeMonitor *volume_monitor);
 
@@ -117,6 +114,10 @@ struct _GVolumeMonitorClass
   void      (* drive_eject_button)   (GVolumeMonitor *volume_monitor,
                                       GDrive         *drive);
 
+  /* signal added in 2.21 */
+  void      (* drive_stop_button)   (GVolumeMonitor *volume_monitor,
+                                     GDrive         *drive);
+
   /*< private >*/
   /* Padding for future expansion */
   void (*_g_reserved1) (void);
@@ -125,20 +126,27 @@ struct _GVolumeMonitorClass
   void (*_g_reserved4) (void);
   void (*_g_reserved5) (void);
   void (*_g_reserved6) (void);
-  void (*_g_reserved7) (void);
 };
 
+GLIB_AVAILABLE_IN_ALL
 GType           g_volume_monitor_get_type             (void) G_GNUC_CONST;
 
+GLIB_AVAILABLE_IN_ALL
 GVolumeMonitor *g_volume_monitor_get                  (void);
+GLIB_AVAILABLE_IN_ALL
 GList *         g_volume_monitor_get_connected_drives (GVolumeMonitor *volume_monitor);
+GLIB_AVAILABLE_IN_ALL
 GList *         g_volume_monitor_get_volumes          (GVolumeMonitor *volume_monitor);
+GLIB_AVAILABLE_IN_ALL
 GList *         g_volume_monitor_get_mounts           (GVolumeMonitor *volume_monitor);
+GLIB_AVAILABLE_IN_ALL
 GVolume *       g_volume_monitor_get_volume_for_uuid  (GVolumeMonitor *volume_monitor,
                                                        const char     *uuid);
+GLIB_AVAILABLE_IN_ALL
 GMount *        g_volume_monitor_get_mount_for_uuid   (GVolumeMonitor *volume_monitor,
                                                        const char     *uuid);
 
+GLIB_DEPRECATED
 GVolume *       g_volume_monitor_adopt_orphan_mount   (GMount         *mount);
 
 G_END_DECLS