[Xfce4-commits] <xfce4-panel:devel> Drop the visibility stuff and use a symbols regex for private functions.
Nick Schermer
noreply at xfce.org
Fri Sep 25 21:58:02 CEST 2009
Updating branch refs/heads/devel
to 726623393567929d13d7539425ecc9d750558e01 (commit)
from 8a230770671f7db9c1e43528c302001dad902f7e (commit)
commit 726623393567929d13d7539425ecc9d750558e01
Author: Nick Schermer <nick at xfce.org>
Date: Fri Sep 25 21:53:30 2009 +0200
Drop the visibility stuff and use a symbols regex for private functions.
libxfce4panel/Makefile.am | 1 +
libxfce4panel/libxfce4panel.h | 53 +++++++++++++--------------
libxfce4panel/xfce-arrow-button.c | 10 +++---
libxfce4panel/xfce-arrow-button.h | 1 -
libxfce4panel/xfce-hvbox.c | 6 ++--
libxfce4panel/xfce-hvbox.h | 1 -
libxfce4panel/xfce-panel-convenience.c | 6 ++--
libxfce4panel/xfce-panel-image.c | 10 +++---
libxfce4panel/xfce-panel-image.h | 1 -
libxfce4panel/xfce-panel-macros.h | 7 ----
libxfce4panel/xfce-panel-plugin-provider.c | 22 ++++++------
libxfce4panel/xfce-panel-plugin-provider.h | 1 -
libxfce4panel/xfce-panel-plugin.c | 52 +++++++++++++-------------
libxfce4panel/xfce-panel-plugin.h | 1 -
14 files changed, 80 insertions(+), 92 deletions(-)
diff --git a/libxfce4panel/Makefile.am b/libxfce4panel/Makefile.am
index ff46839..c03c1a9 100644
--- a/libxfce4panel/Makefile.am
+++ b/libxfce4panel/Makefile.am
@@ -50,6 +50,7 @@ libxfce4panel_la_LDFLAGS = \
-no-undefined \
-export-dynamic \
-version-info $(LIBXFCE4PANEL_VERINFO) \
+ -export-symbols-regex '^[^_].*' \
$(PLATFORM_LDFLAGS)
libxfce4panel_la_LIBADD = \
diff --git a/libxfce4panel/libxfce4panel.h b/libxfce4panel/libxfce4panel.h
index b16d10a..057d764 100644
--- a/libxfce4panel/libxfce4panel.h
+++ b/libxfce4panel/libxfce4panel.h
@@ -86,13 +86,13 @@ G_BEGIN_DECLS
}
#define _XPP_DEFINE_PLUGIN(TypeName, type_name, resident, args...) \
- GType __xpp_init (GTypeModule *type_module, gboolean *make_resident); \
+ GType xfce_panel_module_init (GTypeModule *type_module, gboolean *make_resident); \
\
XFCE_PANEL_DEFINE_TYPE (TypeName, type_name, XFCE_TYPE_PANEL_PLUGIN) \
\
- PANEL_SYMBOL_EXPORT G_MODULE_EXPORT GType \
- __xpp_init (GTypeModule *type_module, \
- gboolean *make_resident) \
+ G_MODULE_EXPORT GType \
+ xfce_panel_module_init (GTypeModule *type_module, \
+ gboolean *make_resident) \
{ \
typedef void (*XppRegFunc) (GTypeModule *module); \
XppRegFunc reg_funcs[] = { type_name##_register_type, args }; \
@@ -151,12 +151,11 @@ typedef gboolean (*XfcePanelPluginCheck) (GdkScreen *screen);
**/
#define XFCE_PANEL_PLUGIN_REGISTER_FULL(construct_func, preinit_func, check_func) \
XFCE_PANEL_PLUGIN_REGISTER_EXTENDED (construct_func, \
- PANEL_SYMBOL_EXPORT G_MODULE_EXPORT gboolean \
- __xpp_preinit (gint argc, \
- gchar **argv); \
- PANEL_SYMBOL_EXPORT G_MODULE_EXPORT gboolean \
- __xpp_preinit (gint argc, \
- gchar **argv) \
+ G_MODULE_EXPORT gboolean xfce_panel_module_preinit (gint argc, gchar **argv); \
+ \
+ G_MODULE_EXPORT gboolean \
+ xfce_panel_module_preinit (gint argc, \
+ gchar **argv) \
{ \
return (*preinit_func) (argc, argv); \
}, \
@@ -166,32 +165,32 @@ typedef gboolean (*XfcePanelPluginCheck) (GdkScreen *screen);
/* <private> */
#define XFCE_PANEL_PLUGIN_REGISTER_EXTENDED(construct_func, PREINIT_CODE, CHECK_CODE) \
static void \
- __xpp_realize (XfcePanelPlugin *xpp) \
+ xfce_panel_module_realize (XfcePanelPlugin *xpp) \
{ \
panel_return_if_fail (XFCE_IS_PANEL_PLUGIN (xpp)); \
\
g_signal_handlers_disconnect_by_func (G_OBJECT (xpp), \
- G_CALLBACK (__xpp_realize), NULL); \
+ G_CALLBACK (xfce_panel_module_realize), NULL); \
\
(*construct_func) (xpp); \
} \
\
PREINIT_CODE \
\
- PANEL_SYMBOL_EXPORT G_MODULE_EXPORT XfcePanelPlugin * \
- __xpp_construct (const gchar *xpp_name, \
- gint xpp_unique_id, \
- const gchar *xpp_display_name, \
- const gchar *xpp_comment, \
- gchar **xpp_arguments, \
- GdkScreen *xpp_screen); \
- PANEL_SYMBOL_EXPORT G_MODULE_EXPORT XfcePanelPlugin * \
- __xpp_construct (const gchar *xpp_name, \
- gint xpp_unique_id, \
- const gchar *xpp_display_name, \
- const gchar *xpp_comment, \
- gchar **xpp_arguments, \
- GdkScreen *xpp_screen) \
+ G_MODULE_EXPORT XfcePanelPlugin * \
+ xfce_panel_module_construct (const gchar *xpp_name, \
+ gint xpp_unique_id, \
+ const gchar *xpp_display_name, \
+ const gchar *xpp_comment, \
+ gchar **xpp_arguments, \
+ GdkScreen *xpp_screen); \
+ G_MODULE_EXPORT XfcePanelPlugin * \
+ xfce_panel_module_construct (const gchar *xpp_name, \
+ gint xpp_unique_id, \
+ const gchar *xpp_display_name, \
+ const gchar *xpp_comment, \
+ gchar **xpp_arguments, \
+ GdkScreen *xpp_screen) \
{ \
XfcePanelPlugin *xpp = NULL; \
\
@@ -208,7 +207,7 @@ typedef gboolean (*XfcePanelPluginCheck) (GdkScreen *screen);
"arguments", xpp_arguments, NULL); \
\
g_signal_connect_after (G_OBJECT (xpp), "realize", \
- G_CALLBACK (__xpp_realize), NULL); \
+ G_CALLBACK (xfce_panel_module_realize), NULL); \
} \
\
return xpp; \
diff --git a/libxfce4panel/xfce-arrow-button.c b/libxfce4panel/xfce-arrow-button.c
index 46a9d56..59c1e31 100644
--- a/libxfce4panel/xfce-arrow-button.c
+++ b/libxfce4panel/xfce-arrow-button.c
@@ -409,7 +409,7 @@ xfce_arrow_button_blinking_timeout_destroyed (gpointer user_data)
*
* Returns: The newly created #XfceArrowButton widget.
**/
-PANEL_SYMBOL_EXPORT GtkWidget *
+GtkWidget *
xfce_arrow_button_new (GtkArrowType arrow_type)
{
return g_object_new (XFCE_TYPE_ARROW_BUTTON,
@@ -427,7 +427,7 @@ xfce_arrow_button_new (GtkArrowType arrow_type)
*
* Returns: the #GtkArrowType of @button.
**/
-PANEL_SYMBOL_EXPORT GtkArrowType
+GtkArrowType
xfce_arrow_button_get_arrow_type (XfceArrowButton *button)
{
g_return_val_if_fail (XFCE_IS_ARROW_BUTTON (button), GTK_ARROW_UP);
@@ -443,7 +443,7 @@ xfce_arrow_button_get_arrow_type (XfceArrowButton *button)
*
* Sets the arrow type for @button.
**/
-PANEL_SYMBOL_EXPORT void
+void
xfce_arrow_button_set_arrow_type (XfceArrowButton *button,
GtkArrowType arrow_type)
{
@@ -477,7 +477,7 @@ xfce_arrow_button_set_arrow_type (XfceArrowButton *button,
*
* Returns: %TRUE when @button is blinking.
**/
-PANEL_SYMBOL_EXPORT gboolean
+gboolean
xfce_arrow_button_get_blinking (XfceArrowButton *button)
{
g_return_val_if_fail (XFCE_IS_ARROW_BUTTON (button), FALSE);
@@ -494,7 +494,7 @@ xfce_arrow_button_get_blinking (XfceArrowButton *button)
*
* Make the button blink.
**/
-PANEL_SYMBOL_EXPORT void
+void
xfce_arrow_button_set_blinking (XfceArrowButton *button,
gboolean blinking)
{
diff --git a/libxfce4panel/xfce-arrow-button.h b/libxfce4panel/xfce-arrow-button.h
index 1f47dcf..226d2a2 100644
--- a/libxfce4panel/xfce-arrow-button.h
+++ b/libxfce4panel/xfce-arrow-button.h
@@ -59,7 +59,6 @@ struct _XfceArrowButton
XfceArrowButtonPrivate *priv;
};
-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 39099d7..9d88cdc 100644
--- a/libxfce4panel/xfce-hvbox.c
+++ b/libxfce4panel/xfce-hvbox.c
@@ -203,7 +203,7 @@ xfce_hvbox_size_allocate (GtkWidget *widget,
*
* Return value: the newly allocated #XfceHVBox container widget.
**/
-PANEL_SYMBOL_EXPORT GtkWidget *
+GtkWidget *
xfce_hvbox_new (GtkOrientation orientation,
gboolean homogeneous,
gint spacing)
@@ -233,7 +233,7 @@ xfce_hvbox_new (GtkOrientation orientation,
*
* Set the new orientation of the #XfceHVBox container widget.
**/
-PANEL_SYMBOL_EXPORT void
+void
xfce_hvbox_set_orientation (XfceHVBox *hvbox,
GtkOrientation orientation)
{
@@ -260,7 +260,7 @@ xfce_hvbox_set_orientation (XfceHVBox *hvbox,
*
* Returns the current orientation of the #XfceHVBox.
**/
-PANEL_SYMBOL_EXPORT GtkOrientation
+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 ee7c3a1..d6c0750 100644
--- a/libxfce4panel/xfce-hvbox.h
+++ b/libxfce4panel/xfce-hvbox.h
@@ -57,7 +57,6 @@ 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 4d7900b..1a69077 100644
--- a/libxfce4panel/xfce-panel-convenience.c
+++ b/libxfce4panel/xfce-panel-convenience.c
@@ -35,7 +35,7 @@
*
* Returns: newly created #GtkButton.
**/
-PANEL_SYMBOL_EXPORT GtkWidget *
+GtkWidget *
xfce_panel_create_button (void)
{
GtkWidget *button = gtk_button_new ();
@@ -59,7 +59,7 @@ xfce_panel_create_button (void)
*
* Returns: newly created #GtkToggleButton.
**/
-PANEL_SYMBOL_EXPORT GtkWidget *
+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.
**/
-PANEL_SYMBOL_EXPORT gboolean
+gboolean
xfce_panel_allow_customization (void)
{
static gboolean allow_customization = FALSE;
diff --git a/libxfce4panel/xfce-panel-image.c b/libxfce4panel/xfce-panel-image.c
index f1952e1..4df3707 100644
--- a/libxfce4panel/xfce-panel-image.c
+++ b/libxfce4panel/xfce-panel-image.c
@@ -458,7 +458,7 @@ xfce_panel_image_scale_pixbuf (GdkPixbuf *source,
-PANEL_SYMBOL_EXPORT GtkWidget *
+GtkWidget *
xfce_panel_image_new (void)
{
return g_object_new (XFCE_TYPE_PANEL_IMAGE, NULL);
@@ -466,7 +466,7 @@ xfce_panel_image_new (void)
-PANEL_SYMBOL_EXPORT GtkWidget *
+GtkWidget *
xfce_panel_image_new_from_pixbuf (GdkPixbuf *pixbuf)
{
g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
@@ -477,7 +477,7 @@ xfce_panel_image_new_from_pixbuf (GdkPixbuf *pixbuf)
-PANEL_SYMBOL_EXPORT GtkWidget *
+GtkWidget *
xfce_panel_image_new_from_source (const gchar *source)
{
g_return_val_if_fail (IS_STRING (source), NULL);
@@ -488,7 +488,7 @@ xfce_panel_image_new_from_source (const gchar *source)
-PANEL_SYMBOL_EXPORT void
+void
xfce_panel_image_set_from_pixbuf (XfcePanelImage *image,
GdkPixbuf *pixbuf)
{
@@ -508,7 +508,7 @@ xfce_panel_image_set_from_pixbuf (XfcePanelImage *image,
-PANEL_SYMBOL_EXPORT void
+void
xfce_panel_image_set_from_source (XfcePanelImage *image,
const gchar *source)
{
diff --git a/libxfce4panel/xfce-panel-image.h b/libxfce4panel/xfce-panel-image.h
index 64dd823..c3367ff 100644
--- a/libxfce4panel/xfce-panel-image.h
+++ b/libxfce4panel/xfce-panel-image.h
@@ -58,7 +58,6 @@ struct _XfcePanelImage
#define XFCE_IS_PANEL_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XFCE_TYPE_PANEL_IMAGE))
#define XFCE_PANEL_IMAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_TYPE_PANEL_IMAGE, XfcePanelImageClass))
-PANEL_SYMBOL_EXPORT
GType xfce_panel_image_get_type (void) G_GNUC_CONST;
GtkWidget *xfce_panel_image_new (void) G_GNUC_MALLOC;
diff --git a/libxfce4panel/xfce-panel-macros.h b/libxfce4panel/xfce-panel-macros.h
index 6832569..1909f70 100644
--- a/libxfce4panel/xfce-panel-macros.h
+++ b/libxfce4panel/xfce-panel-macros.h
@@ -73,13 +73,6 @@ 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.6 */
#ifndef XFCE_DISABLE_DEPRECATED
diff --git a/libxfce4panel/xfce-panel-plugin-provider.c b/libxfce4panel/xfce-panel-plugin-provider.c
index 5d583a0..5854e75 100644
--- a/libxfce4panel/xfce-panel-plugin-provider.c
+++ b/libxfce4panel/xfce-panel-plugin-provider.c
@@ -77,7 +77,7 @@ xfce_panel_plugin_provider_class_init (gpointer klass)
-PANEL_SYMBOL_EXPORT const gchar *
+const gchar *
xfce_panel_plugin_provider_get_name (XfcePanelPluginProvider *provider)
{
panel_return_val_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider), NULL);
@@ -87,7 +87,7 @@ xfce_panel_plugin_provider_get_name (XfcePanelPluginProvider *provider)
-PANEL_SYMBOL_EXPORT gint
+gint
xfce_panel_plugin_provider_get_unique_id (XfcePanelPluginProvider *provider)
{
panel_return_val_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider), -1);
@@ -97,7 +97,7 @@ xfce_panel_plugin_provider_get_unique_id (XfcePanelPluginProvider *provider)
-PANEL_SYMBOL_EXPORT void
+void
xfce_panel_plugin_provider_set_size (XfcePanelPluginProvider *provider,
gint size)
{
@@ -108,7 +108,7 @@ xfce_panel_plugin_provider_set_size (XfcePanelPluginProvider *provider,
-PANEL_SYMBOL_EXPORT void
+void
xfce_panel_plugin_provider_set_orientation (XfcePanelPluginProvider *provider,
GtkOrientation orientation)
{
@@ -119,7 +119,7 @@ xfce_panel_plugin_provider_set_orientation (XfcePanelPluginProvider *provider,
-PANEL_SYMBOL_EXPORT void
+void
xfce_panel_plugin_provider_set_screen_position (XfcePanelPluginProvider *provider,
XfceScreenPosition screen_position)
{
@@ -130,7 +130,7 @@ xfce_panel_plugin_provider_set_screen_position (XfcePanelPluginProvider *provide
-PANEL_SYMBOL_EXPORT void
+void
xfce_panel_plugin_provider_save (XfcePanelPluginProvider *provider)
{
panel_return_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider));
@@ -140,7 +140,7 @@ xfce_panel_plugin_provider_save (XfcePanelPluginProvider *provider)
-PANEL_SYMBOL_EXPORT void
+void
xfce_panel_plugin_provider_emit_signal (XfcePanelPluginProvider *provider,
XfcePanelPluginProviderSignal provider_signal)
{
@@ -152,7 +152,7 @@ xfce_panel_plugin_provider_emit_signal (XfcePanelPluginProvider *provider,
-PANEL_SYMBOL_EXPORT gboolean
+gboolean
xfce_panel_plugin_provider_get_show_configure (XfcePanelPluginProvider *provider)
{
panel_return_val_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider), FALSE);
@@ -162,7 +162,7 @@ xfce_panel_plugin_provider_get_show_configure (XfcePanelPluginProvider *provider
-PANEL_SYMBOL_EXPORT void
+void
xfce_panel_plugin_provider_show_configure (XfcePanelPluginProvider *provider)
{
panel_return_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider));
@@ -172,7 +172,7 @@ xfce_panel_plugin_provider_show_configure (XfcePanelPluginProvider *provider)
-PANEL_SYMBOL_EXPORT gboolean
+gboolean
xfce_panel_plugin_provider_get_show_about (XfcePanelPluginProvider *provider)
{
panel_return_val_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider), FALSE);
@@ -182,7 +182,7 @@ xfce_panel_plugin_provider_get_show_about (XfcePanelPluginProvider *provider)
-PANEL_SYMBOL_EXPORT void
+void
xfce_panel_plugin_provider_show_about (XfcePanelPluginProvider *provider)
{
panel_return_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider));
diff --git a/libxfce4panel/xfce-panel-plugin-provider.h b/libxfce4panel/xfce-panel-plugin-provider.h
index 097a4da..d433c0c 100644
--- a/libxfce4panel/xfce-panel-plugin-provider.h
+++ b/libxfce4panel/xfce-panel-plugin-provider.h
@@ -93,7 +93,6 @@ 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 ac04abd..70b50d7 100644
--- a/libxfce4panel/xfce-panel-plugin.c
+++ b/libxfce4panel/xfce-panel-plugin.c
@@ -1170,7 +1170,7 @@ xfce_panel_plugin_take_window_notify (gpointer data,
*
* Return value: the name of the panel plugin.
**/
-PANEL_SYMBOL_EXPORT const gchar *
+const gchar *
xfce_panel_plugin_get_name (XfcePanelPlugin *plugin)
{
g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), NULL);
@@ -1187,7 +1187,7 @@ xfce_panel_plugin_get_name (XfcePanelPlugin *plugin)
*
* Return value: the (translated) display name of the plugin.
**/
-PANEL_SYMBOL_EXPORT const gchar *
+const gchar *
xfce_panel_plugin_get_display_name (XfcePanelPlugin *plugin)
{
g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), NULL);
@@ -1201,7 +1201,7 @@ xfce_panel_plugin_get_display_name (XfcePanelPlugin *plugin)
-PANEL_SYMBOL_EXPORT const gchar *
+const gchar *
xfce_panel_plugin_get_comment (XfcePanelPlugin *plugin)
{
g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), NULL);
@@ -1220,7 +1220,7 @@ xfce_panel_plugin_get_comment (XfcePanelPlugin *plugin)
*
* Since 4.8
**/
-PANEL_SYMBOL_EXPORT gint
+gint
xfce_panel_plugin_get_unique_id (XfcePanelPlugin *plugin)
{
g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), -1);
@@ -1240,7 +1240,7 @@ xfce_panel_plugin_get_unique_id (XfcePanelPlugin *plugin)
* See also: xfconf_channel_new_with_property_base() and
* XFCE_PANEL_PLUGIN_CHANNEL_NAME.
**/
-PANEL_SYMBOL_EXPORT const gchar *
+const gchar *
xfce_panel_plugin_get_property_base (XfcePanelPlugin *plugin)
{
g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), NULL);
@@ -1265,7 +1265,7 @@ xfce_panel_plugin_get_property_base (XfcePanelPlugin *plugin)
*
* Since: 4.8.0
**/
-PANEL_SYMBOL_EXPORT const gchar * const *
+const gchar * const *
xfce_panel_plugin_get_arguments (XfcePanelPlugin *plugin)
{
g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), NULL);
@@ -1282,7 +1282,7 @@ xfce_panel_plugin_get_arguments (XfcePanelPlugin *plugin)
*
* Return value: the current size of the panel.
**/
-PANEL_SYMBOL_EXPORT gint
+gint
xfce_panel_plugin_get_size (XfcePanelPlugin *plugin)
{
g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), -1);
@@ -1301,7 +1301,7 @@ xfce_panel_plugin_get_size (XfcePanelPlugin *plugin)
* Return value: %TRUE when the plugin should expand,
* %FALSE otherwise.
**/
-PANEL_SYMBOL_EXPORT gboolean
+gboolean
xfce_panel_plugin_get_expand (XfcePanelPlugin *plugin)
{
g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), FALSE);
@@ -1316,7 +1316,7 @@ xfce_panel_plugin_get_expand (XfcePanelPlugin *plugin)
* xfce_panel_plugin_set_expand:
* @plugin : an #XfcePanelPlugin.
**/
-PANEL_SYMBOL_EXPORT void
+void
xfce_panel_plugin_set_expand (XfcePanelPlugin *plugin,
gboolean expand)
{
@@ -1350,7 +1350,7 @@ xfce_panel_plugin_set_expand (XfcePanelPlugin *plugin,
*
* Return value: the current #GtkOrientation of the panel.
**/
-PANEL_SYMBOL_EXPORT GtkOrientation
+GtkOrientation
xfce_panel_plugin_get_orientation (XfcePanelPlugin *plugin)
{
g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), GTK_ORIENTATION_HORIZONTAL);
@@ -1367,7 +1367,7 @@ xfce_panel_plugin_get_orientation (XfcePanelPlugin *plugin)
*
* Return value: the current #XfceScreenPosition of the panel.
**/
-PANEL_SYMBOL_EXPORT XfceScreenPosition
+XfceScreenPosition
xfce_panel_plugin_get_screen_position (XfcePanelPlugin *plugin)
{
g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), XFCE_SCREEN_POSITION_NONE);
@@ -1385,7 +1385,7 @@ xfce_panel_plugin_get_screen_position (XfcePanelPlugin *plugin)
*
* Since: 4.8.0
**/
-PANEL_SYMBOL_EXPORT void
+void
xfce_panel_plugin_take_window (XfcePanelPlugin *plugin,
GtkWindow *window)
{
@@ -1406,7 +1406,7 @@ xfce_panel_plugin_take_window (XfcePanelPlugin *plugin,
* @plugin : an #XfcePanelPlugin.
* @widget : a #GtkWidget.
**/
-PANEL_SYMBOL_EXPORT void
+void
xfce_panel_plugin_add_action_widget (XfcePanelPlugin *plugin,
GtkWidget *widget)
{
@@ -1425,7 +1425,7 @@ xfce_panel_plugin_add_action_widget (XfcePanelPlugin *plugin,
* @plugin : an #XfcePanelPlugin.
* @item : a #GtkMenuItem.
**/
-PANEL_SYMBOL_EXPORT void
+void
xfce_panel_plugin_menu_insert_item (XfcePanelPlugin *plugin,
GtkMenuItem *item)
{
@@ -1447,7 +1447,7 @@ xfce_panel_plugin_menu_insert_item (XfcePanelPlugin *plugin,
* xfce_panel_plugin_menu_show_configure:
* @plugin : an #XfcePanelPlugin.
**/
-PANEL_SYMBOL_EXPORT void
+void
xfce_panel_plugin_menu_show_configure (XfcePanelPlugin *plugin)
{
GtkMenu *menu;
@@ -1480,7 +1480,7 @@ xfce_panel_plugin_menu_show_configure (XfcePanelPlugin *plugin)
* xfce_panel_plugin_menu_show_about:
* @plugin : an #XfcePanelPlugin.
**/
-PANEL_SYMBOL_EXPORT void
+void
xfce_panel_plugin_menu_show_about (XfcePanelPlugin *plugin)
{
GtkMenu *menu;
@@ -1513,7 +1513,7 @@ xfce_panel_plugin_menu_show_about (XfcePanelPlugin *plugin)
* xfce_panel_plugin_block_menu:
* plugin : an #XfcePanelPlugin.
**/
-PANEL_SYMBOL_EXPORT void
+void
xfce_panel_plugin_block_menu (XfcePanelPlugin *plugin)
{
g_return_if_fail (XFCE_IS_PANEL_PLUGIN (plugin));
@@ -1528,7 +1528,7 @@ xfce_panel_plugin_block_menu (XfcePanelPlugin *plugin)
* xfce_panel_plugin_unblock_menu:
* plugin : an #XfcePanelPlugin.
**/
-PANEL_SYMBOL_EXPORT void
+void
xfce_panel_plugin_unblock_menu (XfcePanelPlugin *plugin)
{
g_return_if_fail (XFCE_IS_PANEL_PLUGIN (plugin));
@@ -1546,7 +1546,7 @@ xfce_panel_plugin_unblock_menu (XfcePanelPlugin *plugin)
* @plugin : an #XfcePanelPlugin.
* @menu : a #GtkMenu.
**/
-PANEL_SYMBOL_EXPORT void
+void
xfce_panel_plugin_register_menu (XfcePanelPlugin *plugin,
GtkMenu *menu)
{
@@ -1577,7 +1577,7 @@ xfce_panel_plugin_register_menu (XfcePanelPlugin *plugin,
*
* Since: 4.6.0
**/
-PANEL_SYMBOL_EXPORT GtkArrowType
+GtkArrowType
xfce_panel_plugin_arrow_type (XfcePanelPlugin *plugin)
{
XfceScreenPosition screen_position;
@@ -1631,7 +1631,7 @@ xfce_panel_plugin_arrow_type (XfcePanelPlugin *plugin)
*
* Since: 4.6.0
**/
-PANEL_SYMBOL_EXPORT void
+void
xfce_panel_plugin_position_widget (XfcePanelPlugin *plugin,
GtkWidget *menu_widget,
GtkWidget *attach_widget,
@@ -1723,7 +1723,7 @@ xfce_panel_plugin_position_widget (XfcePanelPlugin *plugin,
*
* Since: 4.6.0
**/
-PANEL_SYMBOL_EXPORT void
+void
xfce_panel_plugin_position_menu (GtkMenu *menu,
gint *x,
gint *y,
@@ -1752,7 +1752,7 @@ xfce_panel_plugin_position_menu (GtkMenu *menu,
-PANEL_SYMBOL_EXPORT void
+void
xfce_panel_plugin_focus_widget (XfcePanelPlugin *plugin,
GtkWidget *widget)
{
@@ -1770,7 +1770,7 @@ xfce_panel_plugin_focus_widget (XfcePanelPlugin *plugin,
-PANEL_SYMBOL_EXPORT void
+void
xfce_panel_plugin_block_autohide (XfcePanelPlugin *plugin,
gboolean blocked)
{
@@ -1827,7 +1827,7 @@ xfce_panel_plugin_block_autohide (XfcePanelPlugin *plugin,
* Returns: The path to a config file or %NULL if no file was found.
* The returned string must be freed using g_free()
**/
-PANEL_SYMBOL_EXPORT gchar *
+gchar *
xfce_panel_plugin_lookup_rc_file (XfcePanelPlugin *plugin)
{
gchar *filename, *path;
@@ -1863,7 +1863,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().
**/
-PANEL_SYMBOL_EXPORT gchar *
+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 1839516..3c8b812 100644
--- a/libxfce4panel/xfce-panel-plugin.h
+++ b/libxfce4panel/xfce-panel-plugin.h
@@ -77,7 +77,6 @@ struct _XfcePanelPlugin
-PANEL_SYMBOL_EXPORT
GType xfce_panel_plugin_get_type (void) G_GNUC_CONST;
const gchar *xfce_panel_plugin_get_name (XfcePanelPlugin *plugin) G_GNUC_PURE;
More information about the Xfce4-commits
mailing list