[Libreoffice-commits] core.git: shell/source
Caolán McNamara
caolanm at redhat.com
Fri Dec 22 11:27:31 UTC 2017
shell/source/sessioninstall/SyncDbusSessionHelper.cxx | 37 +++++++++---------
1 file changed, 19 insertions(+), 18 deletions(-)
New commits:
commit 5b272bf4b94e1dac427472a07b241e2ae95d8730
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Dec 22 11:25:29 2017 +0000
fix indent vs other functions
Change-Id: I276dc315404932288da3addaf23418ab3e4deb65
Reviewed-on: https://gerrit.libreoffice.org/46967
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
index a1211f77b410..ce3cb8aefca0 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
@@ -154,24 +154,25 @@ void SyncDbusSessionHelper::InstallPrinterDrivers(
request("InstallPrinteDrivers", xid, files, interaction);
}
- void SAL_CALL SyncDbusSessionHelper::IsInstalled( const OUString& sPackagename, const OUString& sInteraction, sal_Bool& o_isInstalled )
- {
- const OString sPackagenameAscii = OUStringToOString(sPackagename, RTL_TEXTENCODING_ASCII_US);
- const OString sInteractionAscii = OUStringToOString(sInteraction, RTL_TEXTENCODING_ASCII_US);
- std::shared_ptr<GDBusProxy> proxy(lcl_GetPackageKitProxy("Query"), GObjectDeleter<GDBusProxy>());
- GErrorWrapper error;
- std::shared_ptr<GVariant> result(g_dbus_proxy_call_sync (proxy.get(),
- "IsInstalled",
- g_variant_new ("(ss)",
- sPackagenameAscii.getStr(),
- sInteractionAscii.getStr()),
- G_DBUS_CALL_FLAGS_NONE,
- -1, /* timeout */
- nullptr, /* cancellable */
- &error.getRef()),GVariantDeleter());
- if(result.get())
- o_isInstalled = bool(g_variant_get_boolean(g_variant_get_child_value(result.get(),0)));
- }
+void SAL_CALL SyncDbusSessionHelper::IsInstalled( const OUString& sPackagename, const OUString& sInteraction, sal_Bool& o_isInstalled )
+{
+ const OString sPackagenameAscii = OUStringToOString(sPackagename, RTL_TEXTENCODING_ASCII_US);
+ const OString sInteractionAscii = OUStringToOString(sInteraction, RTL_TEXTENCODING_ASCII_US);
+ std::shared_ptr<GDBusProxy> proxy(lcl_GetPackageKitProxy("Query"), GObjectDeleter<GDBusProxy>());
+ GErrorWrapper error;
+ std::shared_ptr<GVariant> result(g_dbus_proxy_call_sync (proxy.get(),
+ "IsInstalled",
+ g_variant_new ("(ss)",
+ sPackagenameAscii.getStr(),
+ sInteractionAscii.getStr()),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1, /* timeout */
+ nullptr, /* cancellable */
+ &error.getRef()),GVariantDeleter());
+ if(result.get())
+ o_isInstalled = bool(g_variant_get_boolean(g_variant_get_child_value(result.get(),0)));
+}
+
}}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list