Skip to content

Commit 9cd63d4

Browse files
yetistraveit65
yetist
authored and
raveit65
committed
Avoid deprecated g_type_class_add_private under libcaja-private
Changed CajaClipboardMonitor, CajaColumnChooser and CajaDesktopIconFile
1 parent 4196136 commit 9cd63d4

File tree

6 files changed

+15
-27
lines changed

6 files changed

+15
-27
lines changed

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ enum
5353
LAST_SIGNAL
5454
};
5555

56-
struct CajaClipboardMonitorDetails
56+
struct _CajaClipboardMonitorPrivate
5757
{
5858
CajaClipboardInfo *info;
5959
};
6060

6161
static guint signals[LAST_SIGNAL] = { 0 };
6262
static GdkAtom copied_files_atom;
6363

64-
G_DEFINE_TYPE (CajaClipboardMonitor, caja_clipboard_monitor, G_TYPE_OBJECT);
64+
G_DEFINE_TYPE_WITH_PRIVATE (CajaClipboardMonitor, caja_clipboard_monitor, G_TYPE_OBJECT);
6565

6666
static CajaClipboardMonitor *clipboard_monitor = NULL;
6767

@@ -141,9 +141,7 @@ caja_clipboard_info_free (CajaClipboardInfo *info)
141141
static void
142142
caja_clipboard_monitor_init (CajaClipboardMonitor *monitor)
143143
{
144-
monitor->details =
145-
G_TYPE_INSTANCE_GET_PRIVATE (monitor, CAJA_TYPE_CLIPBOARD_MONITOR,
146-
CajaClipboardMonitorDetails);
144+
monitor->details = caja_clipboard_monitor_get_instance_private (monitor);
147145
}
148146

149147
static void
@@ -189,8 +187,6 @@ caja_clipboard_monitor_class_init (CajaClipboardMonitorClass *klass)
189187
g_cclosure_marshal_VOID__POINTER,
190188
G_TYPE_NONE,
191189
1, G_TYPE_POINTER);
192-
193-
g_type_class_add_private (klass, sizeof (CajaClipboardMonitorDetails));
194190
}
195191

196192
void

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@
3939
#define CAJA_CLIPBOARD_MONITOR_GET_CLASS(obj) \
4040
(G_TYPE_INSTANCE_GET_CLASS ((obj), CAJA_TYPE_CLIPBOARD_MONITOR, CajaClipboardMonitorClass))
4141

42-
typedef struct CajaClipboardMonitorDetails CajaClipboardMonitorDetails;
42+
typedef struct _CajaClipboardMonitorPrivate CajaClipboardMonitorPrivate;
4343
typedef struct CajaClipboardInfo CajaClipboardInfo;
4444

4545
typedef struct
4646
{
4747
GObject parent_slot;
4848

49-
CajaClipboardMonitorDetails *details;
49+
CajaClipboardMonitorPrivate *details;
5050
} CajaClipboardMonitor;
5151

5252
typedef struct

‎libcaja-private/caja-column-chooser.c‎

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

3232
#include "caja-column-utilities.h"
3333

34-
struct _CajaColumnChooserDetails
34+
struct _CajaColumnChooserPrivate
3535
{
3636
GtkTreeView *view;
3737
GtkListStore *store;
@@ -65,7 +65,7 @@ enum
6565
};
6666
static guint signals[LAST_SIGNAL] = { 0 };
6767

68-
G_DEFINE_TYPE(CajaColumnChooser, caja_column_chooser, GTK_TYPE_BOX);
68+
G_DEFINE_TYPE_WITH_PRIVATE (CajaColumnChooser, caja_column_chooser, GTK_TYPE_BOX);
6969

7070
static void caja_column_chooser_constructed (GObject *object);
7171

@@ -128,8 +128,6 @@ caja_column_chooser_class_init (CajaColumnChooserClass *chooser_class)
128128
CAJA_TYPE_FILE,
129129
G_PARAM_CONSTRUCT_ONLY |
130130
G_PARAM_WRITABLE));
131-
132-
g_type_class_add_private (chooser_class, sizeof (CajaColumnChooserDetails));
133131
}
134132

