X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgunixvolume.c;h=981f703b8d0bbbdf7ab436bbc384c501d5c2e31c;hb=33b9935efc82f8cc4747dfea2743129dfc418d19;hp=3cf6094b0d9f7d2b72bcf48f412317509df7227d;hpb=5b946e0504952a472cea1ef95df0967e8a4a7b47;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/gunixvolume.c b/gio/gunixvolume.c
index 3cf6094..981f703 100644
--- a/gio/gunixvolume.c
+++ b/gio/gunixvolume.c
@@ -15,9 +15,7 @@
* 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 .
*
* Author: Alexander Larsson
* David Zeuthen
@@ -36,7 +34,7 @@
#include "gthemedicon.h"
#include "gvolume.h"
#include "gvolumemonitor.h"
-#include "gsimpleasyncresult.h"
+#include "gtask.h"
#include "gioerror.h"
#include "glibintl.h"
/* for BUFSIZ */
@@ -58,6 +56,7 @@ struct _GUnixVolume {
char *name;
GIcon *icon;
+ GIcon *symbolic_icon;
};
static void g_unix_volume_volume_iface_init (GVolumeIface *iface);
@@ -81,6 +80,7 @@ g_unix_volume_finalize (GObject *object)
_g_unix_mount_unset_volume (volume->mount, volume);
g_object_unref (volume->icon);
+ g_object_unref (volume->symbolic_icon);
g_free (volume->name);
g_free (volume->mount_path);
g_free (volume->device_path);
@@ -122,6 +122,7 @@ _g_unix_volume_new (GVolumeMonitor *volume_monitor,
volume->name = g_unix_mount_point_guess_name (mountpoint);
volume->icon = g_unix_mount_point_guess_icon (mountpoint);
+ volume->symbolic_icon = g_unix_mount_point_guess_symbolic_icon (mountpoint);
if (strcmp (g_unix_mount_point_get_fs_type (mountpoint), "nfs") == 0)
@@ -197,6 +198,13 @@ g_unix_volume_get_icon (GVolume *volume)
return g_object_ref (unix_volume->icon);
}
+static GIcon *
+g_unix_volume_get_symbolic_icon (GVolume *volume)
+{
+ GUnixVolume *unix_volume = G_UNIX_VOLUME (volume);
+ return g_object_ref (unix_volume->symbolic_icon);
+}
+
static char *
g_unix_volume_get_name (GVolume *volume)
{
@@ -257,178 +265,63 @@ _g_unix_volume_has_mount_path (GUnixVolume *volume,
return strcmp (volume->mount_path, mount_path) == 0;
}
-
-typedef struct {
- GUnixVolume *unix_volume;
- GAsyncReadyCallback callback;
- gpointer user_data;
- GCancellable *cancellable;
- int error_fd;
- GIOChannel *error_channel;
- GSource *error_channel_source;
- GString *error_string;
-} EjectMountOp;
-
static void
-eject_mount_cb (GPid pid,
- gint status,
- gpointer user_data)
+eject_mount_done (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
{
- EjectMountOp *data = user_data;
- GSimpleAsyncResult *simple;
-
- if (WEXITSTATUS (status) != 0)
+ GSubprocess *subprocess = G_SUBPROCESS (source);
+ GTask *task = user_data;
+ GError *error = NULL;
+ gchar *stderr_str;
+
+ if (!g_subprocess_communicate_utf8_finish (subprocess, result, NULL, &stderr_str, &error))
{
- GError *error;
- error = g_error_new_literal (G_IO_ERROR,
- G_IO_ERROR_FAILED,
- data->error_string->str);
- simple = g_simple_async_result_new_from_error (G_OBJECT (data->unix_volume),
- data->callback,
- data->user_data,
- error);
+ g_task_return_error (task, error);
g_error_free (error);
}
- else
+ else /* successful communication */
{
- simple = g_simple_async_result_new (G_OBJECT (data->unix_volume),
- data->callback,
- data->user_data,
- NULL);
+ if (!g_subprocess_get_successful (subprocess))
+ /* ...but bad exit code */
+ g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED, "%s", stderr_str);
+ else
+ /* ...and successful exit code */
+ g_task_return_boolean (task, TRUE);
+
+ g_free (stderr_str);
}
- g_simple_async_result_complete (simple);
- g_object_unref (simple);
-
- if (data->error_channel_source)
- {
- g_source_destroy (data->error_channel_source);
- g_source_unref (data->error_channel_source);
- }
- g_io_channel_unref (data->error_channel);
- g_string_free (data->error_string, TRUE);
- close (data->error_fd);
- g_spawn_close_pid (pid);
- g_free (data);
-}
-
-static gboolean
-eject_mount_read_error (GIOChannel *channel,
- GIOCondition condition,
- gpointer user_data)
-{
- EjectMountOp *data = user_data;
- char buf[BUFSIZ];
- gsize bytes_read;
- GError *error;
- GIOStatus status;
-
- error = NULL;
-read:
- status = g_io_channel_read_chars (channel, buf, sizeof (buf), &bytes_read, &error);
- if (status == G_IO_STATUS_NORMAL)
- {
- g_string_append_len (data->error_string, buf, bytes_read);
- if (bytes_read == sizeof (buf))
- goto read;
- }
- else if (status == G_IO_STATUS_EOF)
- g_string_append_len (data->error_string, buf, bytes_read);
- else if (status == G_IO_STATUS_ERROR)
- {
- if (data->error_string->len > 0)
- g_string_append (data->error_string, "\n");
-
- g_string_append (data->error_string, error->message);
- g_error_free (error);
-
- if (data->error_channel_source)
- {
- g_source_unref (data->error_channel_source);
- data->error_channel_source = NULL;
- }
- return FALSE;
- }
-
- return TRUE;
+ g_object_unref (task);
}
static void
-eject_mount_do (GVolume *volume,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data,
- char **argv)
+eject_mount_do (GVolume *volume,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data,
+ const gchar * const *argv)
{
- GUnixVolume *unix_volume = G_UNIX_VOLUME (volume);
- EjectMountOp *data;
- GPid child_pid;
- GSource *child_watch;
- GError *error;
-
- data = g_new0 (EjectMountOp, 1);
- data->unix_volume = unix_volume;
- data->callback = callback;
- data->user_data = user_data;
- data->cancellable = cancellable;
-
- error = NULL;
- if (!g_spawn_async_with_pipes (NULL, /* working dir */
- argv,
- NULL, /* envp */
- G_SPAWN_DO_NOT_REAP_CHILD|G_SPAWN_SEARCH_PATH,
- NULL, /* child_setup */
- NULL, /* user_data for child_setup */
- &child_pid,
- NULL, /* standard_input */
- NULL, /* standard_output */
- &(data->error_fd),
- &error))
- {
- g_assert (error != NULL);
- goto handle_error;
- }
-
- data->error_string = g_string_new ("");
-
- data->error_channel = g_io_channel_unix_new (data->error_fd);
- g_io_channel_set_flags (data->error_channel, G_IO_FLAG_NONBLOCK, &error);
- if (error != NULL)
- goto handle_error;
+ GSubprocess *subprocess;
+ GError *error = NULL;
+ GTask *task;
- data->error_channel_source = g_io_create_watch (data->error_channel, G_IO_IN);
- g_source_set_callback (data->error_channel_source,
- (GSourceFunc) eject_mount_read_error, data, NULL);
- g_source_attach (data->error_channel_source, g_main_context_get_thread_default ());
+ task = g_task_new (volume, cancellable, callback, user_data);
- child_watch = g_child_watch_source_new (child_pid);
- g_source_set_callback (child_watch, (GSourceFunc) eject_mount_cb, data, NULL);
- g_source_attach (child_watch, g_main_context_get_thread_default ());
- g_source_unref (child_watch);
-
-handle_error:
- if (error != NULL)
+ if (g_task_return_error_if_cancelled (task))
{
- GSimpleAsyncResult *simple;
- simple = g_simple_async_result_new_from_error (G_OBJECT (data->unix_volume),
- data->callback,
- data->user_data,
- error);
- g_simple_async_result_complete (simple);
- g_object_unref (simple);
-
- if (data->error_string != NULL)
- g_string_free (data->error_string, TRUE);
+ g_object_unref (task);
+ return;
+ }
- if (data->error_channel != NULL)
- g_io_channel_unref (data->error_channel);
+ subprocess = g_subprocess_newv (argv, G_SUBPROCESS_FLAGS_STDOUT_SILENCE | G_SUBPROCESS_FLAGS_STDERR_PIPE, &error);
+ g_assert_no_error (error);
- g_error_free (error);
- g_free (data);
- }
+ g_subprocess_communicate_utf8_async (subprocess, NULL,
+ g_task_get_cancellable (task),
+ eject_mount_done, task);
}
-
static void
g_unix_volume_mount (GVolume *volume,
GMountMountFlags flags,
@@ -438,7 +331,7 @@ g_unix_volume_mount (GVolume *volume,
gpointer user_data)
{
GUnixVolume *unix_volume = G_UNIX_VOLUME (volume);
- char *argv[] = { "mount", NULL, NULL };
+ const gchar *argv[] = { "mount", NULL, NULL };
if (unix_volume->mount_path != NULL)
argv[1] = unix_volume->mount_path;
@@ -453,7 +346,9 @@ g_unix_volume_mount_finish (GVolume *volume,
GAsyncResult *result,
GError **error)
{
- return TRUE;
+ g_return_val_if_fail (g_task_is_valid (result, volume), FALSE);
+
+ return g_task_propagate_boolean (G_TASK (result), error);
}
static void
@@ -464,7 +359,7 @@ g_unix_volume_eject (GVolume *volume,
gpointer user_data)
{
GUnixVolume *unix_volume = G_UNIX_VOLUME (volume);
- char *argv[] = { "eject", NULL, NULL };
+ const gchar *argv[] = { "eject", NULL, NULL };
argv[1] = unix_volume->device_path;
@@ -476,7 +371,9 @@ g_unix_volume_eject_finish (GVolume *volume,
GAsyncResult *result,
GError **error)
{
- return TRUE;
+ g_return_val_if_fail (g_task_is_valid (result, volume), FALSE);
+
+ return g_task_propagate_boolean (G_TASK (result), error);
}
static gchar *
@@ -518,6 +415,7 @@ g_unix_volume_volume_iface_init (GVolumeIface *iface)
{
iface->get_name = g_unix_volume_get_name;
iface->get_icon = g_unix_volume_get_icon;
+ iface->get_symbolic_icon = g_unix_volume_get_symbolic_icon;
iface->get_uuid = g_unix_volume_get_uuid;
iface->get_drive = g_unix_volume_get_drive;
iface->get_mount = g_unix_volume_get_mount;