Fix bug when two accounts of yandex disk displayed as one

i9 changed/i9/gnome-online-accounts-3.40.0-2.el9.inferit.4
Alexey Berezhok 1 year ago
parent 2ed1c1dafa
commit 9991feed0f

@ -0,0 +1,49 @@
From 5bbb3baca5f77b0f2148cb3b3efdeda61de4e121 Mon Sep 17 00:00:00 2001
From: Alexey Berezhok <alexey.berezhok@softline.com>
Date: Mon, 18 Sep 2023 21:39:04 +0300
Subject: [PATCH] Fix bug when two accounts of yandex disk displayed as one
---
src/goabackend/goayandexprovider.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/goabackend/goayandexprovider.c b/src/goabackend/goayandexprovider.c
index acaa599..fc78421 100644
--- a/src/goabackend/goayandexprovider.c
+++ b/src/goabackend/goayandexprovider.c
@@ -99,7 +99,7 @@ get_scope (GoaOAuth2Provider *oauth2_provider)
static guint
get_credentials_generation (GoaProvider *provider)
{
- return 34;
+ return 36;
}
static const gchar *
@@ -225,6 +225,7 @@ build_object (GoaProvider *provider,
gboolean calendar_enabled;
gboolean contacts_enabled;
const gchar *email_address;
+ gchar *u_name, *u_name_pos;
/* Chain up */
if (!GOA_PROVIDER_CLASS (goa_yandex_provider_parent_class)->build_object (provider,
@@ -284,8 +285,14 @@ build_object (GoaProvider *provider,
/* Files */
files_enabled = g_key_file_get_boolean (key_file, group, "FilesEnabled", NULL);
- uri_drive = g_strconcat ("davs://webdav.yandex.ru/", NULL);
+ u_name = g_strdup(email_address);
+ u_name_pos = g_utf8_strchr(u_name, -1, '@');
+ if (u_name_pos){
+ *u_name_pos = '\0';
+ }
+ uri_drive = g_strconcat ("davs://", u_name, "@webdav.yandex.ru/", NULL);
goa_object_skeleton_attach_files (object, uri_drive, files_enabled, FALSE);
+ g_free (u_name);
g_free (uri_drive);
--
2.39.1

@ -6,7 +6,7 @@
Name: gnome-online-accounts Name: gnome-online-accounts
Version: 3.40.0 Version: 3.40.0
Release: 2%{?dist}.inferit.3 Release: 2%{?dist}.inferit.4
Summary: Single sign-on framework for GNOME Summary: Single sign-on framework for GNOME
License: LGPLv2+ License: LGPLv2+
@ -22,6 +22,7 @@ Patch1: 0001-google-Remove-Photos-support.patch
Patch2: 0001-Added-yandex-provider-prebuild-version.patch Patch2: 0001-Added-yandex-provider-prebuild-version.patch
Patch3: 0001-Added-yandex-disk-webdav-support.patch Patch3: 0001-Added-yandex-disk-webdav-support.patch
Patch4: 0001-Fix-bug-when-two-accounts-of-yandex-disk-displayed-a.patch
BuildRequires: pkgconfig(gcr-3) BuildRequires: pkgconfig(gcr-3)
BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
@ -66,6 +67,7 @@ developing applications that use %{name}.
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
%build %build
%configure \ %configure \
@ -130,6 +132,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
%{_datadir}/vala/ %{_datadir}/vala/
%changelog %changelog
* Mon Sep 18 2023 Alexey Berezhok <alexey.berezhok@msvsphere-os.ru> - 3.40.0-2.inferit.4
- Fix bug when two accounts of yandex disk displayed as one
* Mon Aug 21 2023 Alexey Berezhok <alexey.berezhok@msvsphere.ru> - 3.40.0-2.inferit.3 * Mon Aug 21 2023 Alexey Berezhok <alexey.berezhok@msvsphere.ru> - 3.40.0-2.inferit.3
- Added support of yandex webdav - Added support of yandex webdav

Loading…
Cancel
Save