← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/ubuntuone-client/oneiric

« back to all changes in this revision

Viewing changes to libsyncdaemon/syncdaemon-daemon.c

  • Committer: Bazaar Package Importer
  • Author(s): Rodney Dawes
  • Date: 2011-02-23 18:34:09 UTC
  • mfrom: (1.1.45 upstream)
  • Revision ID: james.westby@ubuntu.com-20110223183409-535o7yo165wbjmca
Tags: 1.5.5-0ubuntu1
https://launchpad.net/bugs/712528
https://launchpad.net/bugs/714976
https://launchpad.net/bugs/702116
https://launchpad.net/bugs/715887
* New upstream release.
  - Subscribing to a RO share will not download content (LP: #712528)
  - Can't synchronize "~/Ubuntu One Music" (LP: #714976)
  - Syncdaemon needs to show progress in Unity launcher (LP: #702116)
  - Notifications say "your cloud" (LP: #715887)
  - No longer requires python-libproxy
  - Recommend unity and indicator libs by default

Show diffs side-by-side

added added

removed removed

Lines of Context:
libsyncdaemon/syncdaemon-daemon.c
920
920
syncdaemon_daemon_is_folder_enabled (SyncdaemonDaemon *daemon, const gchar *path, gboolean *is_root)
921
921
{
922
922
        const gchar *root;
 
923
        gchar *root_with_slash;
923
924
        gboolean managed = FALSE;
924
925
        gchar *dirpath;
925
926
        SyncdaemonInterface *interface;
934
935
        if (g_strcmp0 (path, root) == 0) {
935
936
                *is_root = TRUE;
936
937
                return TRUE;
937
 
        } else if (g_str_has_prefix (path, root))
938
 
                return TRUE;
 
938
        } else {
 
939
                root_with_slash = g_build_filename (root,  G_DIR_SEPARATOR_S, NULL);
939
940
 
 
941
                if (g_str_has_prefix (path, root_with_slash)) {
 
942
                        g_free(root_with_slash); 
 
943
                        return TRUE;
 
944
                }
 
945
                g_free(root_with_slash); 
 
946
        }
940
947
        /* Now check the 'Shared With Me' directory */
941
948
        dirpath = g_build_filename (root, "Shared With Me", NULL);
942
949
        if (g_strcmp0 (path, dirpath) == 0) {