[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtkinst.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c0c5c5c660d3be6ea423b08837a847447e7f78eb
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Jun 18 10:28:12 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jun 18 14:43:55 2021 +0200

    rename m_nSignalId to m_nToggledSignalId
    
    Change-Id: I8340eeb222cca00b1d9133f0313a264abe2d3227
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117439
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 98eea7cadcbe..d1121f048b21 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -8913,7 +8913,7 @@ class GtkInstanceToggleButton : public GtkInstanceButton, public virtual weld::T
 protected:
     GtkToggleButton* m_pToggleButton;
 private:
-    gulong m_nSignalId;
+    gulong m_nToggledSignalId;
 
     static void signalToggled(GtkToggleButton*, gpointer widget)
     {
@@ -8925,7 +8925,7 @@ public:
     GtkInstanceToggleButton(GtkToggleButton* pButton, GtkInstanceBuilder* pBuilder, bool bTakeOwnership)
         : GtkInstanceButton(GTK_BUTTON(pButton), pBuilder, bTakeOwnership)
         , m_pToggleButton(pButton)
-        , m_nSignalId(g_signal_connect(m_pToggleButton, "toggled", G_CALLBACK(signalToggled), this))
+        , m_nToggledSignalId(g_signal_connect(m_pToggleButton, "toggled", G_CALLBACK(signalToggled), this))
     {
     }
 
@@ -8965,19 +8965,19 @@ public:
 
     virtual void disable_notify_events() override
     {
-        g_signal_handler_block(m_pToggleButton, m_nSignalId);
+        g_signal_handler_block(m_pToggleButton, m_nToggledSignalId);
         GtkInstanceButton::disable_notify_events();
     }
 
     virtual void enable_notify_events() override
     {
         GtkInstanceButton::enable_notify_events();
-        g_signal_handler_unblock(m_pToggleButton, m_nSignalId);
+        g_signal_handler_unblock(m_pToggleButton, m_nToggledSignalId);
     }
 
     virtual ~GtkInstanceToggleButton() override
     {
-        g_signal_handler_disconnect(m_pToggleButton, m_nSignalId);
+        g_signal_handler_disconnect(m_pToggleButton, m_nToggledSignalId);
     }
 };