* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* 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>
#include "gdrive.h"
#include "glibintl.h"
-#include "gioalias.h"
/**
* SECTION:gvolumemonitor
* #GVolumeMonitor is for listing the user interesting devices and volumes
* on the computer. In other words, what a file selector or file manager
* would show in a sidebar.
-**/
+ *
+ * #GVolumeMonitor is not
+ * [thread-default-context aware][g-main-context-push-thread-default],
+ * and so should not be used other than from the main thread, with no
+ * thread-default-context active.
+ **/
-G_DEFINE_TYPE (GVolumeMonitor, g_volume_monitor, G_TYPE_OBJECT);
+G_DEFINE_TYPE (GVolumeMonitor, g_volume_monitor, G_TYPE_OBJECT)
enum {
VOLUME_ADDED,
DRIVE_DISCONNECTED,
DRIVE_CHANGED,
DRIVE_EJECT_BUTTON,
+ DRIVE_STOP_BUTTON,
LAST_SIGNAL
};
static void
g_volume_monitor_finalize (GObject *object)
{
- GVolumeMonitor *monitor;
-
- monitor = G_VOLUME_MONITOR (object);
-
G_OBJECT_CLASS (g_volume_monitor_parent_class)->finalize (object);
}
*
* Emitted when a mountable volume is added to the system.
**/
- signals[VOLUME_ADDED] = g_signal_new (I_("volume_added"),
+ signals[VOLUME_ADDED] = g_signal_new (I_("volume-added"),
G_TYPE_VOLUME_MONITOR,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GVolumeMonitorClass, volume_added),
*
* Emitted when a mountable volume is removed from the system.
**/
- signals[VOLUME_REMOVED] = g_signal_new (I_("volume_removed"),
+ signals[VOLUME_REMOVED] = g_signal_new (I_("volume-removed"),
G_TYPE_VOLUME_MONITOR,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GVolumeMonitorClass, volume_removed),
*
* Emitted when mountable volume is changed.
**/
- signals[VOLUME_CHANGED] = g_signal_new (I_("volume_changed"),
+ signals[VOLUME_CHANGED] = g_signal_new (I_("volume-changed"),
G_TYPE_VOLUME_MONITOR,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GVolumeMonitorClass, volume_changed),
*
* Emitted when a mount is added.
**/
- signals[MOUNT_ADDED] = g_signal_new (I_("mount_added"),
+ signals[MOUNT_ADDED] = g_signal_new (I_("mount-added"),
G_TYPE_VOLUME_MONITOR,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GVolumeMonitorClass, mount_added),
*
* Emitted when a mount is removed.
**/
- signals[MOUNT_REMOVED] = g_signal_new (I_("mount_removed"),
+ signals[MOUNT_REMOVED] = g_signal_new (I_("mount-removed"),
G_TYPE_VOLUME_MONITOR,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GVolumeMonitorClass, mount_removed),
*
* Emitted when a mount is about to be removed.
**/
- signals[MOUNT_PRE_UNMOUNT] = g_signal_new (I_("mount_pre_unmount"),
+ signals[MOUNT_PRE_UNMOUNT] = g_signal_new (I_("mount-pre-unmount"),
G_TYPE_VOLUME_MONITOR,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GVolumeMonitorClass, mount_pre_unmount),
*
* Emitted when a mount changes.
**/
- signals[MOUNT_CHANGED] = g_signal_new (I_("mount_changed"),
+ signals[MOUNT_CHANGED] = g_signal_new (I_("mount-changed"),
G_TYPE_VOLUME_MONITOR,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GVolumeMonitorClass, mount_changed),
*
* Emitted when a drive is connected to the system.
**/
- signals[DRIVE_CONNECTED] = g_signal_new (I_("drive_connected"),
+ signals[DRIVE_CONNECTED] = g_signal_new (I_("drive-connected"),
G_TYPE_VOLUME_MONITOR,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GVolumeMonitorClass, drive_connected),
*
* Emitted when a drive is disconnected from the system.
**/
- signals[DRIVE_DISCONNECTED] = g_signal_new (I_("drive_disconnected"),
+ signals[DRIVE_DISCONNECTED] = g_signal_new (I_("drive-disconnected"),
G_TYPE_VOLUME_MONITOR,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GVolumeMonitorClass, drive_disconnected),
*
* Emitted when a drive changes.
**/
- signals[DRIVE_CHANGED] = g_signal_new (I_("drive_changed"),
+ signals[DRIVE_CHANGED] = g_signal_new (I_("drive-changed"),
G_TYPE_VOLUME_MONITOR,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GVolumeMonitorClass, drive_changed),
*
* Since: 2.18
**/
- signals[DRIVE_EJECT_BUTTON] = g_signal_new (I_("drive_eject_button"),
+ signals[DRIVE_EJECT_BUTTON] = g_signal_new (I_("drive-eject-button"),
G_TYPE_VOLUME_MONITOR,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GVolumeMonitorClass, drive_eject_button),
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_DRIVE);
+ /**
+ * GVolumeMonitor::drive-stop-button:
+ * @volume_monitor: The volume monitor emitting the signal.
+ * @drive: the drive where the stop button was pressed
+ *
+ * Emitted when the stop button is pressed on @drive.
+ *
+ * Since: 2.22
+ **/
+ signals[DRIVE_STOP_BUTTON] = g_signal_new (I_("drive-stop-button"),
+ G_TYPE_VOLUME_MONITOR,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GVolumeMonitorClass, drive_stop_button),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__OBJECT,
+ G_TYPE_NONE, 1, G_TYPE_DRIVE);
+
}
static void
* The returned list should be freed with g_list_free(), after
* its elements have been unreffed with g_object_unref().
*
- * Returns: a #GList of connected #GDrive<!-- -->s
+ * Returns: (element-type GDrive) (transfer full): a #GList of connected #GDrive objects.
**/
GList *
g_volume_monitor_get_connected_drives (GVolumeMonitor *volume_monitor)
* The returned list should be freed with g_list_free(), after
* its elements have been unreffed with g_object_unref().
*
- * Returns: a #GList of #GVolume<!-- -->s.
+ * Returns: (element-type GVolume) (transfer full): a #GList of #GVolume objects.
**/
GList *
g_volume_monitor_get_volumes (GVolumeMonitor *volume_monitor)
* The returned list should be freed with g_list_free(), after
* its elements have been unreffed with g_object_unref().
*
- * Returns: a #GList of #GMount<!-- -->s
+ * Returns: (element-type GMount) (transfer full): a #GList of #GMount objects.
**/
GList *
g_volume_monitor_get_mounts (GVolumeMonitor *volume_monitor)
* @volume_monitor: a #GVolumeMonitor.
* @uuid: the UUID to look for
*
- * Finds a #GVolume object by it's UUID (see g_volume_get_uuid())
+ * Finds a #GVolume object by its UUID (see g_volume_get_uuid())
*
- * Returns: a #GVolume or %NULL if no such volume is available.
+ * Returns: (transfer full): a #GVolume or %NULL if no such volume is available.
* Free the returned object with g_object_unref().
**/
GVolume *
* @volume_monitor: a #GVolumeMonitor.
* @uuid: the UUID to look for
*
- * Finds a #GMount object by it's UUID (see g_mount_get_uuid())
+ * Finds a #GMount object by its UUID (see g_mount_get_uuid())
*
- * Returns: a #GMount or %NULL if no such mount is available.
+ * Returns: (transfer full): a #GMount or %NULL if no such mount is available.
* Free the returned object with g_object_unref().
**/
GMount *
return class->get_mount_for_uuid (volume_monitor, uuid);
}
-
-
-#define __G_VOLUME_MONITOR_C__
-#include "gioaliasdef.c"
projects / platform / upstream / glib.git / blobdiff