summaryrefslogtreecommitdiff
path: root/UnityCore
diff options
Diffstat (limited to 'UnityCore')
-rw-r--r--UnityCore/DesktopUtilities.cpp5
-rw-r--r--UnityCore/DesktopUtilities.h1
-rw-r--r--UnityCore/GLibDBusProxy.cpp6
3 files changed, 9 insertions, 3 deletions
diff --git a/UnityCore/DesktopUtilities.cpp b/UnityCore/DesktopUtilities.cpp
index a9a41c5e7..5b841cd0d 100644
--- a/UnityCore/DesktopUtilities.cpp
+++ b/UnityCore/DesktopUtilities.cpp
@@ -90,6 +90,11 @@ std::string DesktopUtilities::GetUserRuntimeDirectory()
return "";
}
+std::string DesktopUtilities::GetUserTrashDirectory()
+{
+ return GetUserDataDirectory().append(G_DIR_SEPARATOR_S "Trash" G_DIR_SEPARATOR_S "files" G_DIR_SEPARATOR_S);
+}
+
std::vector<std::string> DesktopUtilities::GetSystemDataDirectories()
{
const char* const* system_dirs = g_get_system_data_dirs();
diff --git a/UnityCore/DesktopUtilities.h b/UnityCore/DesktopUtilities.h
index 203603ea1..5c0488eaf 100644
--- a/UnityCore/DesktopUtilities.h
+++ b/UnityCore/DesktopUtilities.h
@@ -33,6 +33,7 @@ public:
static std::string GetUserCacheDirectory();
static std::string GetUserRuntimeDirectory();
static std::string GetUserConfigDirectory();
+ static std::string GetUserTrashDirectory();
static std::vector<std::string> GetSystemDataDirectories();
static std::vector<std::string> GetDataDirectories();
diff --git a/UnityCore/GLibDBusProxy.cpp b/UnityCore/GLibDBusProxy.cpp
index 1cd6f4d3d..7e89f6ddf 100644
--- a/UnityCore/GLibDBusProxy.cpp
+++ b/UnityCore/GLibDBusProxy.cpp
@@ -301,7 +301,7 @@ void DBusProxy::Impl::OnPropertyChanged(GDBusProxy* proxy, GVariant* changed_pro
}
}
- g_variant_iter_free (iter);
+ g_variant_iter_free(iter);
}
for (const gchar *property_name = *invalidated; property_name; property_name = *(++invalidated))
@@ -624,7 +624,7 @@ void DBusProxy::GetProperty(std::string const& name, ReplyCallback const& callba
[] (GObject *source, GAsyncResult *res, gpointer user_data) {
glib::Error err;
std::unique_ptr<ReplyCallback> callback(static_cast<ReplyCallback*>(user_data));
- Variant result(g_dbus_connection_call_finish(G_DBUS_CONNECTION(source), res, &err));
+ Variant result(g_dbus_connection_call_finish(G_DBUS_CONNECTION(source), res, &err), StealRef());
if (err)
{
@@ -660,7 +660,7 @@ void DBusProxy::SetProperty(std::string const& name, GVariant* value)
nullptr, G_DBUS_CALL_FLAGS_NONE, -1, pimpl->cancellable_,
[] (GObject *source, GAsyncResult *res, gpointer user_data) {
glib::Error err;
- Variant result(g_dbus_connection_call_finish(G_DBUS_CONNECTION(source), res, &err));
+ Variant result(g_dbus_connection_call_finish(G_DBUS_CONNECTION(source), res, &err), StealRef());
if (err)
{
LOG_ERROR(logger) << "Impossible to set property: " << err;