diff --git a/configure.in.in b/configure.in.in
index bfb15d1f147a10dd3026d99d1f9901317541fdcd..9279f1af21a845cc6db178a6e2a25b4bea3a897a 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -191,7 +191,7 @@ fi
dnl ****************************************
dnl *** Check for ELF visibility support ***
dnl ****************************************
-AC_ARG_ENABLE([visibility], AC_HELP_STRING([--disable-visibility], [Don't use ELF visibility attributes]), [], [enable_visibility=yes])
+AC_ARG_ENABLE([visibility], AC_HELP_STRING([--disable-visibility], [Do not use ELF visibility attributes]), [], [enable_visibility=yes])
have_gnuc_visibility=no
if test x"$enable_visibility" != x"no"; then
dnl Check whether the compiler supports the visibility attribute
@@ -215,6 +215,7 @@ if test x"$enable_visibility" != x"no"; then
fi
if test x"$have_gnuc_visibility" = x"yes"; then
PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DHAVE_GNUC_VISIBILITY"
+ PLATFORM_CFLAGS="$PLATFORM_CFLAGS -fvisibility=hidden"
fi
AM_CONDITIONAL([HAVE_GNUC_VISIBILITY], [test x"$have_gnuc_visibility" = x"yes"])
diff --git a/libxfce4panel/libxfce4panel.h b/libxfce4panel/libxfce4panel.h
index bb34ca8d6c2b025dbdab19fde4b1431b0a31a5b0..ebf60b34ac2fa661a453ae5ffc88244aa7833a68 100644
--- a/libxfce4panel/libxfce4panel.h
+++ b/libxfce4panel/libxfce4panel.h
@@ -24,12 +24,12 @@ G_BEGIN_DECLS
#define LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H
+#include <libxfce4panel/xfce-panel-macros.h>
#include <libxfce4panel/xfce-arrow-button.h>
#include <libxfce4panel/xfce-hvbox.h>
#include <libxfce4panel/xfce-panel-convenience.h>
#include <libxfce4panel/xfce-panel-enums.h>
#include <libxfce4panel/xfce-panel-plugin.h>
-#include <libxfce4panel/xfce-panel-macros.h>
#undef LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H
@@ -50,7 +50,7 @@ G_BEGIN_DECLS
(*construct_func) (plugin); \
} \
\
- G_MODULE_EXPORT XfcePanelPlugin * \
+ PANEL_SYMBOL_EXPORT G_MODULE_EXPORT XfcePanelPlugin * \
xfce_panel_plugin_construct (const gchar *name, \
const gchar *id, \
const gchar *display_name, \
diff --git a/libxfce4panel/xfce-arrow-button.c b/libxfce4panel/xfce-arrow-button.c
index c3b31f891cde0efe3d013124a7529bc563d8af0f..15293d10f99ab282f57cc2e1aec85c175b9a10c4 100644
--- a/libxfce4panel/xfce-arrow-button.c
+++ b/libxfce4panel/xfce-arrow-button.c
@@ -30,8 +30,7 @@
#endif
#include <gtk/gtk.h>
-#include <libxfce4panel/xfce-panel-macros.h>
-#include <libxfce4panel/xfce-arrow-button.h>
+#include <libxfce4panel/libxfce4panel.h>
#define ARROW_WIDTH (8)
#define ARROW_PADDING (2)
@@ -252,7 +251,7 @@ xfce_arrow_button_child_type (GtkContainer *container)
*
* Returns: The newly created #XfceArrowButton widget.
**/
-GtkWidget *
+PANEL_SYMBOL_EXPORT GtkWidget *
xfce_arrow_button_new (GtkArrowType arrow_type)
{
return g_object_new (XFCE_TYPE_ARROW_BUTTON, "arrow-type", arrow_type, NULL);
@@ -267,7 +266,7 @@ xfce_arrow_button_new (GtkArrowType arrow_type)
*
* Sets the arrow type for @button.
**/
-void
+PANEL_SYMBOL_EXPORT void
xfce_arrow_button_set_arrow_type (XfceArrowButton *button,
GtkArrowType arrow_type)
{
@@ -299,7 +298,7 @@ xfce_arrow_button_set_arrow_type (XfceArrowButton *button,
*
* Returns: the #GtkArrowType of @button.
**/
-GtkArrowType
+PANEL_SYMBOL_EXPORT GtkArrowType
xfce_arrow_button_get_arrow_type (XfceArrowButton *button)
{
g_return_val_if_fail (XFCE_IS_ARROW_BUTTON (button), GTK_ARROW_UP);
diff --git a/libxfce4panel/xfce-arrow-button.h b/libxfce4panel/xfce-arrow-button.h
index 0a1458724c58839e5b4f395987e822da9c8fa177..fd6dae3117d1322a82544003be32018d607608bd 100644
--- a/libxfce4panel/xfce-arrow-button.h
+++ b/libxfce4panel/xfce-arrow-button.h
@@ -57,6 +57,7 @@ struct _XfceArrowButton
GtkArrowType arrow_type;
};
+PANEL_SYMBOL_EXPORT
GType xfce_arrow_button_get_type (void) G_GNUC_CONST;
GtkWidget *xfce_arrow_button_new (GtkArrowType arrow_type) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
diff --git a/libxfce4panel/xfce-hvbox.c b/libxfce4panel/xfce-hvbox.c
index 50cdd8fd03df1fc90bb7b24d809a3417ca32e71b..63557cabd9460c4ef229a422cf8e619f92c6a0fe 100644
--- a/libxfce4panel/xfce-hvbox.c
+++ b/libxfce4panel/xfce-hvbox.c
@@ -27,8 +27,7 @@
#endif
#include <gtk/gtk.h>
-#include <libxfce4panel/xfce-panel-macros.h>
-#include <libxfce4panel/xfce-hvbox.h>
+#include <libxfce4panel/libxfce4panel.h>
@@ -127,7 +126,7 @@ xfce_hvbox_size_allocate (GtkWidget *widget,
*
* Return value: the newly allocated #XfceHVBox container widget.
**/
-GtkWidget *
+PANEL_SYMBOL_EXPORT GtkWidget *
xfce_hvbox_new (GtkOrientation orientation,
gboolean homogeneous,
gint spacing)
@@ -154,7 +153,7 @@ xfce_hvbox_new (GtkOrientation orientation,
*
* Set the new orientation of the #XfceHVBox container widget.
**/
-void
+PANEL_SYMBOL_EXPORT void
xfce_hvbox_set_orientation (XfceHVBox *hvbox,
GtkOrientation orientation)
{
@@ -178,7 +177,7 @@ xfce_hvbox_set_orientation (XfceHVBox *hvbox,
*
* Returns the current orientation of the #XfceHVBox.
**/
-GtkOrientation
+PANEL_SYMBOL_EXPORT GtkOrientation
xfce_hvbox_get_orientation (XfceHVBox *hvbox)
{
g_return_val_if_fail (XFCE_IS_HVBOX (hvbox), GTK_ORIENTATION_HORIZONTAL);
diff --git a/libxfce4panel/xfce-hvbox.h b/libxfce4panel/xfce-hvbox.h
index 62b362bb03de814b37b79e527012283d2d018fa1..f6b79c53ade9829cde374d9499d535039dbbefd9 100644
--- a/libxfce4panel/xfce-hvbox.h
+++ b/libxfce4panel/xfce-hvbox.h
@@ -57,6 +57,7 @@ struct _XfceHVBox
GtkOrientation orientation;
};
+PANEL_SYMBOL_EXPORT
GType xfce_hvbox_get_type (void) G_GNUC_CONST;
GtkWidget *xfce_hvbox_new (GtkOrientation orientation,
diff --git a/libxfce4panel/xfce-panel-convenience.c b/libxfce4panel/xfce-panel-convenience.c
index 34a47cf1f055c5df8a8534c212106b7ebe1bdc01..fcc6cac77bd3493da29f9feec38c7576e89aaa1a 100644
--- a/libxfce4panel/xfce-panel-convenience.c
+++ b/libxfce4panel/xfce-panel-convenience.c
@@ -25,7 +25,7 @@
#include <libxfce4util/libxfce4util.h>
#include <gtk/gtk.h>
-#include <libxfce4panel/xfce-panel-convenience.h>
+#include <libxfce4panel/libxfce4panel.h>
/**
* xfce_panel_create_button:
@@ -35,7 +35,7 @@
*
* Returns: newly created #GtkButton.
**/
-GtkWidget *
+PANEL_SYMBOL_EXPORT GtkWidget *
xfce_panel_create_button (void)
{
GtkWidget *button = gtk_button_new ();
@@ -59,7 +59,7 @@ xfce_panel_create_button (void)
*
* Returns: newly created #GtkToggleButton.
**/
-GtkWidget *
+PANEL_SYMBOL_EXPORT GtkWidget *
xfce_panel_create_toggle_button (void)
{
GtkWidget *button = gtk_toggle_button_new ();
@@ -84,7 +84,7 @@ xfce_panel_create_toggle_button (void)
* Returns: %TRUE if the user is allowed to customize the panel, %FALSE
* otherwise.
**/
-gboolean
+PANEL_SYMBOL_EXPORT gboolean
xfce_panel_allow_customization (void)
{
static gboolean allow_customization = FALSE;
@@ -104,7 +104,7 @@ xfce_panel_allow_customization (void)
-void
+PANEL_SYMBOL_EXPORT void
xfce_panel_cairo_set_source_rgba (cairo_t *cr,
GdkColor *color,
gdouble alpha)
diff --git a/libxfce4panel/xfce-panel-macros.h b/libxfce4panel/xfce-panel-macros.h
index 3556dc48e0564aa1de6f17dc02722ecadb230c33..7fabc156d0d9e62cdfd2d4ad1fafc7a39576a598 100644
--- a/libxfce4panel/xfce-panel-macros.h
+++ b/libxfce4panel/xfce-panel-macros.h
@@ -56,6 +56,13 @@ G_BEGIN_DECLS
#define G_PARAM_STATIC_STRINGS (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)
#endif
+/* visibility support */
+#ifdef HAVE_GNUC_VISIBILITY
+#define PANEL_SYMBOL_EXPORT __attribute__ ((visibility("default")))
+#else
+#define PANEL_SYMBOL_EXPORT
+#endif
+
/* make api compatible with 4.4 panel */
#ifndef XFCE_DISABLE_DEPRECATED
diff --git a/libxfce4panel/xfce-panel-plugin-provider.c b/libxfce4panel/xfce-panel-plugin-provider.c
index 2f8f4f32f4359184d3ebbd8d1820dacbe69f9617..e001095d947322a51a1a3e09a9ac5821db803651 100644
--- a/libxfce4panel/xfce-panel-plugin-provider.c
+++ b/libxfce4panel/xfce-panel-plugin-provider.c
@@ -23,9 +23,7 @@
#include <gtk/gtk.h>
-#include <libxfce4panel/xfce-panel-macros.h>
-#include <libxfce4panel/xfce-panel-enums.h>
-#include <libxfce4panel/xfce-panel-plugin.h>
+#include <libxfce4panel/libxfce4panel.h>
#include <libxfce4panel/xfce-panel-plugin-provider.h>
@@ -79,7 +77,7 @@ xfce_panel_plugin_provider_class_init (gpointer klass)
-const gchar *
+PANEL_SYMBOL_EXPORT const gchar *
xfce_panel_plugin_provider_get_name (XfcePanelPluginProvider *provider)
{
panel_return_val_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider), NULL);
@@ -89,7 +87,7 @@ xfce_panel_plugin_provider_get_name (XfcePanelPluginProvider *provider)
-const gchar *
+PANEL_SYMBOL_EXPORT const gchar *
xfce_panel_plugin_provider_get_id (XfcePanelPluginProvider *provider)
{
panel_return_val_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider), NULL);
@@ -99,7 +97,7 @@ xfce_panel_plugin_provider_get_id (XfcePanelPluginProvider *provider)
-void
+PANEL_SYMBOL_EXPORT void
xfce_panel_plugin_provider_set_size (XfcePanelPluginProvider *provider,
gint size)
{
@@ -110,7 +108,7 @@ xfce_panel_plugin_provider_set_size (XfcePanelPluginProvider *provider,
-void
+PANEL_SYMBOL_EXPORT void
xfce_panel_plugin_provider_set_orientation (XfcePanelPluginProvider *provider,
GtkOrientation orientation)
{
@@ -121,7 +119,7 @@ xfce_panel_plugin_provider_set_orientation (XfcePanelPluginProvider *provider,
-void
+PANEL_SYMBOL_EXPORT void
xfce_panel_plugin_provider_set_screen_position (XfcePanelPluginProvider *provider,
XfceScreenPosition screen_position)
{
@@ -132,7 +130,7 @@ xfce_panel_plugin_provider_set_screen_position (XfcePanelPluginProvider *provide
-void
+PANEL_SYMBOL_EXPORT void
xfce_panel_plugin_provider_save (XfcePanelPluginProvider *provider)
{
panel_return_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider));
@@ -142,7 +140,7 @@ xfce_panel_plugin_provider_save (XfcePanelPluginProvider *provider)
-void
+PANEL_SYMBOL_EXPORT void
xfce_panel_plugin_provider_send_signal (XfcePanelPluginProvider *provider,
XfcePanelPluginProviderSignal signal)
{
diff --git a/libxfce4panel/xfce-panel-plugin-provider.h b/libxfce4panel/xfce-panel-plugin-provider.h
index 16625578dd2ddfd84a3554594981235867fd6974..84dd7052a17200a571c548999bccef969e285294 100644
--- a/libxfce4panel/xfce-panel-plugin-provider.h
+++ b/libxfce4panel/xfce-panel-plugin-provider.h
@@ -83,7 +83,7 @@ enum _XfcePanelPluginProviderSignal
};
-
+PANEL_SYMBOL_EXPORT
GType xfce_panel_plugin_provider_get_type (void) G_GNUC_CONST;
const gchar *xfce_panel_plugin_provider_get_name (XfcePanelPluginProvider *provider);
diff --git a/libxfce4panel/xfce-panel-plugin.c b/libxfce4panel/xfce-panel-plugin.c
index 5decaa56a687b4fa2181b0e29a8e7ff5c3f7cc62..df6b36888f4df31cd46a11d5f1d4de4874d3a251 100644
--- a/libxfce4panel/xfce-panel-plugin.c
+++ b/libxfce4panel/xfce-panel-plugin.c
@@ -26,12 +26,11 @@
#include <glib/gstdio.h>
#include <libxfce4util/libxfce4util.h>
+#include <libxfce4panel/libxfce4panel.h>
#include <libxfce4panel/libxfce4panel-marshal.h>
-#include <libxfce4panel/xfce-panel-macros.h>
-#include <libxfce4panel/xfce-panel-enums.h>
-#include <libxfce4panel/xfce-panel-plugin.h>
#include <libxfce4panel/xfce-panel-plugin-provider.h>
+
#define XFCE_PANEL_PLUGIN_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFCE_TYPE_PANEL_PLUGIN, XfcePanelPluginPrivate))
typedef const gchar *(*ProviderToPlugin) (XfcePanelPluginProvider *provider);
@@ -870,7 +869,7 @@ xfce_panel_plugin_take_window_notify (gpointer data,
*
* Return value: the name of the panel plugin.
**/
-G_CONST_RETURN gchar *
+PANEL_SYMBOL_EXPORT G_CONST_RETURN gchar *
xfce_panel_plugin_get_name (XfcePanelPlugin *plugin)
{
g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), NULL);
@@ -886,7 +885,7 @@ xfce_panel_plugin_get_name (XfcePanelPlugin *plugin)
*
* Return value: the (translated) display name of the plugin.
**/
-G_CONST_RETURN gchar *
+PANEL_SYMBOL_EXPORT G_CONST_RETURN gchar *
xfce_panel_plugin_get_display_name (XfcePanelPlugin *plugin)
{
@@ -907,7 +906,7 @@ xfce_panel_plugin_get_display_name (XfcePanelPlugin *plugin)
*
* Return value: the unique id of the panel plugin.
**/
-G_CONST_RETURN gchar *
+PANEL_SYMBOL_EXPORT G_CONST_RETURN gchar *
xfce_panel_plugin_get_id (XfcePanelPlugin *plugin)
{
g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), NULL);
@@ -926,7 +925,7 @@ xfce_panel_plugin_get_id (XfcePanelPlugin *plugin)
*
* Since: 4.8.0
**/
-gboolean
+PANEL_SYMBOL_EXPORT gboolean
xfce_panel_plugin_get_arguments (XfcePanelPlugin *plugin,
gchar ***arguments)
{
@@ -947,7 +946,7 @@ xfce_panel_plugin_get_arguments (XfcePanelPlugin *plugin,
*
* Return value: the current size of the panel.
**/
-gint
+PANEL_SYMBOL_EXPORT gint
xfce_panel_plugin_get_size (XfcePanelPlugin *plugin)
{
g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), -1);
@@ -964,7 +963,7 @@ xfce_panel_plugin_get_size (XfcePanelPlugin *plugin)
* Return value: %TRUE when the plugin should expand,
* %FALSE otherwise.
**/
-gboolean
+PANEL_SYMBOL_EXPORT gboolean
xfce_panel_plugin_get_expand (XfcePanelPlugin *plugin)
{
g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), FALSE);
@@ -978,7 +977,7 @@ xfce_panel_plugin_get_expand (XfcePanelPlugin *plugin)
* xfce_panel_plugin_set_expand:
* @plugin : an #XfcePanelPlugin.
**/
-void
+PANEL_SYMBOL_EXPORT void
xfce_panel_plugin_set_expand (XfcePanelPlugin *plugin,
gboolean expand)
{
@@ -1007,7 +1006,7 @@ xfce_panel_plugin_set_expand (XfcePanelPlugin *plugin,
*
* Return value: the current #GtkOrientation of the panel.
**/
-GtkOrientation
+PANEL_SYMBOL_EXPORT GtkOrientation
xfce_panel_plugin_get_orientation (XfcePanelPlugin *plugin)
{
g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), GTK_ORIENTATION_HORIZONTAL);
@@ -1023,7 +1022,7 @@ xfce_panel_plugin_get_orientation (XfcePanelPlugin *plugin)
*
* Return value: the current #XfceScreenPosition of the panel.
**/
-XfceScreenPosition
+PANEL_SYMBOL_EXPORT XfceScreenPosition
xfce_panel_plugin_get_screen_position (XfcePanelPlugin *plugin)
{
g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), XFCE_SCREEN_POSITION_NONE);
@@ -1040,7 +1039,7 @@ xfce_panel_plugin_get_screen_position (XfcePanelPlugin *plugin)
*
* Since: 4.8.0
**/
-void
+PANEL_SYMBOL_EXPORT void
xfce_panel_plugin_take_window (XfcePanelPlugin *plugin,
GtkWindow *window)
{
@@ -1059,7 +1058,7 @@ xfce_panel_plugin_take_window (XfcePanelPlugin *plugin,
* @plugin : an #XfcePanelPlugin.
* @widget : a #GtkWidget.
**/
-void
+PANEL_SYMBOL_EXPORT void
xfce_panel_plugin_add_action_widget (XfcePanelPlugin *plugin,
GtkWidget *widget)
{
@@ -1077,7 +1076,7 @@ xfce_panel_plugin_add_action_widget (XfcePanelPlugin *plugin,
* @plugin : an #XfcePanelPlugin.
* @item : a #GtkMenuItem.
**/
-void
+PANEL_SYMBOL_EXPORT void
xfce_panel_plugin_menu_insert_item (XfcePanelPlugin *plugin,
GtkMenuItem *item)
{
@@ -1099,7 +1098,7 @@ xfce_panel_plugin_menu_insert_item (XfcePanelPlugin *plugin,
* xfce_panel_plugin_menu_show_configure:
* @plugin : an #XfcePanelPlugin.
**/
-void
+PANEL_SYMBOL_EXPORT void
xfce_panel_plugin_menu_show_configure (XfcePanelPlugin *plugin)
{
GtkWidget *item;
@@ -1122,7 +1121,7 @@ xfce_panel_plugin_menu_show_configure (XfcePanelPlugin *plugin)
* xfce_panel_plugin_menu_show_about:
* @plugin : an #XfcePanelPlugin.
**/
-void
+PANEL_SYMBOL_EXPORT void
xfce_panel_plugin_menu_show_about (XfcePanelPlugin *plugin)
{
GtkWidget *item;
@@ -1145,7 +1144,7 @@ xfce_panel_plugin_menu_show_about (XfcePanelPlugin *plugin)
* xfce_panel_plugin_block_menu:
* plugin : an #XfcePanelPlugin.
**/
-void
+PANEL_SYMBOL_EXPORT void
xfce_panel_plugin_block_menu (XfcePanelPlugin *plugin)
{
g_return_if_fail (XFCE_IS_PANEL_PLUGIN (plugin));
@@ -1160,7 +1159,7 @@ xfce_panel_plugin_block_menu (XfcePanelPlugin *plugin)
* xfce_panel_plugin_unblock_menu:
* plugin : an #XfcePanelPlugin.
**/
-void
+PANEL_SYMBOL_EXPORT void
xfce_panel_plugin_unblock_menu (XfcePanelPlugin *plugin)
{
g_return_if_fail (XFCE_IS_PANEL_PLUGIN (plugin));
@@ -1178,7 +1177,7 @@ xfce_panel_plugin_unblock_menu (XfcePanelPlugin *plugin)
* @plugin : an #XfcePanelPlugin.
* @menu : a #GtkMenu.
**/
-void
+PANEL_SYMBOL_EXPORT void
xfce_panel_plugin_register_menu (XfcePanelPlugin *plugin,
GtkMenu *menu)
{
@@ -1206,7 +1205,7 @@ xfce_panel_plugin_register_menu (XfcePanelPlugin *plugin,
*
* Since: 4.6.0
**/
-GtkArrowType
+PANEL_SYMBOL_EXPORT GtkArrowType
xfce_panel_plugin_arrow_type (XfcePanelPlugin *plugin)
{
XfceScreenPosition screen_position;
@@ -1259,7 +1258,7 @@ xfce_panel_plugin_arrow_type (XfcePanelPlugin *plugin)
*
* Since: 4.6.0
**/
-void
+PANEL_SYMBOL_EXPORT void
xfce_panel_plugin_position_widget (XfcePanelPlugin *plugin,
GtkWidget *menu_widget,
GtkWidget *attach_widget,
@@ -1352,7 +1351,7 @@ xfce_panel_plugin_position_widget (XfcePanelPlugin *plugin,
*
* Since: 4.6.0
**/
-void
+PANEL_SYMBOL_EXPORT void
xfce_panel_plugin_position_menu (GtkMenu *menu,
gint *x,
gint *y,
@@ -1394,7 +1393,7 @@ xfce_panel_plugin_position_menu (GtkMenu *menu,
* Returns: The path to a config file or %NULL if no file was found.
* The returned string must be freed using g_free()
**/
-gchar *
+PANEL_SYMBOL_EXPORT gchar *
xfce_panel_plugin_lookup_rc_file (XfcePanelPlugin *plugin)
{
gchar *filename, *path;
@@ -1429,7 +1428,7 @@ xfce_panel_plugin_lookup_rc_file (XfcePanelPlugin *plugin)
* Returns: The path to a config file or %NULL if no file was found.
* The returned string must be freed u sing g_free().
**/
-gchar *
+PANEL_SYMBOL_EXPORT gchar *
xfce_panel_plugin_save_location (XfcePanelPlugin *plugin,
gboolean create)
{
diff --git a/libxfce4panel/xfce-panel-plugin.h b/libxfce4panel/xfce-panel-plugin.h
index 23118aaff196a72ebeb075b57eaf4939bf5d88ca..dc6bab8fa3bda4cf834c37cf1958bfa32157461d 100644
--- a/libxfce4panel/xfce-panel-plugin.h
+++ b/libxfce4panel/xfce-panel-plugin.h
@@ -77,6 +77,7 @@ struct _XfcePanelPlugin
};
+PANEL_SYMBOL_EXPORT
GType xfce_panel_plugin_get_type (void) G_GNUC_CONST;
const gchar *xfce_panel_plugin_get_name (XfcePanelPlugin *plugin);
diff --git a/plugins/clock/clock-analog.h b/plugins/clock/clock-analog.h
index 2bca95c47ccca5988b15f5be9780b6ce8385edca..2f8296790f9d6c7b3e733f18cee7d4cd18aecea9 100644
--- a/plugins/clock/clock-analog.h
+++ b/plugins/clock/clock-analog.h
@@ -32,11 +32,11 @@ typedef struct _XfceClockAnalog XfceClockAnalog;
#define XFCE_CLOCK_IS_ANALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XFCE_CLOCK_TYPE_ANALOG))
#define XFCE_CLOCK_ANALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_CLOCK_TYPE_ANALOG, XfceClockAnalogClass))
-GType xfce_clock_analog_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
+GType xfce_clock_analog_get_type (void) G_GNUC_CONST;
-GtkWidget *xfce_clock_analog_new (void) G_GNUC_MALLOC G_GNUC_INTERNAL;
+GtkWidget *xfce_clock_analog_new (void) G_GNUC_MALLOC;
-gboolean xfce_clock_analog_update (gpointer user_data) G_GNUC_INTERNAL;
+gboolean xfce_clock_analog_update (gpointer user_data);
G_END_DECLS
diff --git a/plugins/clock/clock-binary.h b/plugins/clock/clock-binary.h
index 92f97bf998b15ca56d41eed70cc8d1e373cdd06a..87cffef833eec1199b69c21016231c95ab0ac35c 100644
--- a/plugins/clock/clock-binary.h
+++ b/plugins/clock/clock-binary.h
@@ -32,11 +32,11 @@ typedef struct _XfceClockBinary XfceClockBinary;
#define XFCE_CLOCK_IS_BINARY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XFCE_CLOCK_TYPE_BINARY))
#define XFCE_CLOCK_BINARY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_CLOCK_TYPE_BINARY, XfceClockBinaryClass))
-GType xfce_clock_binary_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
+GType xfce_clock_binary_get_type (void) G_GNUC_CONST;
-GtkWidget *xfce_clock_binary_new (void) G_GNUC_MALLOC G_GNUC_INTERNAL;
+GtkWidget *xfce_clock_binary_new (void) G_GNUC_MALLOC;
-gboolean xfce_clock_binary_update (gpointer user_data) G_GNUC_INTERNAL;
+gboolean xfce_clock_binary_update (gpointer user_data);
G_END_DECLS
diff --git a/plugins/clock/clock-dialog.h b/plugins/clock/clock-dialog.h
index 7545070e7387d561b6e3b965888a6f1bac40c9e3..742f1c1ff5aff4174b727c4ff69cc6675c833592 100644
--- a/plugins/clock/clock-dialog.h
+++ b/plugins/clock/clock-dialog.h
@@ -24,7 +24,7 @@
G_BEGIN_DECLS
-void xfce_clock_dialog_show (ClockPlugin *clock) G_GNUC_INTERNAL;
+void xfce_clock_dialog_show (ClockPlugin *clock);
G_END_DECLS
diff --git a/plugins/clock/clock-digital.h b/plugins/clock/clock-digital.h
index 94b2b2565b3dac6cf7898f467780f7ea203eb3c0..bd06cd9fe349e0c50bb4aeecbac088dc2c808423 100644
--- a/plugins/clock/clock-digital.h
+++ b/plugins/clock/clock-digital.h
@@ -32,11 +32,11 @@ typedef struct _XfceClockDigital XfceClockDigital;
#define XFCE_CLOCK_IS_DIGITAL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XFCE_CLOCK_TYPE_DIGITAL))
#define XFCE_CLOCK_DIGITAL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_CLOCK_TYPE_DIGITAL, XfceClockDigitalClass))
-GType xfce_clock_digital_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
+GType xfce_clock_digital_get_type (void) G_GNUC_CONST;
-GtkWidget *xfce_clock_digital_new (void) G_GNUC_MALLOC G_GNUC_INTERNAL;
+GtkWidget *xfce_clock_digital_new (void) G_GNUC_MALLOC;
-gboolean xfce_clock_digital_update (gpointer user_data) G_GNUC_INTERNAL;
+gboolean xfce_clock_digital_update (gpointer user_data);
G_END_DECLS
diff --git a/plugins/clock/clock-lcd.h b/plugins/clock/clock-lcd.h
index 2329628dcae6d6841bf65e4c70903bbb7d1c911b..79d552ea52fdcf2ecd978cfa8ad8f05bd3b3009c 100644
--- a/plugins/clock/clock-lcd.h
+++ b/plugins/clock/clock-lcd.h
@@ -32,11 +32,11 @@ typedef struct _XfceClockLcd XfceClockLcd;
#define XFCE_CLOCK_IS_LCD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XFCE_CLOCK_TYPE_LCD))
#define XFCE_CLOCK_LCD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_CLOCK_TYPE_LCD, XfceClockLcdClass))
-GType xfce_clock_lcd_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
+GType xfce_clock_lcd_get_type (void) G_GNUC_CONST;
-GtkWidget *xfce_clock_lcd_new (void) G_GNUC_MALLOC G_GNUC_INTERNAL;
+GtkWidget *xfce_clock_lcd_new (void) G_GNUC_MALLOC;
-gboolean xfce_clock_lcd_update (gpointer user_data) G_GNUC_INTERNAL;
+gboolean xfce_clock_lcd_update (gpointer user_data);
G_END_DECLS
diff --git a/plugins/clock/clock.h b/plugins/clock/clock.h
index ebba7fe5a76f5c1e88fce4216ed75a8e742cd3ea..baec5ffc121c6c4292bb251dd18e2bcf51f23f3f 100644
--- a/plugins/clock/clock.h
+++ b/plugins/clock/clock.h
@@ -84,21 +84,21 @@ struct _ClockPlugin
-void xfce_clock_util_get_localtime (struct tm *tm) G_GNUC_INTERNAL;
+void xfce_clock_util_get_localtime (struct tm *tm);
gchar *xfce_clock_util_strdup_strftime (const gchar *format,
- const struct tm *tm) G_GNUC_MALLOC G_GNUC_INTERNAL;
+ const struct tm *tm) G_GNUC_MALLOC;
-void xfce_clock_tooltip_sync (ClockPlugin *clock) G_GNUC_INTERNAL;
+void xfce_clock_tooltip_sync (ClockPlugin *clock);
-void xfce_clock_widget_sync (ClockPlugin *clock) G_GNUC_INTERNAL;
+void xfce_clock_widget_sync (ClockPlugin *clock);
-void xfce_clock_widget_update_settings (ClockPlugin *clock) G_GNUC_INTERNAL;
+void xfce_clock_widget_update_settings (ClockPlugin *clock);
-void xfce_clock_widget_set_mode (ClockPlugin *clock) G_GNUC_INTERNAL;
+void xfce_clock_widget_set_mode (ClockPlugin *clock);
gboolean xfce_clock_plugin_set_size (ClockPlugin *clock,
- guint size) G_GNUC_INTERNAL;
+ guint size);
G_END_DECLS
diff --git a/plugins/launcher/launcher-dialog.h b/plugins/launcher/launcher-dialog.h
index 742a1671f36f7f853213d6ba47080ea4d1b0c956..a188af6a360b2ef67ac246fa9a4d20d6beaf13bd 100644
--- a/plugins/launcher/launcher-dialog.h
+++ b/plugins/launcher/launcher-dialog.h
@@ -21,8 +21,8 @@
#ifndef __XFCE_PANEL_LAUNCHER_DIALOG_H__
#define __XFCE_PANEL_LAUNCHER_DIALOG_H__
-gboolean launcher_dialog_read_desktop_file (const gchar *path, LauncherEntry *entry) G_GNUC_INTERNAL;
+gboolean launcher_dialog_read_desktop_file (const gchar *path, LauncherEntry *entry);
-void launcher_dialog_show (LauncherPlugin *launcher) G_GNUC_INTERNAL;
+void launcher_dialog_show (LauncherPlugin *launcher);
#endif /* !__XFCE_PANEL_LAUNCHER_DIALOG_H__ */
diff --git a/plugins/launcher/launcher-exec.h b/plugins/launcher/launcher-exec.h
index c6e4899f3466be318cd728b9ab608af54b3e46d5..38fa00be34939022b3e3304b8d9800ad04504a80 100644
--- a/plugins/launcher/launcher-exec.h
+++ b/plugins/launcher/launcher-exec.h
@@ -22,8 +22,8 @@
void launcher_execute (GdkScreen *screen,
LauncherEntry *entry,
- GSList *file_list) G_GNUC_INTERNAL;
+ GSList *file_list);
void launcher_execute_from_clipboard (GdkScreen *screen,
- LauncherEntry *entry) G_GNUC_INTERNAL;
+ LauncherEntry *entry);
#endif /* !__XFCE_PANEL_EXEC_H__ */
diff --git a/plugins/launcher/launcher.h b/plugins/launcher/launcher.h
index 51bfa0e7d024e3911ffbf67ce94ac6b4b5f61bab..378fc0597c07954c1081c571f1157a7e494e2f70 100644
--- a/plugins/launcher/launcher.h
+++ b/plugins/launcher/launcher.h
@@ -109,16 +109,16 @@ static const GtkTargetEntry drop_targets[] =
-GSList *launcher_utility_filenames_from_selection_data (GtkSelectionData *selection_data) G_GNUC_MALLOC G_GNUC_INTERNAL;
+GSList *launcher_utility_filenames_from_selection_data (GtkSelectionData *selection_data) G_GNUC_MALLOC;
GdkPixbuf *launcher_utility_load_pixbuf (GdkScreen *screen,
const gchar *name,
- guint size) G_GNUC_MALLOC G_GNUC_INTERNAL;
-LauncherEntry *launcher_entry_new (void) G_GNUC_MALLOC G_GNUC_INTERNAL;
+ guint size) G_GNUC_MALLOC;
+LauncherEntry *launcher_entry_new (void) G_GNUC_MALLOC;
void launcher_entry_free (LauncherEntry *entry,
- LauncherPlugin *launcher) G_GNUC_INTERNAL;
+ LauncherPlugin *launcher);
void launcher_plugin_rebuild (LauncherPlugin *launcher,
- gboolean update_icon) G_GNUC_INTERNAL;
-void launcher_plugin_read (LauncherPlugin *launcher) G_GNUC_INTERNAL;
-void launcher_plugin_save (LauncherPlugin *launcher) G_GNUC_INTERNAL;
+ gboolean update_icon);
+void launcher_plugin_read (LauncherPlugin *launcher);
+void launcher_plugin_save (LauncherPlugin *launcher);
#endif /* !__XFCE_PANEL_LAUNCHER_H__ */
diff --git a/plugins/systray/Makefile.am b/plugins/systray/Makefile.am
index 0a83a717927a4a63ac4abac9d6180dfbfea3d9a9..f75fe2c3ef8df37992299dfb49b68d0850f79147 100644
--- a/plugins/systray/Makefile.am
+++ b/plugins/systray/Makefile.am
@@ -101,7 +101,7 @@ stamp-xfce-tray-marshal.h: $(srcdir)/xfce-tray-marshal.list Makefile
( cd $(srcdir) && glib-genmarshal \
--prefix=_xfce_tray_marshal \
--header xfce-tray-marshal.list \
- | sed -e 's/marshal_data);$$/marshal_data) G_GNUC_INTERNAL;/' ) >> xgen-xtmh \
+ | sed -e 's/marshal_data);$$/marshal_data);/' ) >> xgen-xtmh \
&& ( cmp -s xgen-xtmh xfce-tray-marshal.h || cp xgen-xtmh xfce-tray-marshal.h ) \
&& rm -f xgen-xtmh \
&& echo timestamp > $(@F)
diff --git a/plugins/systray/xfce-tray-manager.h b/plugins/systray/xfce-tray-manager.h
index 2df5cbf49e9c442413e994399bac492decbb357c..2436df87b4e0de9a2221d42f08c33a3864c004a4 100644
--- a/plugins/systray/xfce-tray-manager.h
+++ b/plugins/systray/xfce-tray-manager.h
@@ -51,26 +51,26 @@ enum
-GType xfce_tray_manager_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
+GType xfce_tray_manager_get_type (void) G_GNUC_CONST;
-GQuark xfce_tray_manager_error_quark (void) G_GNUC_INTERNAL;
+GQuark xfce_tray_manager_error_quark (void);
-XfceTrayManager *xfce_tray_manager_new (void) G_GNUC_MALLOC G_GNUC_INTERNAL;
+XfceTrayManager *xfce_tray_manager_new (void) G_GNUC_MALLOC;
-gboolean xfce_tray_manager_check_running (GdkScreen *screen) G_GNUC_INTERNAL;
+gboolean xfce_tray_manager_check_running (GdkScreen *screen);
gboolean xfce_tray_manager_register (XfceTrayManager *manager,
GdkScreen *screen,
- GError **error) G_GNUC_INTERNAL;
+ GError **error);
-void xfce_tray_manager_unregister (XfceTrayManager *manager) G_GNUC_INTERNAL;
+void xfce_tray_manager_unregister (XfceTrayManager *manager);
-GtkOrientation xfce_tray_manager_get_orientation (XfceTrayManager *manager) G_GNUC_INTERNAL;
+GtkOrientation xfce_tray_manager_get_orientation (XfceTrayManager *manager);
void xfce_tray_manager_set_orientation (XfceTrayManager *manager,
- GtkOrientation orientation) G_GNUC_INTERNAL;
+ GtkOrientation orientation);
-gchar *xfce_tray_manager_get_application_name (GtkWidget *socket) G_GNUC_MALLOC G_GNUC_INTERNAL;
+gchar *xfce_tray_manager_get_application_name (GtkWidget *socket) G_GNUC_MALLOC;
#endif /* !__XFCE_TRAY_MANAGER_H__ */
diff --git a/plugins/systray/xfce-tray-widget.h b/plugins/systray/xfce-tray-widget.h
index 7613caa4bea44b8beaca9db722e757bc4d5c4269..d0ab47def2c8de2dac12dc5b0fca5fe5e8ea8f49 100644
--- a/plugins/systray/xfce-tray-widget.h
+++ b/plugins/systray/xfce-tray-widget.h
@@ -33,37 +33,37 @@ typedef struct _XfceTrayWidgetChild XfceTrayWidgetChild;
#define XFCE_IS_TRAY_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XFCE_TYPE_TRAY_WIDGET))
#define XFCE_TRAY_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_TYPE_TRAY_WIDGET, XfceTrayWidgetClass))
-GType xfce_tray_widget_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
+GType xfce_tray_widget_get_type (void) G_GNUC_CONST;
-GtkWidget *xfce_tray_widget_new (void) G_GNUC_MALLOC G_GNUC_INTERNAL;
+GtkWidget *xfce_tray_widget_new (void) G_GNUC_MALLOC;
void xfce_tray_widget_add_with_name (XfceTrayWidget *tray,
GtkWidget *child,
- const gchar *name) G_GNUC_INTERNAL;
+ const gchar *name);
void xfce_tray_widget_set_arrow_type (XfceTrayWidget *tray,
- GtkArrowType arrow_type) G_GNUC_INTERNAL;
+ GtkArrowType arrow_type);
-GtkArrowType xfce_tray_widget_get_arrow_type (XfceTrayWidget *tray) G_GNUC_INTERNAL;
+GtkArrowType xfce_tray_widget_get_arrow_type (XfceTrayWidget *tray);
void xfce_tray_widget_set_rows (XfceTrayWidget *tray,
- gint rows) G_GNUC_INTERNAL;
+ gint rows);
-gint xfce_tray_widget_get_rows (XfceTrayWidget *tray) G_GNUC_INTERNAL;
+gint xfce_tray_widget_get_rows (XfceTrayWidget *tray);
void xfce_tray_widget_name_add (XfceTrayWidget *tray,
const gchar *name,
- gboolean hidden) G_GNUC_INTERNAL;
+ gboolean hidden);
void xfce_tray_widget_name_update (XfceTrayWidget *tray,
const gchar *name,
- gboolean hidden) G_GNUC_INTERNAL;
+ gboolean hidden);
gboolean xfce_tray_widget_name_hidden (XfceTrayWidget *tray,
- const gchar *name) G_GNUC_INTERNAL;
+ const gchar *name);
-GList *xfce_tray_widget_name_list (XfceTrayWidget *tray) G_GNUC_MALLOC G_GNUC_INTERNAL;
+GList *xfce_tray_widget_name_list (XfceTrayWidget *tray) G_GNUC_MALLOC;
-void xfce_tray_widget_clear_name_list (XfceTrayWidget *tray) G_GNUC_INTERNAL;
+void xfce_tray_widget_clear_name_list (XfceTrayWidget *tray);
#endif /* !__XFCE_TRAY_WIDGET_H__ */
diff --git a/plugins/tasklist.new/tasklist-box.h b/plugins/tasklist.new/tasklist-box.h
index 03213d9edf364659984f7fadc230d27266e9a48c..4fcccc27b7d7b0c0d0c388e937b7652716d00f3c 100644
--- a/plugins/tasklist.new/tasklist-box.h
+++ b/plugins/tasklist.new/tasklist-box.h
@@ -32,7 +32,7 @@ typedef struct _TasklistBox TasklistBox;
#define TASKLIST_IS_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TASKLIST_TYPE_BOX))
#define TASKLIST_BOX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TASKLIST_TYPE_BOX, TasklistBoxClass))
-GType tasklist_box_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
+GType tasklist_box_get_type (void) G_GNUC_CONST;
G_END_DECLS
diff --git a/plugins/tasklist.new/tasklist-plugin.h b/plugins/tasklist.new/tasklist-plugin.h
index 4c66930f173716b20a1dc2cab0cd4c973cff4d7d..5821408edf9f1ca1a73927055ae4ee2fbbd31ba5 100644
--- a/plugins/tasklist.new/tasklist-plugin.h
+++ b/plugins/tasklist.new/tasklist-plugin.h
@@ -32,7 +32,7 @@ typedef struct _TasklistPlugin TasklistPlugin;
#define TASKLIST_IS_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TASKLIST_TYPE_PLUGIN))
#define TASKLIST_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TASKLIST_TYPE_PLUGIN, TasklistPluginClass))
-GType tasklist_plugin_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
+GType tasklist_plugin_get_type (void) G_GNUC_CONST;
G_END_DECLS
diff --git a/plugins/tasklist/tasklist-dialogs.h b/plugins/tasklist/tasklist-dialogs.h
index 917a8055a45391a3138aa8126ba4624b9b7eceb0..fd85971bec31c9fe5dad892c19873b275151c280 100644
--- a/plugins/tasklist/tasklist-dialogs.h
+++ b/plugins/tasklist/tasklist-dialogs.h
@@ -20,6 +20,6 @@
#ifndef __TASKLIST_DIALOGS_H__
#define __TASKLIST_DIALOGS_H__
-void tasklist_dialogs_configure (TasklistPlugin *tasklist) G_GNUC_INTERNAL;
+void tasklist_dialogs_configure (TasklistPlugin *tasklist);
#endif /* !__TASKLIST_DIALOGS_H__ */
diff --git a/plugins/tasklist/tasklist.h b/plugins/tasklist/tasklist.h
index 989421dba41d86ce0d33fa26dfb7c7fbd3eb595c..f73953ec1093a450f98d53787c3e0162fe24c1b0 100644
--- a/plugins/tasklist/tasklist.h
+++ b/plugins/tasklist/tasklist.h
@@ -58,7 +58,7 @@ struct _TasklistPlugin
};
-void tasklist_plugin_write (TasklistPlugin *tasklist) G_GNUC_INTERNAL;
-gboolean tasklist_using_xinerama (XfcePanelPlugin *panel_plugin) G_GNUC_INTERNAL;
+void tasklist_plugin_write (TasklistPlugin *tasklist);
+gboolean tasklist_using_xinerama (XfcePanelPlugin *panel_plugin);
#endif /* !__TASKLIST_H__ */