X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgunixmount.c;h=2ec8e5cbfd448d4c8b73bf284bc9a8efd610ed3b;hb=cea9de93c8838099661f5b54462f9c4b6410bfc9;hp=8c42246e6ef8b383d72c19778feea9e59412cbc5;hpb=b9c69790a81a8390bda9ae02faeba0e06d3430ca;p=platform%2Fupstream%2Fglib.git

diff --git a/gio/gunixmount.c b/gio/gunixmount.c
index 8c42246..2ec8e5c 100644
--- a/gio/gunixmount.c
+++ b/gio/gunixmount.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 <http://www.gnu.org/licenses/>.
  *
  * Author: Alexander Larsson <alexl@redhat.com>
  *         David Zeuthen <davidz@redhat.com>
@@ -30,6 +28,8 @@
 #include <unistd.h>
 
 #include <glib.h>
+#include "gsubprocess.h"
+#include "gioenums.h"
 #include "gunixvolumemonitor.h"
 #include "gunixmount.h"
 #include "gunixmounts.h"
@@ -45,7 +45,6 @@
 /* for BUFSIZ */
 #include <stdio.h>
 
-#include "gioalias.h"
 
 struct _GUnixMount {
   GObject parent;
@@ -56,6 +55,7 @@ struct _GUnixMount {
 
   char *name;
   GIcon *icon;
+  GIcon *symbolic_icon;
   char *device_path;
   char *mount_path;
 
@@ -85,6 +85,7 @@ g_unix_mount_finalize (GObject *object)
     
   /* TODO: g_warn_if_fail (volume->volume == NULL); */
   g_object_unref (mount->icon);
+  g_object_unref (mount->symbolic_icon);
   g_free (mount->name);
   g_free (mount->device_path);
   g_free (mount->mount_path);
@@ -124,6 +125,7 @@ _g_unix_mount_new (GVolumeMonitor  *volume_monitor,
 
   mount->name = g_unix_mount_guess_name (mount_entry);
   mount->icon = g_unix_mount_guess_icon (mount_entry);
+  mount->symbolic_icon = g_unix_mount_guess_symbolic_icon (mount_entry);
 
   /* need to do this last */
   mount->volume = volume;
@@ -176,6 +178,14 @@ g_unix_mount_get_icon (GMount *mount)
   return g_object_ref (unix_mount->icon);
 }
 
+static GIcon *
+g_unix_mount_get_symbolic_icon (GMount *mount)
+{
+  GUnixMount *unix_mount = G_UNIX_MOUNT (mount);
+
+  return g_object_ref (unix_mount->symbolic_icon);
+}
+
 static char *
 g_unix_mount_get_uuid (GMount *mount)
 {
@@ -232,88 +242,60 @@ g_unix_mount_can_eject (GMount *mount)
   return unix_mount->can_eject;
 }
 
-
-typedef struct {
-  GUnixMount *unix_mount;
-  GAsyncReadyCallback callback;
-  gpointer user_data;
-  GCancellable *cancellable;
-  int error_fd;
-  GIOChannel *error_channel;
-  guint error_channel_source_id;
-  GString *error_string;
-} UnmountEjectOp;
-
-static void 
-eject_unmount_cb (GPid pid, gint status, gpointer user_data)
+static void
+eject_unmount_done (GObject      *source,
+                    GAsyncResult *result,
+                    gpointer      user_data)
 {
-  UnmountEjectOp *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_mount),
-                                                     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_mount),
-                                          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);
-
-  g_source_remove (data->error_channel_source_id);
-  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);
+  g_object_unref (task);
 }
 
 static gboolean
-eject_unmount_read_error (GIOChannel *channel,
-                    GIOCondition condition,
-                    gpointer user_data)
+eject_unmount_do_cb (gpointer user_data)
 {
-  UnmountEjectOp *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");
+  GTask *task = user_data;
+  GError *error = NULL;
+  GSubprocess *subprocess;
+  const gchar **argv;
 
-      g_string_append (data->error_string, error->message);
-      g_error_free (error);
-      return FALSE;
+  argv = g_task_get_task_data (task);
+
+  if (g_task_return_error_if_cancelled (task))
+    {
+      g_object_unref (task);
+      return G_SOURCE_REMOVE;
     }
 
-  return TRUE;
+  subprocess = g_subprocess_newv (argv, G_SUBPROCESS_FLAGS_STDOUT_SILENCE | G_SUBPROCESS_FLAGS_STDERR_PIPE, &error);
+  g_assert_no_error (error);
+
+  g_subprocess_communicate_utf8_async (subprocess, NULL,
+                                       g_task_get_cancellable (task),
+                                       eject_unmount_done, task);
+
+  return G_SOURCE_REMOVE;
 }
 
 static void
@@ -324,61 +306,20 @@ eject_unmount_do (GMount              *mount,
                   char               **argv)
 {
   GUnixMount *unix_mount = G_UNIX_MOUNT (mount);
-  UnmountEjectOp *data;
-  GPid child_pid;
-  GError *error;
-  
-  data = g_new0 (UnmountEjectOp, 1);
-  data->unix_mount = unix_mount;
-  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;
-
-  data->error_channel_source_id = g_io_add_watch (data->error_channel, G_IO_IN, eject_unmount_read_error, data);
-  g_child_watch_add (child_pid, eject_unmount_cb, data);
-
-handle_error:
-  if (error != NULL) {
-    GSimpleAsyncResult *simple;
-    simple = g_simple_async_result_new_from_error (G_OBJECT (data->unix_mount),
-                                                   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);
-
-    if (data->error_channel != NULL)
-      g_io_channel_unref (data->error_channel);
-
-    g_error_free (error);
-    g_free (data);
-  }
+  GTask *task;
+  GSource *timeout;
+
+  task = g_task_new (mount, cancellable, callback, user_data);
+  g_task_set_task_data (task, g_strdupv (argv), (GDestroyNotify) g_strfreev);
+
+  if (unix_mount->volume_monitor != NULL)
+    g_signal_emit_by_name (unix_mount->volume_monitor, "mount-pre-unmount", mount);
+
+  g_signal_emit_by_name (mount, "pre-unmount", 0);
+
+  timeout = g_timeout_source_new (500);
+  g_task_attach_source (task, timeout, (GSourceFunc) eject_unmount_do_cb);
+  g_source_unref (timeout);
 }
 
 static void
@@ -404,7 +345,7 @@ g_unix_mount_unmount_finish (GMount       *mount,
                              GAsyncResult  *result,
                              GError       **error)
 {
-  return TRUE;
+  return g_task_propagate_boolean (G_TASK (result), error);
 }
 
 static void
@@ -430,7 +371,7 @@ g_unix_mount_eject_finish (GMount       *mount,
                            GAsyncResult  *result,
                            GError       **error)
 {
-  return TRUE;
+  return g_task_propagate_boolean (G_TASK (result), error);
 }
 
 static void
@@ -439,6 +380,7 @@ g_unix_mount_mount_iface_init (GMountIface *iface)
   iface->get_root = g_unix_mount_get_root;
   iface->get_name = g_unix_mount_get_name;
   iface->get_icon = g_unix_mount_get_icon;
+  iface->get_symbolic_icon = g_unix_mount_get_symbolic_icon;
   iface->get_uuid = g_unix_mount_get_uuid;
   iface->get_drive = g_unix_mount_get_drive;
   iface->get_volume = g_unix_mount_get_volume;