diff options
| author | Ali Abdallah <ali@xfce.org> | 2017-06-22 13:51:07 +0200 |
|---|---|---|
| committer | Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at> | 2017-07-02 23:58:10 +0200 |
| commit | d3a6a546c83b1489b87087b0fd68bbcb0598118b (patch) | |
| tree | 6cca27a0fa73447d1f1e3659452e8d76da8df9af /common | |
| parent | 47310591f521fbf6d60a9c30064c6acb49f3437c (diff) | |
| download | xfce4-panel-d3a6a546c83b1489b87087b0fd68bbcb0598118b.tar.gz | |
Remove obsolete PANEL_PROPERTIES_TYPE_VALUE_ARRAY
PANEL_PROPERTIES_TYPE_VALUE_ARRAY is obsolete dbus_g_type_collection.
This makes the panel compatible with libxfconf >= 4.13.1, for this XDT_CHECK_PACKAGE
for libxfconf has been bumped to the required version.
Diffstat (limited to 'common')
| -rw-r--r-- | common/panel-dbus.h | 11 | ||||
| -rw-r--r-- | common/panel-xfconf.c | 19 | ||||
| -rw-r--r-- | common/panel-xfconf.h | 2 |
3 files changed, 0 insertions, 32 deletions
diff --git a/common/panel-dbus.h b/common/panel-dbus.h index dab8a275..6a446469 100644 --- a/common/panel-dbus.h +++ b/common/panel-dbus.h @@ -26,17 +26,6 @@ #define PANEL_DBUS_WRAPPER_PATH PANEL_DBUS_PATH "/Wrapper/%d" #define PANEL_DBUS_WRAPPER_INTERFACE PANEL_DBUS_INTERFACE ".Wrapper" -/* special types for dbus communication */ -#define PANEL_TYPE_DBUS_SET_PROPERTY \ - dbus_g_type_get_struct ("GValueArray", \ - G_TYPE_UINT, \ - G_TYPE_VALUE, \ - G_TYPE_INVALID) - -#define PANEL_TYPE_DBUS_SET_SIGNAL \ - dbus_g_type_get_collection ("GPtrArray", \ - PANEL_TYPE_DBUS_SET_PROPERTY) - enum { DBUS_SET_TYPE, diff --git a/common/panel-xfconf.c b/common/panel-xfconf.c index 5c7fa885..2328d7cb 100644 --- a/common/panel-xfconf.c +++ b/common/panel-xfconf.c @@ -20,8 +20,6 @@ #include <config.h> #endif -#include <dbus/dbus-glib.h> - #include <common/panel-private.h> #include <common/panel-xfconf.h> #include <libxfce4panel/xfce-panel-macros.h> @@ -149,20 +147,3 @@ panel_properties_unbind (GObject *object) { xfconf_g_property_unbind_all (object); } - - - -GType -panel_properties_value_array_get_type (void) -{ - static volatile gsize type__volatile = 0; - GType type; - - if (g_once_init_enter (&type__volatile)) - { - type = dbus_g_type_get_collection ("GPtrArray", G_TYPE_VALUE); - g_once_init_leave (&type__volatile, type); - } - - return type__volatile; -} diff --git a/common/panel-xfconf.h b/common/panel-xfconf.h index 1d3e4572..14e330a1 100644 --- a/common/panel-xfconf.h +++ b/common/panel-xfconf.h @@ -21,8 +21,6 @@ #include <xfconf/xfconf.h> -#define PANEL_PROPERTIES_TYPE_VALUE_ARRAY (panel_properties_value_array_get_type ()) - typedef struct _PanelProperty PanelProperty; |