[Xfce4-commits] [xfce/exo] 01/01: Resolved g_type_class_add_private deprecations (GObject 2.58)
noreply at xfce.org
noreply at xfce.org
Tue Oct 16 03:22:02 CEST 2018
This is an automated email from the git hooks/post-receive script.
b l u e s a b r e 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/exo.
commit 60dfbbc5cb0012541697208fc987a4bab273f6f8
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Mon Oct 15 21:21:56 2018 -0400
Resolved g_type_class_add_private deprecations (GObject 2.58)
---
NEWS | 1 +
exo/exo-cell-renderer-ellipsized-text.c | 16 +++++-----------
exo/exo-cell-renderer-icon.c | 18 ++++++------------
exo/exo-icon-bar.c | 8 ++------
exo/exo-icon-chooser-dialog.c | 28 ++++++++++------------------
exo/exo-icon-view.c | 2 ++
exo/exo-job.c | 11 ++---------
exo/exo-toolbars-editor-dialog.c | 10 ++--------
exo/exo-toolbars-editor.c | 11 ++---------
exo/exo-toolbars-model.c | 11 ++---------
exo/exo-toolbars-view.c | 9 ++-------
exo/exo-tree-view.c | 10 ++--------
exo/exo-wrap-table.c | 12 ++----------
exo/exo-xsession-client.c | 11 ++---------
14 files changed, 42 insertions(+), 116 deletions(-)
diff --git a/NEWS b/NEWS
index 2d2c94d..8c10992 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
======
- General:
- Preferred Applications: Improved layout spacing and alignment
+ - Resolved g_type_class_add_private deprecations (GObject 2.58)
- Bug Fixes:
- Hide exo launchers from GNOME Software (Xfce #14588)
- Fix crash with "preedit-changed" signal (Xfce #14756)
diff --git a/exo/exo-cell-renderer-ellipsized-text.c b/exo/exo-cell-renderer-ellipsized-text.c
index 5c6e14c..ca05396 100644
--- a/exo/exo-cell-renderer-ellipsized-text.c
+++ b/exo/exo-cell-renderer-ellipsized-text.c
@@ -48,9 +48,6 @@
* property is %TRUE.
**/
-#define EXO_CELL_RENDERER_ELLIPSIZED_TEXT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
- EXO_TYPE_CELL_RENDERER_ELLIPSIZED_TEXT, ExoCellRendererEllipsizedTextPrivate))
-
/* Property identifiers */
enum
{
@@ -92,7 +89,7 @@ struct _ExoCellRendererEllipsizedTextPrivate
-G_DEFINE_TYPE (ExoCellRendererEllipsizedText, exo_cell_renderer_ellipsized_text, GTK_TYPE_CELL_RENDERER_TEXT)
+G_DEFINE_TYPE_WITH_PRIVATE (ExoCellRendererEllipsizedText, exo_cell_renderer_ellipsized_text, GTK_TYPE_CELL_RENDERER_TEXT)
@@ -102,9 +99,6 @@ exo_cell_renderer_ellipsized_text_class_init (ExoCellRendererEllipsizedTextClass
GtkCellRendererClass *gtkcell_renderer_class;
GObjectClass *gobject_class;
- /* add our private data to the type's instances */
- g_type_class_add_private (klass, sizeof (ExoCellRendererEllipsizedTextPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->get_property = exo_cell_renderer_ellipsized_text_get_property;
gobject_class->set_property = exo_cell_renderer_ellipsized_text_set_property;
@@ -149,7 +143,7 @@ exo_cell_renderer_ellipsized_text_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
- ExoCellRendererEllipsizedTextPrivate *priv = EXO_CELL_RENDERER_ELLIPSIZED_TEXT_GET_PRIVATE (object);
+ ExoCellRendererEllipsizedTextPrivate *priv = exo_cell_renderer_ellipsized_text_get_instance_private (EXO_CELL_RENDERER_ELLIPSIZED_TEXT (object));
switch (prop_id)
{
@@ -171,7 +165,7 @@ exo_cell_renderer_ellipsized_text_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- ExoCellRendererEllipsizedTextPrivate *priv = EXO_CELL_RENDERER_ELLIPSIZED_TEXT_GET_PRIVATE (object);
+ ExoCellRendererEllipsizedTextPrivate *priv = exo_cell_renderer_ellipsized_text_get_instance_private (EXO_CELL_RENDERER_ELLIPSIZED_TEXT (object));
switch (prop_id)
{
@@ -196,7 +190,7 @@ exo_cell_renderer_ellipsized_text_get_size (GtkCellRenderer *renderer,
gint *width,
gint *height)
{
- ExoCellRendererEllipsizedTextPrivate *priv = EXO_CELL_RENDERER_ELLIPSIZED_TEXT_GET_PRIVATE (renderer);
+ ExoCellRendererEllipsizedTextPrivate *priv = exo_cell_renderer_ellipsized_text_get_instance_private (EXO_CELL_RENDERER_ELLIPSIZED_TEXT (renderer));
gint focus_line_width;
gint focus_padding;
gint text_height;
@@ -257,7 +251,7 @@ exo_cell_renderer_ellipsized_text_render (GtkCellRenderer *renderer,
GdkRectangle *expose_area,
GtkCellRendererState flags)
{
- ExoCellRendererEllipsizedTextPrivate *priv = EXO_CELL_RENDERER_ELLIPSIZED_TEXT_GET_PRIVATE (renderer);
+ ExoCellRendererEllipsizedTextPrivate *priv = exo_cell_renderer_ellipsized_text_get_instance_private (EXO_CELL_RENDERER_ELLIPSIZED_TEXT (renderer));
GdkRectangle text_area;
GtkStateType state;
cairo_t *cr;
diff --git a/exo/exo-cell-renderer-icon.c b/exo/exo-cell-renderer-icon.c
index c210a14..981fe38 100644
--- a/exo/exo-cell-renderer-icon.c
+++ b/exo/exo-cell-renderer-icon.c
@@ -50,9 +50,6 @@
* property is set.
**/
-#define EXO_CELL_RENDERER_ICON_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
- EXO_TYPE_CELL_RENDERER_ICON, ExoCellRendererIconPrivate))
-
/* HACK: fix dead API via #define */
#if GTK_CHECK_VERSION (3, 0, 0)
# define gtk_icon_info_free(info) g_object_unref (info)
@@ -120,7 +117,7 @@ struct _ExoCellRendererIconPrivate
-G_DEFINE_TYPE (ExoCellRendererIcon, exo_cell_renderer_icon, GTK_TYPE_CELL_RENDERER)
+G_DEFINE_TYPE_WITH_PRIVATE (ExoCellRendererIcon, exo_cell_renderer_icon, GTK_TYPE_CELL_RENDERER)
@@ -130,9 +127,6 @@ exo_cell_renderer_icon_class_init (ExoCellRendererIconClass *klass)
GtkCellRendererClass *gtkcell_renderer_class;
GObjectClass *gobject_class;
- /* add our private data to the type's instances */
- g_type_class_add_private (klass, sizeof (ExoCellRendererIconPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = exo_cell_renderer_icon_finalize;
gobject_class->get_property = exo_cell_renderer_icon_get_property;
@@ -238,7 +232,7 @@ exo_cell_renderer_icon_init (ExoCellRendererIcon *icon_undocked)
static void
exo_cell_renderer_icon_finalize (GObject *object)
{
- const ExoCellRendererIconPrivate *priv = EXO_CELL_RENDERER_ICON_GET_PRIVATE (object);
+ const ExoCellRendererIconPrivate *priv = exo_cell_renderer_icon_get_instance_private (EXO_CELL_RENDERER_ICON (object));
/* free the icon if not static */
if (!priv->icon_static)
@@ -259,7 +253,7 @@ exo_cell_renderer_icon_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
- const ExoCellRendererIconPrivate *priv = EXO_CELL_RENDERER_ICON_GET_PRIVATE (object);
+ const ExoCellRendererIconPrivate *priv = exo_cell_renderer_icon_get_instance_private (EXO_CELL_RENDERER_ICON (object));
switch (prop_id)
{
@@ -293,7 +287,7 @@ exo_cell_renderer_icon_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- ExoCellRendererIconPrivate *priv = EXO_CELL_RENDERER_ICON_GET_PRIVATE (object);
+ ExoCellRendererIconPrivate *priv = exo_cell_renderer_icon_get_instance_private (EXO_CELL_RENDERER_ICON (object));
const gchar *icon;
switch (prop_id)
@@ -344,7 +338,7 @@ exo_cell_renderer_icon_get_size (GtkCellRenderer *renderer,
gint *width,
gint *height)
{
- const ExoCellRendererIconPrivate *priv = EXO_CELL_RENDERER_ICON_GET_PRIVATE (renderer);
+ const ExoCellRendererIconPrivate *priv = exo_cell_renderer_icon_get_instance_private (EXO_CELL_RENDERER_ICON (renderer));
gfloat xalign, yalign;
gint xpad, ypad;
@@ -411,7 +405,7 @@ exo_cell_renderer_icon_render (GtkCellRenderer *renderer,
GtkIconSource *icon_source;
GtkStateType state;
#endif
- const ExoCellRendererIconPrivate *priv = EXO_CELL_RENDERER_ICON_GET_PRIVATE (renderer);
+ const ExoCellRendererIconPrivate *priv = exo_cell_renderer_icon_get_instance_private (EXO_CELL_RENDERER_ICON (renderer));
GtkIconTheme *icon_theme;
GdkRectangle icon_area;
GdkRectangle draw_area;
diff --git a/exo/exo-icon-bar.c b/exo/exo-icon-bar.c
index 7c13127..078fbf0 100644
--- a/exo/exo-icon-bar.c
+++ b/exo/exo-icon-bar.c
@@ -85,8 +85,6 @@
#define MINIMUM_ICON_ITEM_WIDTH 32
#define ICON_TEXT_PADDING 1
-#define EXO_ICON_BAR_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EXO_TYPE_ICON_BAR, ExoIconBarPrivate))
-
#define EXO_ICON_BAR_VALID_MODEL_AND_COLUMNS(obj) ((obj)->priv->model != NULL && \
(obj)->priv->pixbuf_column != -1 && \
(obj)->priv->text_column != -1)
@@ -230,7 +228,7 @@ static guint icon_bar_signals[LAST_SIGNAL];
-G_DEFINE_TYPE (ExoIconBar, exo_icon_bar, GTK_TYPE_CONTAINER)
+G_DEFINE_TYPE_WITH_PRIVATE (ExoIconBar, exo_icon_bar, GTK_TYPE_CONTAINER)
@@ -241,8 +239,6 @@ exo_icon_bar_class_init (ExoIconBarClass *klass)
GtkWidgetClass *gtkwidget_class;
GObjectClass *gobject_class;
- g_type_class_add_private (klass, sizeof (ExoIconBarPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = exo_icon_bar_finalize;
gobject_class->get_property = exo_icon_bar_get_property;
@@ -425,7 +421,7 @@ exo_icon_bar_class_init (ExoIconBarClass *klass)
static void
exo_icon_bar_init (ExoIconBar *icon_bar)
{
- icon_bar->priv = EXO_ICON_BAR_GET_PRIVATE (icon_bar);
+ icon_bar->priv = exo_icon_bar_get_instance_private (icon_bar);
icon_bar->priv->orientation = GTK_ORIENTATION_VERTICAL;
icon_bar->priv->pixbuf_column = -1;
diff --git a/exo/exo-icon-chooser-dialog.c b/exo/exo-icon-chooser-dialog.c
index 933ebfe..feb54f7 100644
--- a/exo/exo-icon-chooser-dialog.c
+++ b/exo/exo-icon-chooser-dialog.c
@@ -58,11 +58,6 @@
-#define EXO_ICON_CHOOSER_DIALOG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
- EXO_TYPE_ICON_CHOOSER_DIALOG, ExoIconChooserDialogPrivate))
-
-
-
static void exo_icon_chooser_dialog_finalize (GObject *object);
static void exo_icon_chooser_dialog_style_set (GtkWidget *widget,
GtkStyle *previous_style);
@@ -137,7 +132,7 @@ static const gchar CONTEXT_TITLES[][80] =
-G_DEFINE_TYPE (ExoIconChooserDialog, exo_icon_chooser_dialog, GTK_TYPE_DIALOG)
+G_DEFINE_TYPE_WITH_PRIVATE (ExoIconChooserDialog, exo_icon_chooser_dialog, GTK_TYPE_DIALOG)
@@ -149,9 +144,6 @@ exo_icon_chooser_dialog_class_init (ExoIconChooserDialogClass *klass)
GtkWidgetClass *gtkwidget_class;
GtkBindingSet *binding_set;
- /* add our private data to the type's instances */
- g_type_class_add_private (klass, sizeof (ExoIconChooserDialogPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = exo_icon_chooser_dialog_finalize;
@@ -173,7 +165,7 @@ exo_icon_chooser_dialog_class_init (ExoIconChooserDialogClass *klass)
static void
exo_icon_chooser_dialog_init (ExoIconChooserDialog *icon_chooser_dialog)
{
- ExoIconChooserDialogPrivate *priv = EXO_ICON_CHOOSER_DIALOG_GET_PRIVATE (icon_chooser_dialog);
+ ExoIconChooserDialogPrivate *priv = exo_icon_chooser_dialog_get_instance_private (icon_chooser_dialog);
ExoIconChooserContext context;
GtkCellRenderer *renderer;
GtkFileFilter *filter;
@@ -329,7 +321,7 @@ exo_icon_chooser_dialog_init (ExoIconChooserDialog *icon_chooser_dialog)
static void
exo_icon_chooser_dialog_finalize (GObject *object)
{
- ExoIconChooserDialogPrivate *priv = EXO_ICON_CHOOSER_DIALOG_GET_PRIVATE (object);
+ ExoIconChooserDialogPrivate *priv = exo_icon_chooser_dialog_get_instance_private (EXO_ICON_CHOOSER_DIALOG (object));
g_free (priv->casefolded_text);
@@ -388,7 +380,7 @@ exo_icon_chooser_dialog_close (GtkDialog *dialog)
static void
exo_icon_chooser_dialog_set_model (ExoIconChooserDialog *dialog)
{
- ExoIconChooserDialogPrivate *priv = EXO_ICON_CHOOSER_DIALOG_GET_PRIVATE (dialog);
+ ExoIconChooserDialogPrivate *priv = exo_icon_chooser_dialog_get_instance_private (EXO_ICON_CHOOSER_DIALOG (dialog));
ExoIconChooserModel *model;
GtkTreeModel *filter;
@@ -437,7 +429,7 @@ exo_icon_chooser_dialog_visible_func (GtkTreeModel *model,
GtkTreeIter *iter,
gpointer user_data)
{
- ExoIconChooserDialogPrivate *priv = EXO_ICON_CHOOSER_DIALOG_GET_PRIVATE (user_data);
+ ExoIconChooserDialogPrivate *priv = exo_icon_chooser_dialog_get_instance_private (EXO_ICON_CHOOSER_DIALOG (user_data));
guint icon_chooser_context;
guint item_context;
gchar *normalized;
@@ -484,7 +476,7 @@ exo_icon_chooser_dialog_visible_func (GtkTreeModel *model,
static gboolean
exo_icon_chooser_dialog_start_interactive_search (ExoIconChooserDialog *icon_chooser_dialog)
{
- ExoIconChooserDialogPrivate *priv = EXO_ICON_CHOOSER_DIALOG_GET_PRIVATE (icon_chooser_dialog);
+ ExoIconChooserDialogPrivate *priv = exo_icon_chooser_dialog_get_instance_private (icon_chooser_dialog);
gtk_window_set_focus (GTK_WINDOW (icon_chooser_dialog), priv->filter_entry);
@@ -497,7 +489,7 @@ static void
exo_icon_chooser_dialog_combo_changed (GtkWidget *combo,
ExoIconChooserDialog *icon_chooser_dialog)
{
- ExoIconChooserDialogPrivate *priv = EXO_ICON_CHOOSER_DIALOG_GET_PRIVATE (icon_chooser_dialog);
+ ExoIconChooserDialogPrivate *priv = exo_icon_chooser_dialog_get_instance_private (icon_chooser_dialog);
ExoIconChooserContext context;
GtkTreeModel *model;
GList *selected_items;
@@ -544,7 +536,7 @@ static void
exo_icon_chooser_dialog_entry_changed (GtkWidget *combo,
ExoIconChooserDialog *icon_chooser_dialog)
{
- ExoIconChooserDialogPrivate *priv = EXO_ICON_CHOOSER_DIALOG_GET_PRIVATE (icon_chooser_dialog);
+ ExoIconChooserDialogPrivate *priv = exo_icon_chooser_dialog_get_instance_private (icon_chooser_dialog);
const gchar *text;
gchar *normalized;
GtkTreeModel *model;
@@ -668,7 +660,7 @@ exo_icon_chooser_dialog_new (const gchar *title,
gchar*
exo_icon_chooser_dialog_get_icon (ExoIconChooserDialog *icon_chooser_dialog)
{
- ExoIconChooserDialogPrivate *priv = EXO_ICON_CHOOSER_DIALOG_GET_PRIVATE (icon_chooser_dialog);
+ ExoIconChooserDialogPrivate *priv = exo_icon_chooser_dialog_get_instance_private (icon_chooser_dialog);
GtkTreeModel *model;
GtkTreeIter iter;
GList *selected_items;
@@ -727,7 +719,7 @@ gboolean
exo_icon_chooser_dialog_set_icon (ExoIconChooserDialog *icon_chooser_dialog,
const gchar *icon)
{
- ExoIconChooserDialogPrivate *priv = EXO_ICON_CHOOSER_DIALOG_GET_PRIVATE (icon_chooser_dialog);
+ ExoIconChooserDialogPrivate *priv = exo_icon_chooser_dialog_get_instance_private (icon_chooser_dialog);
GtkTreeModel *filter;
GtkTreeModel *model;
GtkTreePath *filter_path;
diff --git a/exo/exo-icon-view.c b/exo/exo-icon-view.c
index bdc59d6..5b96d37 100644
--- a/exo/exo-icon-view.c
+++ b/exo/exo-icon-view.c
@@ -727,7 +727,9 @@ exo_icon_view_class_init (ExoIconViewClass *klass)
GObjectClass *gobject_class;
/* add our private data to the type's instances */
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS /* GObject 2.58 */
g_type_class_add_private (klass, sizeof (ExoIconViewPrivate));
+ G_GNUC_END_IGNORE_DEPRECATIONS
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->dispose = exo_icon_view_dispose;
diff --git a/exo/exo-job.c b/exo/exo-job.c
index 162d777..0c73675 100644
--- a/exo/exo-job.c
+++ b/exo/exo-job.c
@@ -57,11 +57,6 @@
-#define EXO_JOB_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
- EXO_TYPE_JOB, ExoJobPrivate))
-
-
-
/* Signal identifiers */
enum
{
@@ -109,7 +104,7 @@ static guint job_signals[LAST_SIGNAL];
-G_DEFINE_ABSTRACT_TYPE (ExoJob, exo_job, G_TYPE_OBJECT)
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ExoJob, exo_job, G_TYPE_OBJECT)
@@ -118,8 +113,6 @@ exo_job_class_init (ExoJobClass *klass)
{
GObjectClass *gobject_class;
- g_type_class_add_private (klass, sizeof (ExoJobPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = exo_job_finalize;
@@ -217,7 +210,7 @@ exo_job_class_init (ExoJobClass *klass)
static void
exo_job_init (ExoJob *job)
{
- job->priv = EXO_JOB_GET_PRIVATE (job);
+ job->priv = exo_job_get_instance_private (job);
job->priv->cancellable = g_cancellable_new ();
job->priv->running = FALSE;
job->priv->scheduler_job = NULL;
diff --git a/exo/exo-toolbars-editor-dialog.c b/exo/exo-toolbars-editor-dialog.c
index 3f35bac..007d110 100644
--- a/exo/exo-toolbars-editor-dialog.c
+++ b/exo/exo-toolbars-editor-dialog.c
@@ -52,11 +52,6 @@
-#define EXO_TOOLBARS_EDITOR_DIALOG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
- EXO_TYPE_TOOLBARS_EDITOR_DIALOG, ExoToolbarsEditorDialogPrivate))
-
-
-
static void exo_toolbars_editor_dialog_add_toolbar (ExoToolbarsEditorDialog *dialog);
@@ -68,14 +63,13 @@ struct _ExoToolbarsEditorDialogPrivate
-G_DEFINE_TYPE (ExoToolbarsEditorDialog, exo_toolbars_editor_dialog, GTK_TYPE_DIALOG)
+G_DEFINE_TYPE_WITH_PRIVATE (ExoToolbarsEditorDialog, exo_toolbars_editor_dialog, GTK_TYPE_DIALOG)
static void
exo_toolbars_editor_dialog_class_init (ExoToolbarsEditorDialogClass *klass)
{
- g_type_class_add_private (klass, sizeof (ExoToolbarsEditorDialogPrivate));
}
@@ -89,7 +83,7 @@ exo_toolbars_editor_dialog_init (ExoToolbarsEditorDialog *dialog)
GtkWidget *image;
GtkWidget *label;
- dialog->priv = EXO_TOOLBARS_EDITOR_DIALOG_GET_PRIVATE (dialog);
+ dialog->priv = exo_toolbars_editor_dialog_get_instance_private (dialog);
gtk_window_set_default_size (GTK_WINDOW (dialog), -1, 300);
diff --git a/exo/exo-toolbars-editor.c b/exo/exo-toolbars-editor.c
index 613d2ad..0825c9b 100644
--- a/exo/exo-toolbars-editor.c
+++ b/exo/exo-toolbars-editor.c
@@ -57,11 +57,6 @@
-#define EXO_TOOLBARS_EDITOR_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
- EXO_TYPE_TOOLBARS_EDITOR, ExoToolbarsEditorPrivate))
-
-
-
enum
{
PROP_0,
@@ -115,7 +110,7 @@ static const GtkTargetEntry targets[] =
-G_DEFINE_TYPE (ExoToolbarsEditor, exo_toolbars_editor, GTK_TYPE_VBOX)
+G_DEFINE_TYPE_WITH_PRIVATE (ExoToolbarsEditor, exo_toolbars_editor, GTK_TYPE_VBOX)
@@ -124,8 +119,6 @@ exo_toolbars_editor_class_init (ExoToolbarsEditorClass *klass)
{
GObjectClass *gobject_class;
- g_type_class_add_private (klass, sizeof (ExoToolbarsEditorPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = exo_toolbars_editor_finalize;
gobject_class->get_property = exo_toolbars_editor_get_property;
@@ -180,7 +173,7 @@ exo_toolbars_editor_init (ExoToolbarsEditor *editor)
GtkWidget *image;
GtkWidget *label;
- editor->priv = EXO_TOOLBARS_EDITOR_GET_PRIVATE (editor);
+ editor->priv = exo_toolbars_editor_get_instance_private (editor);
g_object_set (G_OBJECT (editor),
"border-width", 12,
diff --git a/exo/exo-toolbars-model.c b/exo/exo-toolbars-model.c
index 1bf8578..a5509ac 100644
--- a/exo/exo-toolbars-model.c
+++ b/exo/exo-toolbars-model.c
@@ -51,11 +51,6 @@
-#define EXO_TOOLBARS_MODEL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
- EXO_TYPE_TOOLBARS_MODEL, ExoToolbarsModelPrivate))
-
-
-
typedef struct _ExoToolbarsToolbar ExoToolbarsToolbar;
typedef struct _ExoToolbarsItem ExoToolbarsItem;
typedef struct _UiParser UiParser;
@@ -156,7 +151,7 @@ static guint toolbars_model_signals[LAST_SIGNAL];
-G_DEFINE_TYPE (ExoToolbarsModel, exo_toolbars_model, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (ExoToolbarsModel, exo_toolbars_model, G_TYPE_OBJECT)
@@ -179,8 +174,6 @@ exo_toolbars_model_class_init (ExoToolbarsModelClass *klass)
{
GObjectClass *gobject_class;
- g_type_class_add_private (klass, sizeof (ExoToolbarsModelPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = exo_toolbars_model_finalize;
@@ -343,7 +336,7 @@ exo_toolbars_model_class_init (ExoToolbarsModelClass *klass)
static void
exo_toolbars_model_init (ExoToolbarsModel *model)
{
- model->priv = EXO_TOOLBARS_MODEL_GET_PRIVATE (model);
+ model->priv = exo_toolbars_model_get_instance_private (model);
}
diff --git a/exo/exo-toolbars-view.c b/exo/exo-toolbars-view.c
index a15effd..ead841e 100644
--- a/exo/exo-toolbars-view.c
+++ b/exo/exo-toolbars-view.c
@@ -53,9 +53,6 @@
#define MIN_TOOLBAR_HEIGHT 20
-#define EXO_TOOLBARS_VIEW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
- EXO_TYPE_TOOLBARS_VIEW, ExoToolbarsViewPrivate))
-
enum
@@ -187,7 +184,7 @@ static guint toolbars_view_signals[LAST_SIGNAL];
-G_DEFINE_TYPE (ExoToolbarsView, exo_toolbars_view, GTK_TYPE_VBOX)
+G_DEFINE_TYPE_WITH_PRIVATE (ExoToolbarsView, exo_toolbars_view, GTK_TYPE_VBOX)
@@ -199,8 +196,6 @@ exo_toolbars_view_class_init (ExoToolbarsViewClass *klass)
/* initialize exo i18n support */
_exo_i18n_init ();
- g_type_class_add_private (klass, sizeof (ExoToolbarsViewPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = exo_toolbars_view_finalize;
gobject_class->get_property = exo_toolbars_view_get_property;
@@ -299,7 +294,7 @@ exo_toolbars_view_class_init (ExoToolbarsViewClass *klass)
static void
exo_toolbars_view_init (ExoToolbarsView *view)
{
- view->priv = EXO_TOOLBARS_VIEW_GET_PRIVATE (view);
+ view->priv = exo_toolbars_view_get_instance_private (view);
}
diff --git a/exo/exo-tree-view.c b/exo/exo-tree-view.c
index 19d2f9b..f47c6fc 100644
--- a/exo/exo-tree-view.c
+++ b/exo/exo-tree-view.c
@@ -55,9 +55,6 @@
# endif
-#define EXO_TREE_VIEW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
- EXO_TYPE_TREE_VIEW, ExoTreeViewPrivate))
-
/* Property identifiers */
@@ -120,7 +117,7 @@ struct _ExoTreeViewPrivate
-G_DEFINE_TYPE (ExoTreeView, exo_tree_view, GTK_TYPE_TREE_VIEW)
+G_DEFINE_TYPE_WITH_PRIVATE (ExoTreeView, exo_tree_view, GTK_TYPE_TREE_VIEW)
@@ -131,9 +128,6 @@ exo_tree_view_class_init (ExoTreeViewClass *klass)
GtkWidgetClass *gtkwidget_class;
GObjectClass *gobject_class;
- /* add our private data to the class */
- g_type_class_add_private (klass, sizeof (ExoTreeViewPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = exo_tree_view_finalize;
gobject_class->get_property = exo_tree_view_get_property;
@@ -192,7 +186,7 @@ static void
exo_tree_view_init (ExoTreeView *tree_view)
{
/* grab a pointer on the private data */
- tree_view->priv = EXO_TREE_VIEW_GET_PRIVATE (tree_view);
+ tree_view->priv = exo_tree_view_get_instance_private (tree_view);
tree_view->priv->single_click_timeout_id = -1;
}
diff --git a/exo/exo-wrap-table.c b/exo/exo-wrap-table.c
index 88c2f39..75d5099 100644
--- a/exo/exo-wrap-table.c
+++ b/exo/exo-wrap-table.c
@@ -43,11 +43,6 @@
-#define EXO_WRAP_TABLE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
- EXO_TYPE_WRAP_TABLE, ExoWrapTablePrivate))
-
-
-
/* Property identifiers */
enum
{
@@ -105,7 +100,7 @@ struct _ExoWrapTablePrivate
-G_DEFINE_TYPE (ExoWrapTable, exo_wrap_table, GTK_TYPE_CONTAINER)
+G_DEFINE_TYPE_WITH_PRIVATE (ExoWrapTable, exo_wrap_table, GTK_TYPE_CONTAINER)
@@ -116,9 +111,6 @@ exo_wrap_table_class_init (ExoWrapTableClass *klass)
GtkWidgetClass *gtkwidget_class;
GObjectClass *gobject_class;
- /* add our private data to the class */
- g_type_class_add_private (klass, sizeof (ExoWrapTablePrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->get_property = exo_wrap_table_get_property;
gobject_class->set_property = exo_wrap_table_set_property;
@@ -187,7 +179,7 @@ static void
exo_wrap_table_init (ExoWrapTable *table)
{
/* grab a pointer on the private data */
- table->priv = EXO_WRAP_TABLE_GET_PRIVATE (table);
+ table->priv = exo_wrap_table_get_instance_private (table);
/* we don't provide our own window */
gtk_widget_set_has_window (GTK_WIDGET (table), FALSE);
diff --git a/exo/exo-xsession-client.c b/exo/exo-xsession-client.c
index 24cf548..8570ccf 100644
--- a/exo/exo-xsession-client.c
+++ b/exo/exo-xsession-client.c
@@ -130,11 +130,6 @@
-#define EXO_XSESSION_CLIENT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
- EXO_TYPE_XSESSION_CLIENT, ExoXsessionClientPrivate))
-
-
-
enum
{
PROP_0,
@@ -182,7 +177,7 @@ static guint client_signals[LAST_SIGNAL];
-G_DEFINE_TYPE (ExoXsessionClient, exo_xsession_client, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (ExoXsessionClient, exo_xsession_client, G_TYPE_OBJECT)
@@ -194,8 +189,6 @@ exo_xsession_client_class_init (ExoXsessionClientClass *klass)
/* initialize the libexo i18n support */
_exo_i18n_init ();
- g_type_class_add_private (klass, sizeof (ExoXsessionClientPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->dispose = exo_xsession_client_dispose;
gobject_class->get_property = exo_xsession_client_get_property;
@@ -246,7 +239,7 @@ exo_xsession_client_class_init (ExoXsessionClientClass *klass)
static void
exo_xsession_client_init (ExoXsessionClient *client)
{
- client->priv = EXO_XSESSION_CLIENT_GET_PRIVATE (client);
+ client->priv = exo_xsession_client_get_instance_private (client);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list