Ubuntu One Client

Merge lp:~dobey/ubuntuone-client/list-public-files into lp:ubuntuone-client

  1. list-public-files
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 482
Merged at revision: not available
Proposed branch: lp:~dobey/ubuntuone-client/list-public-files
Merge into: lp:ubuntuone-client
Diff against target: 40 lines (+9/-0)
1 file modified
nautilus/ubuntuone-nautilus.c (+9/-0)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/list-public-files
Reviewer Review Type Date Requested Status
Martin Albisetti (community) Approve
John Lenton (community) Approve
Review via email: mp+23136@code.launchpad.net

Commit message

Call the new get_public_files dbus method at initial status change

To post a comment you must log in.
Revision history for this message
John Lenton (chipaca) wrote :

The error I got in syncdaemon when testing this is hilarious.
Oh, it worked! The client side did. The server side isn't deployed yet.

We probably need to not render the pretty error page for urls under /api/ ...

2010-04-10 23:33:16,088 - ubuntuone.SyncDaemon.EQ - DEBUG - push_event: AQ_PUBLIC_FILES_LIST_ERROR, args:(), kw:{'error': '<!DOCTYPE HTML>\n<html lang="en" id="ubuntuone">\n\n<head>\n<meta http-equiv="Content-Type" content="text/html; charset=utf-8">\n<meta name="viewport" content="width=960, initial-scale=0.55, minimum-scale=0.65">\n<title>Ubuntu One : Page Not Found (404)</title>\n<link rel="stylesheet" href="https://media.one.ubuntu.com/media/2566/css/reset.css" type="text/css"

et cetera.

review: Approve
Revision history for this message
Martin Albisetti (beuno) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'nautilus/ubuntuone-nautilus.c'
--- nautilus/ubuntuone-nautilus.c 2010-03-28 23:10:12 +0000
+++ nautilus/ubuntuone-nautilus.c 2010-04-09 19:15:23 +0000
@@ -74,6 +74,7 @@
74 /* Avoid calling get_rootdir and get_folders lots of times */74 /* Avoid calling get_rootdir and get_folders lots of times */
75 gboolean gotroot;75 gboolean gotroot;
76 gboolean gotudfs;76 gboolean gotudfs;
77 gboolean gotpubs;
7778
78 /* Lists of ul/dl/shares for setting emblems */79 /* Lists of ul/dl/shares for setting emblems */
79 GHashTable * uploads;80 GHashTable * uploads;
@@ -858,6 +859,7 @@
858 uon->managed = g_build_filename (g_get_home_dir (), "Ubuntu One", NULL);859 uon->managed = g_build_filename (g_get_home_dir (), "Ubuntu One", NULL);
859 uon->gotroot = FALSE;860 uon->gotroot = FALSE;
860 uon->gotudfs = FALSE;861 uon->gotudfs = FALSE;
862 uon->gotpubs = FALSE;
861863
862#if 0864#if 0
863 /*865 /*
@@ -1272,6 +1274,12 @@
1272 dbus_g_proxy_begin_call (uon->u1_folders, "get_folders",1274 dbus_g_proxy_begin_call (uon->u1_folders, "get_folders",
1273 ubuntuone_nautilus_got_udfs, uon,1275 ubuntuone_nautilus_got_udfs, uon,
1274 NULL, G_TYPE_INVALID);1276 NULL, G_TYPE_INVALID);
1277
1278 /* Get the list of public files if we haven't already */
1279 if (!uon->gotpubs)
1280 dbus_g_proxy_begin_call (uon->u1_public, "get_public_files",
1281 ubuntuone_nautilus_end_dbus_call, uon,
1282 NULL, G_TYPE_INVALID);
1275}1283}
12761284
1277static void ubuntuone_nautilus_upload_started (DBusGProxy * proxy,1285static void ubuntuone_nautilus_upload_started (DBusGProxy * proxy,
@@ -1378,6 +1386,7 @@
1378 g_hash_table_replace (uon->public, g_strdup (path), g_strdup (url));1386 g_hash_table_replace (uon->public, g_strdup (path), g_strdup (url));
13791387
1380 ubuntuone_nautilus_reset_emblem (uon, path);1388 ubuntuone_nautilus_reset_emblem (uon, path);
1389 uon->gotpubs = TRUE;
1381}1390}
13821391
1383static void ubuntuone_nautilus_publish_error (DBusGProxy * proxy,1392static void ubuntuone_nautilus_publish_error (DBusGProxy * proxy,

Subscribers

People subscribed via source and target branches