[Xfce4-commits] [xfce/xfce4-panel] 07/24: Remove obsolete PANEL_PROPERTIES_TYPE_VALUE_ARRAY
noreply at xfce.org
noreply at xfce.org
Tue Jul 4 00:03:38 CEST 2017
This is an automated email from the git hooks/post-receive script.
o c h o s i p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository xfce/xfce4-panel.
commit d3a6a546c83b1489b87087b0fd68bbcb0598118b
Author: Ali Abdallah <ali at xfce.org>
Date: Thu Jun 22 13:51:07 2017 +0200
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.
---
common/panel-dbus.h | 11 -----------
common/panel-xfconf.c | 19 -------------------
common/panel-xfconf.h | 2 --
configure.ac.in | 2 +-
panel/panel-application.c | 2 +-
plugins/actions/actions.c | 4 ++--
plugins/launcher/launcher.c | 4 ++--
plugins/systray/systray.c | 8 ++++----
wrapper/main.c | 1 -
9 files changed, 10 insertions(+), 43 deletions(-)
diff --git a/common/panel-dbus.h b/common/panel-dbus.h
index dab8a27..6a44646 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 5c7fa88..2328d7c 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 1d3e457..14e330a 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;
diff --git a/configure.ac.in b/configure.ac.in
index fae8134..50b1ac4 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -144,7 +144,7 @@ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.9.0])
XDT_CHECK_PACKAGE([GARCON], [garcon-1], [0.5.0])
XDT_CHECK_PACKAGE([GARCON_GTK3], [garcon-gtk3-1], [0.5.0])
XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.13.0])
-XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.12.0])
+XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.13.1])
XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.16.0])
XDT_CHECK_PACKAGE([EXO], [exo-2], [0.11.2])
XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0])
diff --git a/panel/panel-application.c b/panel/panel-application.c
index 9f836f2..2157534 100644
--- a/panel/panel-application.c
+++ b/panel/panel-application.c
@@ -353,7 +353,7 @@ panel_application_load_real (PanelApplication *application)
if (xfconf_channel_get_property (application->xfconf, "/panels", &val)
&& (G_VALUE_HOLDS_UINT (&val)
- || G_VALUE_HOLDS (&val, PANEL_PROPERTIES_TYPE_VALUE_ARRAY)))
+ || G_VALUE_HOLDS (&val, G_TYPE_PTR_ARRAY)))
{
if (G_VALUE_HOLDS_UINT (&val))
{
diff --git a/plugins/actions/actions.c b/plugins/actions/actions.c
index 3740ad6..dba9b94 100644
--- a/plugins/actions/actions.c
+++ b/plugins/actions/actions.c
@@ -240,7 +240,7 @@ actions_plugin_class_init (ActionsPluginClass *klass)
PROP_ITEMS,
g_param_spec_boxed ("items",
NULL, NULL,
- PANEL_PROPERTIES_TYPE_VALUE_ARRAY,
+ G_TYPE_PTR_ARRAY,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
@@ -360,7 +360,7 @@ actions_plugin_construct (XfcePanelPlugin *panel_plugin)
ActionsPlugin *plugin = XFCE_ACTIONS_PLUGIN (panel_plugin);
const PanelProperty properties[] =
{
- { "items", PANEL_PROPERTIES_TYPE_VALUE_ARRAY },
+ { "items", G_TYPE_PTR_ARRAY },
{ "appearance", G_TYPE_UINT },
{ "invert-orientation", G_TYPE_BOOLEAN },
{ "ask-confirmation", G_TYPE_BOOLEAN },
diff --git a/plugins/launcher/launcher.c b/plugins/launcher/launcher.c
index c75880b..55e3af1 100644
--- a/plugins/launcher/launcher.c
+++ b/plugins/launcher/launcher.c
@@ -274,7 +274,7 @@ launcher_plugin_class_init (LauncherPluginClass *klass)
PROP_ITEMS,
g_param_spec_boxed ("items",
NULL, NULL,
- PANEL_PROPERTIES_TYPE_VALUE_ARRAY,
+ G_TYPE_PTR_ARRAY,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
@@ -999,7 +999,7 @@ launcher_plugin_construct (XfcePanelPlugin *panel_plugin)
const PanelProperty properties[] =
{
{ "show-label", G_TYPE_BOOLEAN },
- { "items", PANEL_PROPERTIES_TYPE_VALUE_ARRAY },
+ { "items", G_TYPE_PTR_ARRAY },
{ "disable-tooltips", G_TYPE_BOOLEAN },
{ "move-first", G_TYPE_BOOLEAN },
{ "arrow-position", G_TYPE_UINT },
diff --git a/plugins/systray/systray.c b/plugins/systray/systray.c
index 37cdcc3..86c036c 100644
--- a/plugins/systray/systray.c
+++ b/plugins/systray/systray.c
@@ -199,14 +199,14 @@ systray_plugin_class_init (SystrayPluginClass *klass)
PROP_NAMES_ORDERED,
g_param_spec_boxed ("names-ordered",
NULL, NULL,
- PANEL_PROPERTIES_TYPE_VALUE_ARRAY,
+ G_TYPE_PTR_ARRAY,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_NAMES_HIDDEN,
g_param_spec_boxed ("names-hidden",
NULL, NULL,
- PANEL_PROPERTIES_TYPE_VALUE_ARRAY,
+ G_TYPE_PTR_ARRAY,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
@@ -472,8 +472,8 @@ systray_plugin_construct (XfcePanelPlugin *panel_plugin)
{
{ "size-max", G_TYPE_UINT },
{ "show-frame", G_TYPE_BOOLEAN },
- { "names-ordered", PANEL_PROPERTIES_TYPE_VALUE_ARRAY },
- { "names-hidden", PANEL_PROPERTIES_TYPE_VALUE_ARRAY },
+ { "names-ordered", G_TYPE_PTR_ARRAY },
+ { "names-hidden", G_TYPE_PTR_ARRAY },
{ NULL }
};
diff --git a/wrapper/main.c b/wrapper/main.c
index d5df96b..9a50593 100644
--- a/wrapper/main.c
+++ b/wrapper/main.c
@@ -45,7 +45,6 @@
#include <wrapper/wrapper-plug.h>
#include <wrapper/wrapper-module.h>
-#include <wrapper/wrapper-dbus-client-infos.h>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list