diff options
Diffstat (limited to 'shell/source/sessioninstall/SyncDbusSessionHelper.cxx')
| -rw-r--r-- | shell/source/sessioninstall/SyncDbusSessionHelper.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx index 2b6659a67d22..a578b488e23d 100644 --- a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx +++ b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx @@ -25,7 +25,7 @@ namespace { GError* m_pError; public: - explicit GErrorWrapper(GError* pError) : m_pError(pError) {} + explicit GErrorWrapper() : m_pError(nullptr) {} ~GErrorWrapper() noexcept(false) { if(!m_pError) @@ -41,7 +41,7 @@ namespace const OString sFullInterface = OUStringToOString("org.freedesktop.PackageKit." + sInterface, RTL_TEXTENCODING_ASCII_US); GDBusProxy* proxy = nullptr; { - GErrorWrapper error(nullptr); + GErrorWrapper error; proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, G_DBUS_PROXY_FLAGS_NONE, nullptr, "org.freedesktop.PackageKit", @@ -71,7 +71,7 @@ void request( auto iactUtf8(OUStringToOString(interaction, RTL_TEXTENCODING_UTF8)); std::shared_ptr<GDBusProxy> proxy( lcl_GetPackageKitProxy("Modify"), GObjectDeleter<GDBusProxy>()); - GErrorWrapper error(nullptr); + GErrorWrapper error; g_dbus_proxy_call_sync( proxy.get(), method, g_variant_new( @@ -168,7 +168,7 @@ void SyncDbusSessionHelper::InstallPrinterDrivers( 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(nullptr); + GErrorWrapper error; std::shared_ptr<GVariant> result(g_dbus_proxy_call_sync (proxy.get(), "IsInstalled", g_variant_new ("(ss)", |