~ubuntu-branches/ubuntu/oneiric/cairo-dock-plug-ins/oneiric-updates

From: Matthieu Baerts <matttbe@gmail.com>

Subject: dnd2share: UbuntuOne backend: wait for the end of the sync before publishing the link (to avoid a crash of u1sdtool)

Origin: upstream, http://bazaar.launchpad.net/~cairo-dock-team/cairo-dock-plug-ins/2.3.x/revision/1939

Bug: http://www.glx-dock.org/tt_task.php?p=2&t=187

Forwarded: yes

 

Index: cairo-dock-plug-ins/CMakeLists.txt

===================================================================

--- cairo-dock-plug-ins.orig/CMakeLists.txt     2011-05-21 01:52:06.786633847 +0200

+++ cairo-dock-plug-ins/CMakeLists.txt  2011-05-21 01:52:49.006695762 +0200

@@ -299,7 +299,7 @@

 

 ############# DND2SHARE #################

 set (GETTEXT_DND2SHARE ${GETTEXT_PLUGINS})

-set (VERSION_DND2SHARE "1.0.5")

+set (VERSION_DND2SHARE "1.0.6")

 set (PACKAGE_DND2SHARE "cd-dnd2share")

 set (dnd2sharedatadir "${pluginsdatadir}/dnd2share")

 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/dnd2share/data/dnd2share.conf.in ${CMAKE_CURRENT_BINARY_DIR}/dnd2share/data/dnd2share.conf)

Index: cairo-dock-plug-ins/dnd2share/src/applet-backend-ubuntuone.c

===================================================================

--- cairo-dock-plug-ins.orig/dnd2share/src/applet-backend-ubuntuone.c   2011-05-21 01:52:06.806633864 +0200

+++ cairo-dock-plug-ins/dnd2share/src/applet-backend-ubuntuone.c        2011-05-21 01:52:49.006695762 +0200

@@ -54,8 +54,10 @@

                return;

        }

        

-       // On recupere l'URL (dispo tout de suite, sinon il faudra boucler en testant 'dropbox status' jusqu'a avoir 'Idle').

-       cCommand= g_strdup_printf ("u1sdtool --publish-file \"%s\"", cLocalFilePath);

+       // We wait for the end of the sync

+       cairo_dock_launch_command_sync ("u1sdtool --wait");

+       // We publish the file and we read the output message

+       cCommand = g_strdup_printf ("u1sdtool --publish-file \"%s\"", cLocalFilePath);

        cd_debug ("commande u2 : %s", cCommand);

        gchar *cResult = cairo_dock_launch_command_sync (cCommand);

        g_free (cCommand);