summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorNick Schermer <nick@xfce.org>2010-03-11 20:35:54 +0100
committerNick Schermer <nick@xfce.org>2010-03-11 20:39:35 +0100
commitd168066d3dc8ae112df6b33e8164394c8d6c0087 (patch)
tree0e092474cda9f71c73d10534cd3d0bfd7e8fd93e /common
parent8a1c651625c0c069da8aef7486ce8f1eaef819d6 (diff)
downloadxfce4-panel-d168066d3dc8ae112df6b33e8164394c8d6c0087.tar.gz
Support remote event replies from the wrapper.
Because of the dbus signal we cannot return the reply of the remote event, so add a method and handle ids to reply to the panel. When an implementation of the panel plugin provider returns a handle, the dbus service waits for the reply before it continues.
Diffstat (limited to 'common')
-rw-r--r--common/panel-dbus.h43
1 files changed, 21 insertions, 22 deletions
diff --git a/common/panel-dbus.h b/common/panel-dbus.h
index e53b15c5..611456c8 100644
--- a/common/panel-dbus.h
+++ b/common/panel-dbus.h
@@ -27,34 +27,33 @@
#define PANEL_DBUS_WRAPPER_INTERFACE PANEL_DBUS_INTERFACE ".Wrapper"
/* internal signals send over dbus */
-#define SIGNAL_PREFIX '_'
-#define SIGNAL_PREFIX_S "_"
-#define SIGNAL_SET_SIZE SIGNAL_PREFIX_S "a"
-#define SIGNAL_SET_ORIENTATION SIGNAL_PREFIX_S "b"
-#define SIGNAL_SET_SCREEN_POSITION SIGNAL_PREFIX_S "c"
-#define SIGNAL_SET_LOCKED SIGNAL_PREFIX_S "d"
-#define SIGNAL_SAVE SIGNAL_PREFIX_S "e"
-#define SIGNAL_SHOW_CONFIGURE SIGNAL_PREFIX_S "f"
-#define SIGNAL_SHOW_ABOUT SIGNAL_PREFIX_S "g"
-#define SIGNAL_REMOVED SIGNAL_PREFIX_S "h"
-#define SIGNAL_WRAPPER_SET_SENSITIVE SIGNAL_PREFIX_S "i"
-#define SIGNAL_WRAPPER_BACKGROUND_ALPHA SIGNAL_PREFIX_S "j"
-#define SIGNAL_WRAPPER_QUIT SIGNAL_PREFIX_S "k"
+#define SIGNAL_SET_SIZE "a"
+#define SIGNAL_SET_ORIENTATION "b"
+#define SIGNAL_SET_SCREEN_POSITION "c"
+#define SIGNAL_SET_LOCKED "d"
+#define SIGNAL_SAVE "e"
+#define SIGNAL_SHOW_CONFIGURE "f"
+#define SIGNAL_SHOW_ABOUT "g"
+#define SIGNAL_REMOVED "h"
+#define SIGNAL_WRAPPER_SET_SENSITIVE "i"
+#define SIGNAL_WRAPPER_BACKGROUND_ALPHA "j"
+#define SIGNAL_WRAPPER_QUIT "k"
/* special types for dbus communication */
-#define PANEL_TYPE_DBUS_SET_MESSAGE dbus_g_type_get_struct ("GValueArray", \
- G_TYPE_STRING, \
- G_TYPE_VALUE, \
- G_TYPE_UINT, \
- G_TYPE_INVALID)
-#define PANEL_TYPE_DBUS_SET_SIGNAL dbus_g_type_get_collection ("GPtrArray", \
- PANEL_TYPE_DBUS_SET_MESSAGE)
+#define PANEL_TYPE_DBUS_SET_MESSAGE \
+ dbus_g_type_get_struct ("GValueArray", \
+ G_TYPE_STRING, \
+ G_TYPE_VALUE, \
+ G_TYPE_INVALID)
+
+#define PANEL_TYPE_DBUS_SET_SIGNAL \
+ dbus_g_type_get_collection ("GPtrArray", \
+ PANEL_TYPE_DBUS_SET_MESSAGE)
enum
{
DBUS_SET_PROPERTY,
- DBUS_SET_VALUE,
- DBUS_SET_REPLY_ID
+ DBUS_SET_VALUE
};
#endif /* !__PANEL_DBUS_H__ */