From dcddddd3f1a1c1560a84caf791a21b4610f0fc7d Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <alebastr89@gmail.com>
Date: Thu, 14 Mar 2024 00:58:33 -0700
Subject: [PATCH] fix(power-profiles-daemon): correctly set initial visibility

The bus error when the daemon is not reachable prevents the initial
update and keeps the module visible, as an empty section on the bar.

Do the update explicitly before connecting to set initial visibility.

While we at it, remove a couple of redundant `update()` calls.
---
 src/modules/power_profiles_daemon.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/modules/power_profiles_daemon.cpp b/src/modules/power_profiles_daemon.cpp
index ae3d7443b..ac5f7a2a6 100644
--- a/src/modules/power_profiles_daemon.cpp
+++ b/src/modules/power_profiles_daemon.cpp
@@ -42,6 +42,8 @@ PowerProfilesDaemon::PowerProfilesDaemon(const std::string& id, const Json::Valu
   Gio::DBus::Proxy::create_for_bus(Gio::DBus::BusType::BUS_TYPE_SYSTEM, "net.hadess.PowerProfiles",
                                    "/net/hadess/PowerProfiles", "net.hadess.PowerProfiles",
                                    sigc::mem_fun(*this, &PowerProfilesDaemon::busConnectedCb));
+  // Schedule update to set the initial visibility
+  dp.emit();
 }
 
 void PowerProfilesDaemon::busConnectedCb(Glib::RefPtr<Gio::AsyncResult>& r) {
@@ -74,7 +76,6 @@ void PowerProfilesDaemon::getAllPropsCb(Glib::RefPtr<Gio::AsyncResult>& r) {
     powerProfilesProxy_->signal_properties_changed().connect(
         sigc::mem_fun(*this, &PowerProfilesDaemon::profileChangedCb));
     populateInitState();
-    dp.emit();
   } catch (const std::exception& err) {
     spdlog::error("Failed to query power-profiles-daemon via dbus: {}", err.what());
   } catch (const Glib::Error& err) {
@@ -112,8 +113,6 @@ void PowerProfilesDaemon::populateInitState() {
   // Find the index of the current activated mode (to toggle)
   std::string str = profileStr.get();
   switchToProfile(str);
-
-  update();
 }
 
 void PowerProfilesDaemon::profileChangedCb(
@@ -128,7 +127,6 @@ void PowerProfilesDaemon::profileChangedCb(
           Glib::VariantBase::cast_dynamic<Glib::Variant<std::string>>(activeProfileVariant->second)
               .get();
       switchToProfile(activeProfile);
-      update();
     }
   }
 }
@@ -145,6 +143,7 @@ void PowerProfilesDaemon::switchToProfile(std::string const& str) {
         "Power profile daemon: can't find the active profile {} in the available profiles list",
         str);
   }
+  dp.emit();
 }
 
 auto PowerProfilesDaemon::update() -> void {
@@ -195,7 +194,7 @@ bool PowerProfilesDaemon::handleToggle(GdkEventButton* const& e) {
 void PowerProfilesDaemon::setPropCb(Glib::RefPtr<Gio::AsyncResult>& r) {
   try {
     auto _ = powerProfilesProxy_->call_finish(r);
-    update();
+    dp.emit();
   } catch (const std::exception& e) {
     spdlog::error("Failed to set the the active power profile: {}", e.what());
   } catch (const Glib::Error& e) {