135133
static void
@@ -463,7 +461,7 @@ caja_column_chooser_constructed (GObject *object)
463461
static void
464462
caja_column_chooser_init (CajaColumnChooser *chooser)
465463
{
466-
chooser->details = G_TYPE_INSTANCE_GET_PRIVATE ((chooser), CAJA_TYPE_COLUMN_CHOOSER, CajaColumnChooserDetails);
464+
chooser->details = caja_column_chooser_get_instance_private (chooser);
467465

468466
g_object_set (G_OBJECT (chooser),
469467
"homogeneous", FALSE,

‎libcaja-private/caja-column-chooser.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040
#define CAJA_COLUMN_CHOOSER_GET_CLASS(obj) \
4141
(G_TYPE_INSTANCE_GET_CLASS ((obj), CAJA_TYPE_COLUMN_CHOOSER, CajaColumnChooserClass))
4242

43-
typedef struct _CajaColumnChooserDetails CajaColumnChooserDetails;
43+
typedef struct _CajaColumnChooserPrivate CajaColumnChooserPrivate;
4444

4545
typedef struct
4646
{
4747
GtkBox parent;
4848

49-
CajaColumnChooserDetails *details;
49+
CajaColumnChooserPrivate *details;
5050
} CajaColumnChooser;
5151

5252
typedef struct

‎libcaja-private/caja-desktop-icon-file.c‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@
4040
#include <string.h>
4141
#include <gio/gio.h>
4242

43-
struct CajaDesktopIconFileDetails
43+
struct _CajaDesktopIconFilePrivate
4444
{
4545
CajaDesktopLink *link;
4646
};
4747

48-
G_DEFINE_TYPE(CajaDesktopIconFile, caja_desktop_icon_file, CAJA_TYPE_FILE)
48+
G_DEFINE_TYPE_WITH_PRIVATE (CajaDesktopIconFile, caja_desktop_icon_file, CAJA_TYPE_FILE)
4949

5050

5151
static void
@@ -166,9 +166,7 @@ desktop_icon_file_get_where_string (CajaFile *file)
166166
static void
167167
caja_desktop_icon_file_init (CajaDesktopIconFile *desktop_file)
168168
{
169-
desktop_file->details = G_TYPE_INSTANCE_GET_PRIVATE (desktop_file,
170-
CAJA_TYPE_DESKTOP_ICON_FILE,
171-
CajaDesktopIconFileDetails);
169+
desktop_file->details = caja_desktop_icon_file_get_instance_private (desktop_file);
172170
}
173171

174172
static void
@@ -384,10 +382,8 @@ caja_desktop_icon_file_set_metadata_as_list (CajaFile *file,
384382
static void
385383
caja_desktop_icon_file_class_init (CajaDesktopIconFileClass *klass)
386384
{
387-
GObjectClass *object_class;
388385
CajaFileClass *file_class;
389386

390-
object_class = G_OBJECT_CLASS (klass);
391387
file_class = CAJA_FILE_CLASS (klass);
392388

393389
file_class->default_file_type = G_FILE_TYPE_DIRECTORY;
@@ -405,6 +401,4 @@ caja_desktop_icon_file_class_init (CajaDesktopIconFileClass *klass)
405401
file_class->set_metadata_as_list = caja_desktop_icon_file_set_metadata_as_list;
406402
file_class->unmount = caja_desktop_icon_file_unmount;
407403
file_class->eject = caja_desktop_icon_file_eject;
408-
409-
g_type_class_add_private (object_class, sizeof(CajaDesktopIconFileDetails));
410404
}

‎libcaja-private/caja-desktop-icon-file.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141
#define CAJA_DESKTOP_ICON_FILE_GET_CLASS(obj) \
4242
(G_TYPE_INSTANCE_GET_CLASS ((obj), CAJA_TYPE_DESKTOP_ICON_FILE, CajaDesktopIconFileClass))
4343

44-
typedef struct CajaDesktopIconFileDetails CajaDesktopIconFileDetails;
44+
typedef struct _CajaDesktopIconFilePrivate CajaDesktopIconFilePrivate;
4545

4646
typedef struct
4747
{
4848
CajaFile parent_slot;
49-
CajaDesktopIconFileDetails *details;
49+
CajaDesktopIconFilePrivate *details;
5050
} CajaDesktopIconFile;
5151

5252
typedef struct

0 commit comments

Comments
 (0)