[gnome-settings-daemon/mount-plugin: 9/13] Don't duplicate the mount logic

[Ross Burton <rburton src gnome org>]

commit f58cc9f2b62288abde60eb7c62467e1feef6ce8f
Author: Ross Burton <ross linux intel com>
Date:   Fri Aug 21 16:40:34 2009 +0100

    Don't duplicate the mount logic

 plugins/mount/gsd-mount-manager.c |   21 +++++----------------
 1 files changed, 5 insertions(+), 16 deletions(-)
---
diff --git a/plugins/mount/gsd-mount-manager.c b/plugins/mount/gsd-mount-manager.c
index eb441a6..1b0a83e 100644
--- a/plugins/mount/gsd-mount-manager.c
+++ b/plugins/mount/gsd-mount-manager.c
@@ -143,24 +143,13 @@ mount_existing_volumes (GsdMountManager *manager)
                 GMount *mount;
 
                 mount = g_volume_get_mount (volume);
-                if (mount == NULL &&
-                    g_volume_can_mount (volume) &&
-                    g_volume_should_automount (volume)) {
-                        GMountOperation *mount_op;
-                        char *name;
-
-                        name = g_volume_get_name (volume);
-                        g_debug ("Mounting '%s'", name);
-                        g_free (name);
-
-                        mount_op = gtk_mount_operation_new (NULL);
-                        g_volume_mount (volume, G_MOUNT_MOUNT_NONE,
-                                        mount_op, NULL,
-                                        volume_mounted_cb, manager);
-                }
 
-                if (mount)
+                if (mount == NULL) {
+                        volume_added_cb (manager->priv->monitor, volume, manager);
+                } else {
                         g_object_unref (mount);
+                }
+
                 g_object_unref (volume);
                 l = g_list_delete_link (l, l);
         }