Browse Source

Drop G_CONST_RETURN macro.

upstream/xfce4-panel-4.10.1
Nick Schermer 12 years ago
parent
commit
afb54ab8fd
  1. 2
      libxfce4panel/libxfce4panel-config.c
  2. 6
      libxfce4panel/libxfce4panel-config.h.in
  3. 2
      libxfce4panel/xfce-panel-plugin-provider.c
  4. 2
      libxfce4panel/xfce-panel-plugin-provider.h
  5. 10
      libxfce4panel/xfce-panel-plugin.c
  6. 11
      libxfce4panel/xfce-panel-plugin.h

2
libxfce4panel/libxfce4panel-config.c

@ -121,7 +121,7 @@ const guint libxfce4panel_micro_version = LIBXFCE4PANEL_MICRO_VERSION;
*
* Since: 4.8
**/
G_CONST_RETURN gchar *
const gchar *
libxfce4panel_check_version (guint required_major,
guint required_minor,
guint required_micro)

6
libxfce4panel/libxfce4panel-config.h.in

@ -97,9 +97,9 @@ extern const guint libxfce4panel_major_version;
extern const guint libxfce4panel_minor_version;
extern const guint libxfce4panel_micro_version;
G_CONST_RETURN gchar *libxfce4panel_check_version (guint required_major,
guint required_minor,
guint required_micro);
const gchar *libxfce4panel_check_version (guint required_major,
guint required_minor,
guint required_micro);
G_END_DECLS

2
libxfce4panel/xfce-panel-plugin-provider.c

@ -83,7 +83,7 @@ xfce_panel_plugin_provider_default_init (XfcePanelPluginProviderInterface *klass
G_CONST_RETURN gchar *
const gchar *
xfce_panel_plugin_provider_get_name (XfcePanelPluginProvider *provider)
{
panel_return_val_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider), NULL);

2
libxfce4panel/xfce-panel-plugin-provider.h

@ -147,7 +147,7 @@ enum
GType xfce_panel_plugin_provider_get_type (void) G_GNUC_CONST;
G_CONST_RETURN gchar *xfce_panel_plugin_provider_get_name (XfcePanelPluginProvider *provider);
const gchar *xfce_panel_plugin_provider_get_name (XfcePanelPluginProvider *provider);
gint xfce_panel_plugin_provider_get_unique_id (XfcePanelPluginProvider *provider);

10
libxfce4panel/xfce-panel-plugin.c

@ -1473,7 +1473,7 @@ xfce_panel_plugin_menu_item_destroy (GtkWidget *item,
*
* Returns: the name of the panel plugin.
**/
G_CONST_RETURN gchar *
const gchar *
xfce_panel_plugin_get_name (XfcePanelPlugin *plugin)
{
g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), NULL);
@ -1493,7 +1493,7 @@ xfce_panel_plugin_get_name (XfcePanelPlugin *plugin)
*
* Returns: the (translated) display name of the plugin.
**/
G_CONST_RETURN gchar *
const gchar *
xfce_panel_plugin_get_display_name (XfcePanelPlugin *plugin)
{
g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), NULL);
@ -1518,7 +1518,7 @@ xfce_panel_plugin_get_display_name (XfcePanelPlugin *plugin)
*
* Since: 4.8
**/
G_CONST_RETURN gchar *
const gchar *
xfce_panel_plugin_get_comment (XfcePanelPlugin *plugin)
{
g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), NULL);
@ -1565,7 +1565,7 @@ xfce_panel_plugin_get_unique_id (XfcePanelPlugin *plugin)
* XFCE_PANEL_PLUGIN_CHANNEL_NAME and
* xfce_panel_get_channel_name
**/
G_CONST_RETURN gchar *
const gchar *
xfce_panel_plugin_get_property_base (XfcePanelPlugin *plugin)
{
g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), NULL);
@ -1598,7 +1598,7 @@ xfce_panel_plugin_get_property_base (XfcePanelPlugin *plugin)
*
* Since: 4.8
**/
G_CONST_RETURN gchar * G_CONST_RETURN *
const gchar * const *
xfce_panel_plugin_get_arguments (XfcePanelPlugin *plugin)
{
g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), NULL);

11
libxfce4panel/xfce-panel-plugin.h

@ -154,18 +154,17 @@ struct _XfcePanelPlugin
GType xfce_panel_plugin_get_type (void) G_GNUC_CONST;
G_CONST_RETURN gchar *xfce_panel_plugin_get_name (XfcePanelPlugin *plugin) G_GNUC_PURE;
const gchar *xfce_panel_plugin_get_name (XfcePanelPlugin *plugin) G_GNUC_PURE;
G_CONST_RETURN gchar *xfce_panel_plugin_get_display_name (XfcePanelPlugin *plugin) G_GNUC_PURE;
const gchar *xfce_panel_plugin_get_display_name (XfcePanelPlugin *plugin) G_GNUC_PURE;
G_CONST_RETURN gchar *xfce_panel_plugin_get_comment (XfcePanelPlugin *plugin) G_GNUC_PURE;
const gchar *xfce_panel_plugin_get_comment (XfcePanelPlugin *plugin) G_GNUC_PURE;
gint xfce_panel_plugin_get_unique_id (XfcePanelPlugin *plugin) G_GNUC_PURE;
G_CONST_RETURN gchar *xfce_panel_plugin_get_property_base (XfcePanelPlugin *plugin) G_GNUC_PURE;
const gchar *xfce_panel_plugin_get_property_base (XfcePanelPlugin *plugin) G_GNUC_PURE;
G_CONST_RETURN gchar * G_CONST_RETURN *
xfce_panel_plugin_get_arguments (XfcePanelPlugin *plugin) G_GNUC_PURE;
const gchar * const *xfce_panel_plugin_get_arguments (XfcePanelPlugin *plugin) G_GNUC_PURE;
gint xfce_panel_plugin_get_size (XfcePanelPlugin *plugin) G_GNUC_PURE;

Loading…
Cancel
Save