Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dnfdaemon: Correct D-Bus signal argument type #1679

Merged
merged 2 commits into from
Sep 6, 2024
Merged

dnfdaemon: Correct D-Bus signal argument type #1679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7133b74
dnfdaemon: Signals should use "object_path" type for the session_obje…
mcrha Sep 6, 2024
e0f7b91
dnfdaemon: Correct argument direction in interface definition of Goal…
mcrha Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dnf5daemon-server/dbus/interfaces/org.rpm.dnf.v0.Goal.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ along with libdnf. If not, see <https://www.gnu.org/licenses/>.
Cancel the transaction that was initiated by `do_transaction()`. The transaction can only be canceled during the package download phase. Once the RPM transaction has begun, cancellation is no longer permitted.
-->
<method name="cancel">
<arg name="success" type="b" />
<arg name="error_msg" type="s" />
<arg name="success" type="b" direction="out" />
<arg name="error_msg" type="s" direction="out" />
</method>

</interface>
Expand Down
4 changes: 2 additions & 2 deletions dnf5daemon-server/session.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class Session {
return dnfdaemon::key_value_map_get<ItemType>(session_configuration, key);
}

std::string get_object_path() { return object_path; };
const sdbus::ObjectPath & get_object_path() const { return object_path; };
sdbus::IConnection & get_connection() { return connection; };
libdnf5::Base * get_base() { return base.get(); };
ThreadsManager & get_threads_manager() { return threads_manager; };
Expand Down Expand Up @@ -105,7 +105,7 @@ class Session {
libdnf5::Goal goal;
std::unique_ptr<libdnf5::base::Transaction> transaction{nullptr};
dnfdaemon::KeyValueMap session_configuration;
std::string object_path;
sdbus::ObjectPath object_path;
std::vector<std::unique_ptr<IDbusSessionService>> services{};
ThreadsManager threads_manager;
std::atomic<dnfdaemon::RepoStatus> repositories_status{dnfdaemon::RepoStatus::NOT_READY};
Expand Down
Loading