Commit ba15eca8 authored by Michael Terry's avatar Michael Terry

Drop Ubuntu One backend code

It's been five years. We don't need the backend just to warn users
that it has been shut down anymore.
parent 135f4c83
......@@ -194,8 +194,6 @@ public class ConfigLocation : ConfigWidget
new ConfigLocationGCS(label_sizes, all_settings[GCS_ROOT])) |
insert_cloud("google", _("Google Drive"), true, "deja-dup-google-drive",
new ConfigLocationGoogle(label_sizes, all_settings[GOOGLE_ROOT])) |
insert_cloud("u1", _("Ubuntu One"), false, "deja-dup-cloud",
new ConfigLocationU1(label_sizes)) |
insert_cloud("rackspace", _("Rackspace Cloud Files"), show_deprecated, "deja-dup-cloud",
new ConfigLocationRackspace(label_sizes, all_settings[RACKSPACE_ROOT])) |
insert_cloud("openstack", _("OpenStack Swift"), show_deprecated, "deja-dup-cloud",
......@@ -415,8 +413,7 @@ public class ConfigLocation : ConfigWidget
backend == "google" ||
backend == "openstack" ||
backend == "rackspace" ||
backend == "s3" ||
backend == "u1") {
backend == "s3") {
group = Group.CLOUD;
id = backend;
}
......
/* -*- Mode: Vala; indent-tabs-mode: nil; tab-width: 2 -*- */
/*
This file is part of Déjà Dup.
For copyright information, see AUTHORS.
Déjà Dup is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Déjà Dup is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Déjà Dup. If not, see <http://www.gnu.org/licenses/>.
*/
using GLib;
namespace DejaDup {
public class ConfigLocationU1 : ConfigLocationTable
{
public ConfigLocationU1(Gtk.SizeGroup sg) {
Object(label_sizes: sg);
}
construct {
var label = new Gtk.Label("");
label.set_markup("<b><big>%s</big></b>".printf(_("Ubuntu One has shut down. Please choose another storage location.")));
label.margin_top = 20;
add_wide_widget(label);
}
}
}
......@@ -36,7 +36,6 @@ libwidgets = shared_library('widgets',
'ConfigLocationRackspace.vala',
'ConfigLocationS3.vala',
'ConfigLocationTable.vala',
'ConfigLocationU1.vala',
'ConfigLocationVolume.vala',
'ConfigPeriod.vala',
'ConfigWidget.vala',
......
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2019-03-28 22:31-0400\n"
"POT-Creation-Date: 2019-04-04 20:07-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -70,8 +70,6 @@ public abstract class Backend : Object
return new BackendGCS(settings);
else if (backend_name == "google")
return new BackendGoogle(settings);
else if (backend_name == "u1")
return new BackendU1();
else if (backend_name == "rackspace")
return new BackendRackspace(settings);
else if (backend_name == "openstack")
......@@ -94,7 +92,6 @@ public abstract class Backend : Object
backend != "s3" &&
backend != "gcs" &&
backend != "google" &&
backend != "u1" &&
backend != "rackspace" &&
backend != "openstack" &&
backend != "drive" &&
......
/* -*- Mode: Vala; indent-tabs-mode: nil; tab-width: 2 -*- */
/*
This file is part of Déjà Dup.
For copyright information, see AUTHORS.
Déjà Dup is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Déjà Dup is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Déjà Dup. If not, see <http://www.gnu.org/licenses/>.
*/
using GLib;
namespace DejaDup {
public class BackendU1 : Backend
{
public override bool is_native() {
return false;
}
public override Icon? get_icon() {
return new ThemedIcon.from_names({"ubuntuone", "ubuntuone-installer", "deja-dup-cloud"});
}
public override string get_location(ref bool as_root)
{
return "";
}
public override string get_location_pretty()
{
return _("Ubuntu One");
}
public override async void get_envp() throws Error
{
throw new BackupError.BAD_CONFIG(_("Ubuntu One has shut down. Please choose another storage location."));
}
}
} // end namespace
......@@ -29,7 +29,6 @@ libdeja = shared_library('deja',
'BackendRackspace.vala',
'BackendRemote.vala',
'BackendS3.vala',
'BackendU1.vala',
'CommonUtils.vala',
'DirHandling.vala',
'FilteredSettings.vala',
......
......@@ -67,7 +67,6 @@ tests = [
'symlink-trickshot',
'threshold-full',
'threshold-inc',
'u1',
'verify',
'write-error'
]
......
[Operation]
Settings=backend='u1';
Type=backup
Success=false
Error=Ubuntu One has shut down. Please choose another storage location.
[Duplicity]
......@@ -34,10 +34,10 @@ deja-dup/widgets/ConfigLocation.vala
deja-dup/widgets/ConfigLocationCustom.vala
deja-dup/widgets/ConfigLocationFile.vala
deja-dup/widgets/ConfigLocationGCS.vala
deja-dup/widgets/ConfigLocationGoogle.vala
deja-dup/widgets/ConfigLocationRackspace.vala
deja-dup/widgets/ConfigLocationS3.vala
deja-dup/widgets/ConfigLocationTable.vala
deja-dup/widgets/ConfigLocationU1.vala
deja-dup/widgets/ConfigLocationVolume.vala
deja-dup/widgets/ConfigPeriod.vala
deja-dup/widgets/ConfigWidget.vala
......@@ -51,7 +51,6 @@ libdeja/BackendLocal.vala
libdeja/BackendRackspace.vala
libdeja/BackendRemote.vala
libdeja/BackendS3.vala
libdeja/BackendU1.vala
libdeja/Backend.vala
libdeja/CommonUtils.vala
libdeja/FilteredSettings.vala
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: deja-dup\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-03-28 22:31-0400\n"
"POT-Creation-Date: 2019-04-04 20:07-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -658,7 +658,7 @@ msgstr ""
#. a second time, we'll show the unknown error message.
#: deja-dup/AssistantOperation.vala:696
#: libdeja/tools/duplicity/DuplicityJob.vala:753
#: libdeja/tools/duplicity/DuplicityJob.vala:1141
#: libdeja/tools/duplicity/DuplicityJob.vala:1160
msgid "Failed with an unknown error."
msgstr ""
......@@ -670,11 +670,11 @@ msgstr ""
msgid "Encryption Password Needed"
msgstr ""
#: deja-dup/AssistantOperation.vala:979
#: deja-dup/AssistantOperation.vala:978
msgid "Backup encryption password"
msgstr ""
#: deja-dup/AssistantOperation.vala:1050
#: deja-dup/AssistantOperation.vala:1056
msgctxt "verb"
msgid "_Install"
msgstr ""
......@@ -1195,15 +1195,11 @@ msgstr ""
msgid "Google Drive"
msgstr ""
#: deja-dup/widgets/ConfigLocation.vala:197 libdeja/BackendU1.vala:41
msgid "Ubuntu One"
msgstr ""
#: deja-dup/widgets/ConfigLocation.vala:199 libdeja/BackendRackspace.vala:68
#: deja-dup/widgets/ConfigLocation.vala:197 libdeja/BackendRackspace.vala:68
msgid "Rackspace Cloud Files"
msgstr ""
#: deja-dup/widgets/ConfigLocation.vala:201
#: deja-dup/widgets/ConfigLocation.vala:199
msgid "OpenStack Swift"
msgstr ""
......@@ -1214,6 +1210,7 @@ msgstr ""
#: deja-dup/widgets/ConfigLocationCustom.vala:44
#: deja-dup/widgets/ConfigLocationFile.vala:44
#: deja-dup/widgets/ConfigLocationGCS.vala:38
#: deja-dup/widgets/ConfigLocationGoogle.vala:31
#: deja-dup/widgets/ConfigLocationS3.vala:33
#: deja-dup/widgets/ConfigLocationVolume.vala:33
msgid "_Folder"
......@@ -1250,10 +1247,6 @@ msgstr ""
msgid "S3 Access Key I_D"
msgstr ""
#: deja-dup/widgets/ConfigLocationU1.vala:32 libdeja/BackendU1.vala:46
msgid "Ubuntu One has shut down. Please choose another storage location."
msgstr ""
#: deja-dup/widgets/ConfigPeriod.vala:36
msgid "Day"
msgstr ""
......@@ -1498,28 +1491,24 @@ msgid ""
"write to them."
msgstr ""
#. notify upper layers, if they want to do anything
#: libdeja/tools/duplicity/DuplicityJob.vala:964
msgid "Bad encryption password."
msgstr ""
#. make text a little nicer than duplicity gives
#. duplicity gives something like "home/blah/blah not found in archive,
#. no files restored".
#: libdeja/tools/duplicity/DuplicityJob.vala:980
#: libdeja/tools/duplicity/DuplicityJob.vala:1009
#, c-format
msgid "Could not restore ‘%s’: File not found in backup"
msgstr ""
#. notify upper layers, if they want to do anything
#. Duplicity tried to ask the user what the encryption password is.
#. notify upper layers, if they want to do anything
#: libdeja/tools/duplicity/DuplicityJob.vala:994
#: libdeja/tools/duplicity/DuplicityJob.vala:1093
#: libdeja/tools/duplicity/DuplicityJob.vala:1097
msgid "Bad encryption password."
msgstr ""
#: libdeja/tools/duplicity/DuplicityJob.vala:1000
#: libdeja/tools/duplicity/DuplicityJob.vala:1020
msgid "Computer name changed"
msgstr ""
#: libdeja/tools/duplicity/DuplicityJob.vala:1000
#: libdeja/tools/duplicity/DuplicityJob.vala:1020
#, c-format
msgid ""
"The existing backup is of a computer named %s, but the current computer’s "
......@@ -1527,69 +1516,69 @@ msgid ""
"location."
msgstr ""
#: libdeja/tools/duplicity/DuplicityJob.vala:1035
#: libdeja/tools/duplicity/DuplicityJob.vala:1055
#, c-format
msgid "Permission denied when trying to create ‘%s’."
msgstr ""
#. assume error is on backend side
#: libdeja/tools/duplicity/DuplicityJob.vala:1039
#: libdeja/tools/duplicity/DuplicityJob.vala:1043
#: libdeja/tools/duplicity/DuplicityJob.vala:1059
#: libdeja/tools/duplicity/DuplicityJob.vala:1063
#, c-format
msgid "Permission denied when trying to read ‘%s’."
msgstr ""
#: libdeja/tools/duplicity/DuplicityJob.vala:1047
#: libdeja/tools/duplicity/DuplicityJob.vala:1067
#, c-format
msgid "Permission denied when trying to delete ‘%s’."
msgstr ""
#: libdeja/tools/duplicity/DuplicityJob.vala:1054
#: libdeja/tools/duplicity/DuplicityJob.vala:1074
#, c-format
msgid "Backup location ‘%s’ does not exist."
msgstr ""
#: libdeja/tools/duplicity/DuplicityJob.vala:1060
#: libdeja/tools/duplicity/DuplicityJob.vala:1112
#: libdeja/tools/duplicity/DuplicityJob.vala:1080
#: libdeja/tools/duplicity/DuplicityJob.vala:1131
msgid "No space left."
msgstr ""
#: libdeja/tools/duplicity/DuplicityJob.vala:1074
#: libdeja/tools/duplicity/DuplicityJob.vala:1094
msgid "Invalid ID."
msgstr ""
#: libdeja/tools/duplicity/DuplicityJob.vala:1076
#: libdeja/tools/duplicity/DuplicityJob.vala:1096
msgid "Invalid secret key."
msgstr ""
#: libdeja/tools/duplicity/DuplicityJob.vala:1078
#: libdeja/tools/duplicity/DuplicityJob.vala:1098
msgid "Your Amazon Web Services account is not signed up for the S3 service."
msgstr ""
#: libdeja/tools/duplicity/DuplicityJob.vala:1087
#: libdeja/tools/duplicity/DuplicityJob.vala:1107
msgid "S3 bucket name is not available."
msgstr ""
#: libdeja/tools/duplicity/DuplicityJob.vala:1101
#: libdeja/tools/duplicity/DuplicityJob.vala:1120
#, c-format
msgid "Error reading file ‘%s’."
msgstr ""
#: libdeja/tools/duplicity/DuplicityJob.vala:1103
#: libdeja/tools/duplicity/DuplicityJob.vala:1122
#, c-format
msgid "Error writing file ‘%s’."
msgstr ""
#: libdeja/tools/duplicity/DuplicityJob.vala:1114
#: libdeja/tools/duplicity/DuplicityJob.vala:1133
#, c-format
msgid "No space left in ‘%s’."
msgstr ""
#: libdeja/tools/duplicity/DuplicityJob.vala:1122
#: libdeja/tools/duplicity/DuplicityJob.vala:1141
msgid "No backup files found"
msgstr ""
#: libdeja/tools/duplicity/DuplicityJob.vala:1172
#: libdeja/tools/duplicity/DuplicityJob.vala:1191
msgid "Uploading…"
msgstr ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment