Ubuntu One Client

Merge lp:~rodrigo-moya/ubuntuone-client/fix-621433 into lp:ubuntuone-client

  1. fix-621433
  2. Merge into trunk
Proposed by Rodrigo Moya
Status: Merged
Approved by: John Lenton
Approved revision: 667
Merged at revision: 666
Proposed branch: lp:~rodrigo-moya/ubuntuone-client/fix-621433
Merge into: lp:ubuntuone-client
Diff against target: 32 lines (+10/-1)
2 files modified
libsyncdaemon/syncdaemon-daemon.c (+9/-0)
nautilus/ubuntuone-nautilus.c (+1/-1)
To merge this branch: bzr merge lp:~rodrigo-moya/ubuntuone-client/fix-621433
Reviewer Review Type Date Requested Status
John Lenton (community) Approve
Roman Yepishev (community) fieldtest Approve
Review via email: mp+34177@code.launchpad.net

Commit message

- Get the subinterfaces ASAP so that the signals from them are setup
- Fix crash in ubuntuone_nautilus_got_public_files

Description of the change

- Get the subinterfaces ASAP so that the signals from them are setup
- Fix crash in ubuntuone_nautilus_got_public_files

To post a comment you must log in.
Revision history for this message
Roman Yepishev (rye) wrote :

To force file download one may put an empty file to Ubuntu One directory, this will trigger state change and public file info download - this is a separate issue.

review: Approve (fieldtest)
Revision history for this message
John Lenton (chipaca) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libsyncdaemon/syncdaemon-daemon.c'
2--- libsyncdaemon/syncdaemon-daemon.c 2010-08-24 22:27:04 +0000
3+++ libsyncdaemon/syncdaemon-daemon.c 2010-08-31 10:16:08 +0000
4@@ -327,6 +327,15 @@
5 dbus_g_proxy_connect_signal (DBUS_G_PROXY (proxy), "QuotaExceeded",
6 G_CALLBACK (quota_exceeded_cb),
7 daemon, NULL);
8+
9+ /* Now get all the interfaces so that we get the signals from them */
10+ syncdaemon_daemon_get_config_interface (daemon);
11+ syncdaemon_daemon_get_events_interface (daemon);
12+ syncdaemon_daemon_get_filesystem_interface (daemon);
13+ syncdaemon_daemon_get_folders_interface (daemon);
14+ syncdaemon_daemon_get_publicfiles_interface (daemon);
15+ syncdaemon_daemon_get_shares_interface (daemon);
16+ syncdaemon_daemon_get_status_interface (daemon);
17 }
18
19 }
20
21=== modified file 'nautilus/ubuntuone-nautilus.c'
22--- nautilus/ubuntuone-nautilus.c 2010-08-26 13:13:19 +0000
23+++ nautilus/ubuntuone-nautilus.c 2010-08-31 10:16:08 +0000
24@@ -1160,7 +1160,7 @@
25
26 g_hash_table_remove_all (uon->public);
27 for (l = files; l != NULL; l = l->next) {
28- SyncdaemonFileInfo *finfo;
29+ SyncdaemonFileInfo *finfo = SYNCDAEMON_FILE_INFO (l->data);
30
31 g_hash_table_insert (uon->public,
32 g_strdup (syncdaemon_file_info_get_path (finfo)),

Subscribers

People subscribed via source and target branches