diff options
Diffstat (limited to 'libxfce4panel')
| -rw-r--r-- | libxfce4panel/xfce-arrow-button.c | 7 | ||||
| -rw-r--r-- | libxfce4panel/xfce-panel-image.c | 5 | ||||
| -rw-r--r-- | libxfce4panel/xfce-panel-plugin.c | 5 |
3 files changed, 3 insertions, 14 deletions
diff --git a/libxfce4panel/xfce-arrow-button.c b/libxfce4panel/xfce-arrow-button.c index ccb7f6ce..2ee90895 100644 --- a/libxfce4panel/xfce-arrow-button.c +++ b/libxfce4panel/xfce-arrow-button.c @@ -51,10 +51,6 @@ -#define XFCE_ARROW_BUTTON_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ - XFCE_TYPE_ARROW_BUTTON, \ - XfceArrowButtonPrivate)) - #define ARROW_WIDTH (8) #define MAX_BLINKING_COUNT (16) @@ -171,8 +167,7 @@ xfce_arrow_button_class_init (XfceArrowButtonClass * klass) static void xfce_arrow_button_init (XfceArrowButton *button) { - /* set private pointer */ - button->priv = XFCE_ARROW_BUTTON_GET_PRIVATE (button); + button->priv = G_TYPE_INSTANCE_GET_PRIVATE (button, XFCE_TYPE_ARROW_BUTTON, XfceArrowButtonPrivate); /* initialize button values */ button->priv->arrow_type = GTK_ARROW_UP; diff --git a/libxfce4panel/xfce-panel-image.c b/libxfce4panel/xfce-panel-image.c index f6908214..b626f971 100644 --- a/libxfce4panel/xfce-panel-image.c +++ b/libxfce4panel/xfce-panel-image.c @@ -61,9 +61,6 @@ /* design limit for the panel, to reduce the uncached pixbuf size */ #define MAX_PIXBUF_SIZE (128) -#define XFCE_PANEL_IMAGE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ - XFCE_TYPE_PANEL_IMAGE, \ - XfcePanelImagePrivate)) #define xfce_panel_image_unref_null(obj) G_STMT_START { if ((obj) != NULL) \ { \ g_object_unref (G_OBJECT (obj)); \ @@ -193,7 +190,7 @@ xfce_panel_image_init (XfcePanelImage *image) { GTK_WIDGET_SET_FLAGS (image, GTK_NO_WINDOW); - image->priv = XFCE_PANEL_IMAGE_GET_PRIVATE (image); + image->priv = G_TYPE_INSTANCE_GET_PRIVATE (image, XFCE_TYPE_PANEL_IMAGE, XfcePanelImagePrivate); image->priv->pixbuf = NULL; image->priv->cache = NULL; diff --git a/libxfce4panel/xfce-panel-plugin.c b/libxfce4panel/xfce-panel-plugin.c index f1a6867e..81226202 100644 --- a/libxfce4panel/xfce-panel-plugin.c +++ b/libxfce4panel/xfce-panel-plugin.c @@ -48,9 +48,6 @@ #define XFCE_PANEL_PLUGIN_CONSTRUCTED(plugin) \ PANEL_HAS_FLAG (XFCE_PANEL_PLUGIN (plugin)->priv->flags, \ PLUGIN_FLAG_CONSTRUCTED) -#define XFCE_PANEL_PLUGIN_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ - XFCE_TYPE_PANEL_PLUGIN, \ - XfcePanelPluginPrivate)) @@ -567,7 +564,7 @@ xfce_panel_plugin_class_init (XfcePanelPluginClass *klass) static void xfce_panel_plugin_init (XfcePanelPlugin *plugin) { - plugin->priv = XFCE_PANEL_PLUGIN_GET_PRIVATE (plugin); + plugin->priv = G_TYPE_INSTANCE_GET_PRIVATE (plugin, XFCE_TYPE_PANEL_PLUGIN, XfcePanelPluginPrivate); plugin->priv->name = NULL; plugin->priv->display_name = NULL; |