[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 03/05: Fix crash when selecting desktop action.
noreply at xfce.org
noreply at xfce.org
Sat Feb 15 11:34:49 CET 2020
This is an automated email from the git hooks/post-receive script.
g o t t c o d e p u s h e d a c o m m i t t o a n n o t a t e d t a g v 2 . 4 . 2
in repository panel-plugins/xfce4-whiskermenu-plugin.
commit 39396e291a9cdb80aa5e145833b3bd5b29175b4d
Author: Graeme Gott <graeme at gottcode.org>
Date: Thu Feb 13 10:08:41 2020 -0500
Fix crash when selecting desktop action.
---
panel-plugin/slot.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/panel-plugin/slot.h b/panel-plugin/slot.h
index 795b6c9..938d647 100644
--- a/panel-plugin/slot.h
+++ b/panel-plugin/slot.h
@@ -92,28 +92,28 @@ gulong g_signal_connect_slot(gpointer instance, const gchar* detailed_signal, R(
after ? G_CONNECT_AFTER : GConnectFlags(0));
}
-// Member function with parameters and 1 bound parameter
-template<typename T, typename R, typename... Args, typename A2>
-gulong g_signal_connect_slot(gpointer instance, const gchar* detailed_signal, R(T::*member)(Args...,A2), T* obj, A2 bound1, bool after = false)
+// Member function with 1 parameter and 1 bound parameter
+template<typename T, typename R, typename A1, typename A2>
+gulong g_signal_connect_slot(gpointer instance, const gchar* detailed_signal, R(T::*member)(A1,A2), T* obj, A2 bound1, bool after = false)
{
class Slot
{
T* m_instance;
- R (T::*m_member)(Args...,A2);
+ R (T::*m_member)(A1,A2);
A2 m_bound1;
public:
- Slot(T* instance, R (T::*member)(Args...,A2), A2 bound1) :
+ Slot(T* instance, R (T::*member)(A1,A2), A2 bound1) :
m_instance(instance),
m_member(member),
m_bound1(bound1)
{
}
- static R invoke(Args... args, gpointer user_data)
+ static R invoke(A1 arg, gpointer user_data)
{
Slot* slot = static_cast<Slot*>(user_data);
- return (slot->m_instance->*slot->m_member)(args..., slot->m_bound1);
+ return (slot->m_instance->*slot->m_member)(arg, slot->m_bound1);
}
static void destroy(gpointer data, GClosure*)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list