projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gresource: Make extract work better
[platform/upstream/glib.git]
/
gio
/
gvolumemonitor.c
diff --git
a/gio/gvolumemonitor.c
b/gio/gvolumemonitor.c
index
168a174
..
441afc6
100644
(file)
--- a/
gio/gvolumemonitor.c
+++ b/
gio/gvolumemonitor.c
@@
-15,9
+15,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* 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>
*
* Author: Alexander Larsson <alexl@redhat.com>
* David Zeuthen <davidz@redhat.com>
@@
-30,7
+28,6
@@
#include "gdrive.h"
#include "glibintl.h"
#include "gdrive.h"
#include "glibintl.h"
-#include "gioalias.h"
/**
* SECTION:gvolumemonitor
/**
* SECTION:gvolumemonitor
@@
-41,7
+38,12
@@
* #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 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);
@@
-67,10
+69,6
@@
static guint signals[LAST_SIGNAL] = { 0 };
static void
g_volume_monitor_finalize (GObject *object)
{
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);
}
G_OBJECT_CLASS (g_volume_monitor_parent_class)->finalize (object);
}
@@
-282,7
+280,7
@@
g_volume_monitor_init (GVolumeMonitor *monitor)
* The returned list should be freed with g_list_free(), after
* its elements have been unreffed with g_object_unref().
*
* 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 objects.
+ * Returns:
(element-type GDrive) (transfer full):
a #GList of connected #GDrive objects.
**/
GList *
g_volume_monitor_get_connected_drives (GVolumeMonitor *volume_monitor)
**/
GList *
g_volume_monitor_get_connected_drives (GVolumeMonitor *volume_monitor)
@@
-305,7
+303,7
@@
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().
*
* 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 objects.
+ * Returns:
(element-type GVolume) (transfer full):
a #GList of #GVolume objects.
**/
GList *
g_volume_monitor_get_volumes (GVolumeMonitor *volume_monitor)
**/
GList *
g_volume_monitor_get_volumes (GVolumeMonitor *volume_monitor)
@@
-328,7
+326,7
@@
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().
*
* 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 objects.
+ * Returns:
(element-type GMount) (transfer full):
a #GList of #GMount objects.
**/
GList *
g_volume_monitor_get_mounts (GVolumeMonitor *volume_monitor)
**/
GList *
g_volume_monitor_get_mounts (GVolumeMonitor *volume_monitor)
@@
-349,7
+347,7
@@
g_volume_monitor_get_mounts (GVolumeMonitor *volume_monitor)
*
* Finds a #GVolume object by its 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 *
* Free the returned object with g_object_unref().
**/
GVolume *
@@
-373,7
+371,7
@@
g_volume_monitor_get_volume_for_uuid (GVolumeMonitor *volume_monitor,
*
* Finds a #GMount object by its 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 *
* Free the returned object with g_object_unref().
**/
GMount *
@@
-389,7
+387,3
@@
g_volume_monitor_get_mount_for_uuid (GVolumeMonitor *volume_monitor,
return class->get_mount_for_uuid (volume_monitor, uuid);
}
return class->get_mount_for_uuid (volume_monitor, uuid);
}
-
-
-#define __G_VOLUME_MONITOR_C__
-#include "gioaliasdef.c"