Skip to content

Commit 7920f97

Browse files
yetistlukefromdc
yetist
authored and
lukefromdc
committed
Avoid deprecated g_type_class_add_private under libcaja-private
Changed CajaIconCanvasItem, CajaTrashMonitor and CajaUndoStackManager
1 parent 0b07371 commit 7920f97

File tree

5 files changed

+29
-45
lines changed

5 files changed

+29
-45
lines changed

‎libcaja-private/caja-icon-canvas-item.c‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
*/
7979

8080
/* Private part of the CajaIconCanvasItem structure. */
81-
struct CajaIconCanvasItemDetails
81+
struct _CajaIconCanvasItemPrivate
8282
{
8383
/* The image, text, font. */
8484
double x, y;
@@ -191,6 +191,7 @@ static void caja_icon_canvas_item_text_interface_init (EelAccessibleTextIface *i
191191
static GType caja_icon_canvas_item_accessible_factory_get_type (void);
192192

193193
G_DEFINE_TYPE_WITH_CODE (CajaIconCanvasItem, caja_icon_canvas_item, EEL_TYPE_CANVAS_ITEM,
194+
G_ADD_PRIVATE (CajaIconCanvasItem)
194195
G_IMPLEMENT_INTERFACE (EEL_TYPE_ACCESSIBLE_TEXT,
195196
caja_icon_canvas_item_text_interface_init));
196197

@@ -244,14 +245,14 @@ caja_icon_canvas_item_init (CajaIconCanvasItem *icon_item)
244245
setup_auto_enums = TRUE;
245246
}
246247

247-
icon_item->details = G_TYPE_INSTANCE_GET_PRIVATE ((icon_item), CAJA_TYPE_ICON_CANVAS_ITEM, CajaIconCanvasItemDetails);
248+
icon_item->details = caja_icon_canvas_item_get_instance_private (icon_item);
248249
caja_icon_canvas_item_invalidate_label_size (icon_item);
249250
}
250251

