[bijiben] ownCloud startup: do not mess up too much volume



commit 051def1f9e41390070b2bbfcb6dfbba9a026512b
Author: Pierre-Yves Luyten <py luyten fr>
Date:   Sun Jun 16 23:53:14 2013 +0200

    ownCloud startup: do not mess up too much volume
    
    startup is still wrong, but at least it does not loop
    without any result

 src/libbiji/provider/biji-own-cloud-provider.c |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/src/libbiji/provider/biji-own-cloud-provider.c b/src/libbiji/provider/biji-own-cloud-provider.c
index 44004a0..4145a3d 100644
--- a/src/libbiji/provider/biji-own-cloud-provider.c
+++ b/src/libbiji/provider/biji-own-cloud-provider.c
@@ -521,27 +521,22 @@ on_owncloud_volume_mounted (GObject *source_object,
   BijiOwnCloudProvider *self;
   GError *error;
 
+  error = NULL;
   self = BIJI_OWN_CLOUD_PROVIDER (user_data);
 
   /* bug #701021 makes this fail */
+  g_volume_mount_finish (self->priv->volume, res, &error);
 
-  if (!g_volume_mount_finish (self->priv->volume, res, &error))
+  if (error != NULL)
   {
-    if (error != NULL)
-    {
-      g_warning ("%s", error->message);
-      g_error_free (error);
-    }
-    return;
+    g_warning ("%s", error->message);
+    g_error_free (error);
   }
 
   self->priv->mount = g_volume_get_mount (self->priv->volume);
 
   if (!G_IS_MOUNT (self->priv->mount))
-  {
     g_warning ("finish but not really finish...");
-    get_mount (self);
-  }
 
   else
     handle_mount (self);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]