Fixed autostart when using libcloudproviders

Fixed recently changed files in libcloudproviders support
f40
Tim Klocke 5 years ago
parent 1afa400650
commit efdeb201e6

@ -0,0 +1,22 @@
From 102b5c61091921b9554d43cc23b41dd29e8b129f Mon Sep 17 00:00:00 2001
From: Tim Klocke <taaem@mailbox.org>
Date: Fri, 10 Apr 2020 12:47:30 +0200
Subject: [PATCH] CloudProvider: Use absolute path in dbus file
---
.../libcloudproviders/org.freedesktop.CloudProviders.service.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/shell_integration/libcloudproviders/org.freedesktop.CloudProviders.service.in b/shell_integration/libcloudproviders/org.freedesktop.CloudProviders.service.in
index bd9f91d46..6585d5401 100644
--- a/shell_integration/libcloudproviders/org.freedesktop.CloudProviders.service.in
+++ b/shell_integration/libcloudproviders/org.freedesktop.CloudProviders.service.in
@@ -1,4 +1,4 @@
[D-BUS Service]
Name=@LIBCLOUDPROVIDERS_DBUS_BUS_NAME@
-Exec=@APPLICATION_EXECUTABLE@ --background
+Exec=@CMAKE_INSTALL_PREFIX@/bin/@APPLICATION_EXECUTABLE@ --background
--
2.26.0

@ -0,0 +1,35 @@
From 18615d02971d6555d3720214fb6875f5bf582730 Mon Sep 17 00:00:00 2001
From: Tim Klocke <taaem@mailbox.org>
Date: Fri, 10 Apr 2020 19:03:15 +0200
Subject: [PATCH] CloudProviders: Don't clear the _recentMenu pointer
The _recentMenu pointer ref should not be freed, when building the
menu.
This fixes #1920 and #1818
---
src/gui/cloudproviders/cloudproviderwrapper.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gui/cloudproviders/cloudproviderwrapper.cpp b/src/gui/cloudproviders/cloudproviderwrapper.cpp
index f4e2a7606..421ae625a 100644
--- a/src/gui/cloudproviders/cloudproviderwrapper.cpp
+++ b/src/gui/cloudproviders/cloudproviderwrapper.cpp
@@ -69,6 +69,7 @@ CloudProviderWrapper::~CloudProviderWrapper()
g_object_unref(_cloudProviderAccount);
g_object_unref(_mainMenu);
g_object_unref(actionGroup);
+ g_object_unref(_recentMenu);
}
CloudProvidersAccountExporter* CloudProviderWrapper::accountExporter()
@@ -258,7 +259,6 @@ GMenuModel* CloudProviderWrapper::getMenuModel() {
g_menu_append_section(_mainMenu, nullptr, G_MENU_MODEL(section));
g_clear_object (&section);
- g_clear_object (&_recentMenu);
return G_MENU_MODEL(_mainMenu);
}
--
2.26.0

@ -2,7 +2,7 @@
Name: nextcloud-client
Version: 2.6.4
Release: 2%{?dist}
Release: 3%{?dist}
Summary: The Nextcloud Client
# -libs are LGPLv2+, rest GPLv2
@ -18,6 +18,8 @@ Source1: nextcloud.appdata.xml
# These fix are needed because the system wide QtSingleApplication is slightly
# different from the bundled one.
#Patch0: %%{name}-%%{version}-syslibs.patch
Patch0: 0001-CloudProviders-Don-t-clear-the-_recentMenu-pointer.patch
Patch1: 0001-CloudProvider-Use-absolute-path-in-dbus-file.patch
BuildRequires: check
BuildRequires: cmake
@ -136,6 +138,8 @@ The nextcloud desktop client dolphin extension.
%prep
%setup -q -n desktop-%{version}
#rm -rf src/3rdparty/qtlockedfile src/3rdparty/qtsingleapplication
%patch0 -p1
%patch1 -p1
%build
@ -222,6 +226,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/nextcloud.
%endif
%changelog
* Sun Apr 12 2020 Tim Klocke <taaem@mailbox.org> - 2.6.4-3
- Fixed autostart when using libcloudproviders
- Fixed recently changed files in libcloudproviders support
* Sun Apr 05 2020 Germano Massullo <germano.massullo@gmail.com> - 2.6.4-2
- Added libcloudproviders support. Thanks to Tim Klocke
- Added BuildRequires: libcloudproviders-devel BuildRequires: pkgconfig(dbus-1)

Loading…
Cancel
Save