251252
static void
252253
caja_icon_canvas_item_finalize (GObject *object)
253254
{
254-
CajaIconCanvasItemDetails *details;
255+
CajaIconCanvasItemPrivate *details;
255256

256257
g_assert (CAJA_IS_ICON_CANVAS_ITEM (object));
257258

@@ -356,7 +357,7 @@ caja_icon_canvas_item_set_property (GObject *object,
356357
GParamSpec *pspec)
357358
{
358359
CajaIconCanvasItem *item;
359-
CajaIconCanvasItemDetails *details;
360+
CajaIconCanvasItemPrivate *details;
360361
AtkObject *accessible;
361362

362363
item = CAJA_ICON_CANVAS_ITEM (object);
@@ -460,7 +461,7 @@ caja_icon_canvas_item_get_property (GObject *object,
460461
GValue *value,
461462
GParamSpec *pspec)
462463
{
463-
CajaIconCanvasItemDetails *details;
464+
CajaIconCanvasItemPrivate *details;
464465

465466
details = CAJA_ICON_CANVAS_ITEM (object)->details;
466467

@@ -608,7 +609,7 @@ void
608609
caja_icon_canvas_item_set_image (CajaIconCanvasItem *item,
609610
GdkPixbuf *image)
610611
{
611-
CajaIconCanvasItemDetails *details;
612+
CajaIconCanvasItemPrivate *details;
612613

613614
g_return_if_fail (CAJA_IS_ICON_CANVAS_ITEM (item));
614615
g_return_if_fail (image == NULL || pixbuf_is_acceptable (image));
@@ -1058,7 +1059,7 @@ static void
10581059
prepare_pango_layout_for_draw (CajaIconCanvasItem *item,
10591060
PangoLayout *layout)
10601061
{
1061-
CajaIconCanvasItemDetails *details;
1062+
CajaIconCanvasItemPrivate *details;
10621063
CajaIconContainer *container;
10631064
gboolean needs_highlight;
10641065

@@ -1095,7 +1096,7 @@ prepare_pango_layout_for_draw (CajaIconCanvasItem *item,
10951096
static void
10961097
measure_label_text (CajaIconCanvasItem *item)
10971098
{
1098-
CajaIconCanvasItemDetails *details;
1099+
CajaIconCanvasItemPrivate *details;
10991100
CajaIconContainer *container;
11001101
gint editable_height, editable_height_for_layout, editable_height_for_entire_text, editable_width, editable_dx;
11011102
gint additional_height, additional_width, additional_dx;
@@ -1236,7 +1237,7 @@ draw_label_text (CajaIconCanvasItem *item,
12361237
gboolean create_mask,
12371238
EelIRect icon_rect)
12381239
{
1239-
CajaIconCanvasItemDetails *details;
1240+
CajaIconCanvasItemPrivate *details;
12401241
CajaIconContainer *container;
12411242
PangoLayout *editable_layout;
12421243
PangoLayout *additional_layout;
@@ -1894,7 +1895,7 @@ caja_icon_canvas_item_draw (EelCanvasItem *item,
18941895
{
18951896
CajaIconContainer *container;
18961897
CajaIconCanvasItem *icon_item;
1897-
CajaIconCanvasItemDetails *details;
1898+
CajaIconCanvasItemPrivate *details;
18981899
EelIRect icon_rect, emblem_rect;
18991900
EmblemLayout emblem_layout;
19001901
GdkPixbuf *emblem_pixbuf;
@@ -2203,7 +2204,7 @@ hit_test_pixbuf (GdkPixbuf *pixbuf, EelIRect pixbuf_location, EelIRect probe_rec
22032204
static gboolean
22042205
hit_test (CajaIconCanvasItem *icon_item, EelIRect canvas_rect)
22052206
{
2206-
CajaIconCanvasItemDetails *details;
2207+
CajaIconCanvasItemPrivate *details;
22072208
EelIRect emblem_rect;
22082209
EmblemLayout emblem_layout;
22092210
GdkPixbuf *emblem_pixbuf;
@@ -2282,7 +2283,7 @@ static void
22822283
caja_icon_canvas_item_translate (EelCanvasItem *item, double dx, double dy)
22832284
{
22842285
CajaIconCanvasItem *icon_item;
2285-
CajaIconCanvasItemDetails *details;
2286+
CajaIconCanvasItemPrivate *details;
22862287

22872288
icon_item = CAJA_ICON_CANVAS_ITEM (item);
22882289
details = icon_item->details;
@@ -2295,7 +2296,7 @@ void
22952296
caja_icon_canvas_item_get_bounds_for_layout (CajaIconCanvasItem *icon_item,
22962297
double *x1, double *y1, double *x2, double *y2)
22972298
{
2298-
CajaIconCanvasItemDetails *details;
2299+
CajaIconCanvasItemPrivate *details;
22992300
EelIRect *total_rect;
23002301

23012302
details = icon_item->details;
@@ -2328,7 +2329,7 @@ void
23282329
caja_icon_canvas_item_get_bounds_for_entire_item (CajaIconCanvasItem *icon_item,
23292330
double *x1, double *y1, double *x2, double *y2)
23302331
{
2331-
CajaIconCanvasItemDetails *details;
2332+
CajaIconCanvasItemPrivate *details;
23322333
EelIRect *total_rect;
23332334

23342335
details = icon_item->details;
@@ -2363,7 +2364,7 @@ caja_icon_canvas_item_bounds (EelCanvasItem *item,
23632364
double *x1, double *y1, double *x2, double *y2)
23642365
{
23652366
CajaIconCanvasItem *icon_item;
2366-
CajaIconCanvasItemDetails *details;
2367+
CajaIconCanvasItemPrivate *details;
23672368
EelIRect *total_rect;
23682369

23692370
icon_item = CAJA_ICON_CANVAS_ITEM (item);
@@ -2389,7 +2390,7 @@ caja_icon_canvas_item_bounds (EelCanvasItem *item,
23892390
static void
23902391
caja_icon_canvas_item_ensure_bounds_up_to_date (CajaIconCanvasItem *icon_item)
23912392
{
2392-
CajaIconCanvasItemDetails *details;
2393+
CajaIconCanvasItemPrivate *details;
23932394
EelIRect icon_rect, emblem_rect, icon_rect_raw;
23942395
EelIRect text_rect, text_rect_for_layout, text_rect_for_entire_text;
23952396
EelIRect total_rect, total_rect_for_layout, total_rect_for_entire_text;
@@ -2799,8 +2800,6 @@ caja_icon_canvas_item_class_init (CajaIconCanvasItemClass *class)
27992800
atk_registry_set_factory_type (atk_get_default_registry (),
28002801
CAJA_TYPE_ICON_CANVAS_ITEM,
28012802
caja_icon_canvas_item_accessible_factory_get_type ());
2802-
2803-
g_type_class_add_private (class, sizeof (CajaIconCanvasItemDetails));
28042803
}
28052804

28062805
static GailTextUtil *
@@ -3469,6 +3468,7 @@ typedef struct {
34693468
G_DEFINE_TYPE_WITH_CODE (CajaIconCanvasItemAccessible,
34703469
caja_icon_canvas_item_accessible,
34713470
eel_canvas_item_accessible_get_type (),
3471+
G_ADD_PRIVATE (CajaIconCanvasItemAccessible)
34723472
G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE,
34733473
caja_icon_canvas_item_accessible_image_interface_init)
34743474
G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT,
@@ -3566,8 +3566,6 @@ caja_icon_canvas_item_accessible_class_init (CajaIconCanvasItemAccessibleClass *
35663566
aclass->get_parent = caja_icon_canvas_item_accessible_get_parent;
35673567
aclass->get_index_in_parent = caja_icon_canvas_item_accessible_get_index_in_parent;
35683568
aclass->ref_state_set = caja_icon_canvas_item_accessible_ref_state_set;
3569-
3570-
g_type_class_add_private (klass, sizeof (CajaIconCanvasItemAccessiblePrivate));
35713569
}
35723570

35733571
static void

‎libcaja-private/caja-icon-canvas-item.h‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@
2828
#include <eel/eel-canvas.h>
2929
#include <eel/eel-art-extensions.h>
3030

31-
#ifdef __cplusplus
32-
extern "C" {
33-
#endif
31+
G_BEGIN_DECLS
3432

3533
#define CAJA_TYPE_ICON_CANVAS_ITEM caja_icon_canvas_item_get_type()
3634
#define CAJA_ICON_CANVAS_ITEM(obj) \
@@ -46,12 +44,12 @@ extern "C" {
4644

4745
typedef struct CajaIconCanvasItem CajaIconCanvasItem;
4846
typedef struct CajaIconCanvasItemClass CajaIconCanvasItemClass;
49-
typedef struct CajaIconCanvasItemDetails CajaIconCanvasItemDetails;
47+
typedef struct _CajaIconCanvasItemPrivate CajaIconCanvasItemPrivate;
5048

5149
struct CajaIconCanvasItem
5250
{
5351
EelCanvasItem item;
54-
CajaIconCanvasItemDetails *details;
52+
CajaIconCanvasItemPrivate *details;
5553
gpointer user_data;
5654
};
5755

@@ -116,8 +114,6 @@ extern "C" {
116114
void caja_icon_canvas_item_set_entire_text (CajaIconCanvasItem *icon_item,
117115
gboolean entire_text);
118116

119-
#ifdef __cplusplus
120-
}
121-
#endif
117+
G_END_DECLS
122118

123119
#endif /* CAJA_ICON_CANVAS_ITEM_H */

‎libcaja-private/caja-trash-monitor.c‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include <gio/gio.h>
3535
#include <string.h>
3636

37-
struct CajaTrashMonitorDetails
37+
struct _CajaTrashMonitorPrivate
3838
{
3939
gboolean empty;
4040
GIcon *icon;
@@ -50,7 +50,7 @@ enum
5050
static guint signals[LAST_SIGNAL] = { 0 };
5151
static CajaTrashMonitor *caja_trash_monitor = NULL;
5252

53-
G_DEFINE_TYPE(CajaTrashMonitor, caja_trash_monitor, G_TYPE_OBJECT)
53+
G_DEFINE_TYPE_WITH_PRIVATE (CajaTrashMonitor, caja_trash_monitor, G_TYPE_OBJECT)
5454

5555
static void
5656
caja_trash_monitor_finalize (GObject *object)
@@ -89,8 +89,6 @@ caja_trash_monitor_class_init (CajaTrashMonitorClass *klass)
8989
g_cclosure_marshal_VOID__BOOLEAN,
9090
G_TYPE_NONE, 1,
9191
G_TYPE_BOOLEAN);
92-
93-
g_type_class_add_private (object_class, sizeof(CajaTrashMonitorDetails));
9492
}
9593

9694
static void
@@ -181,9 +179,7 @@ caja_trash_monitor_init (CajaTrashMonitor *trash_monitor)
181179
{
182180
GFile *location;
183181

184-
trash_monitor->details = G_TYPE_INSTANCE_GET_PRIVATE (trash_monitor,
185-
CAJA_TYPE_TRASH_MONITOR,
186-
CajaTrashMonitorDetails);
182+
trash_monitor->details = caja_trash_monitor_get_instance_private (trash_monitor);
187183

188184
trash_monitor->details->empty = TRUE;
189185
trash_monitor->details->icon = g_themed_icon_new (CAJA_ICON_TRASH);

‎libcaja-private/caja-trash-monitor.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
typedef struct CajaTrashMonitor CajaTrashMonitor;
3333
typedef struct CajaTrashMonitorClass CajaTrashMonitorClass;
34-
typedef struct CajaTrashMonitorDetails CajaTrashMonitorDetails;
34+
typedef struct _CajaTrashMonitorPrivate CajaTrashMonitorPrivate;
3535

3636
#define CAJA_TYPE_TRASH_MONITOR caja_trash_monitor_get_type()
3737
#define CAJA_TRASH_MONITOR(obj) \
@@ -48,7 +48,7 @@ typedef struct CajaTrashMonitorDetails CajaTrashMonitorDetails;
4848
struct CajaTrashMonitor
4949
{
5050
GObject object;
51-
CajaTrashMonitorDetails *details;
51+
CajaTrashMonitorPrivate *details;
5252
};
5353

5454
struct CajaTrashMonitorClass

‎libcaja-private/caja-undostack-manager.c‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,6 @@ struct _CajaUndoStackManagerPrivate
104104
gboolean confirm_delete;
105105
};
106106

107-
#define CAJA_UNDOSTACK_MANAGER_GET_PRIVATE(o) \
108-
(G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CAJA_UNDOSTACK_MANAGER, CajaUndoStackManagerPrivate))
109-
110107
/* *****************************************************************
111108
Properties management prototypes
112109
***************************************************************** */
@@ -131,7 +128,7 @@ static void caja_undostack_manager_dispose (GObject * object);
131128
/* *****************************************************************
132129
Type definition
133130
***************************************************************** */
134-
G_DEFINE_TYPE (CajaUndoStackManager, caja_undostack_manager,
131+
G_DEFINE_TYPE_WITH_PRIVATE (CajaUndoStackManager, caja_undostack_manager,
135132
G_TYPE_OBJECT);
136133

137134
/* *****************************************************************
@@ -218,9 +215,6 @@ caja_undostack_manager_class_init (CajaUndoStackManagerClass * klass)
218215
GParamSpec *confirm_delete;
219216
GObjectClass *g_object_class;
220217

221-
/* Add private structure */
222-
g_type_class_add_private (klass, sizeof (CajaUndoStackManagerPrivate));
223-
224218
/* Create properties */
225219
undo_levels = g_param_spec_uint ("undo-levels", "undo levels",
226220
"Number of undo levels to be stored",
@@ -261,7 +255,7 @@ caja_undostack_manager_init (CajaUndoStackManager * self)
261255
{
262256
CajaUndoStackManagerPrivate *priv;
263257

264-
priv = CAJA_UNDOSTACK_MANAGER_GET_PRIVATE (self);
258+
priv = caja_undostack_manager_get_instance_private (self);
265259

266260
self->priv = priv;
267261

0 commit comments

Comments
 (0)