Skip to content

Commit d373d6c

Browse files
yetistlukefromdc
authored andcommitted
CajaApplication: avoid deprecated 'g_type_class_add_private'
1 parent a9211bd commit d373d6c

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

‎src/caja-application.c‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,16 @@ static CajaFreedesktopDBus *fdb_manager = NULL;
105105
static char * caja_application_get_session_data (CajaApplication *self);
106106
void caja_application_quit (CajaApplication *self);
107107

108-
G_DEFINE_TYPE (CajaApplication, caja_application, GTK_TYPE_APPLICATION);
109-
struct _CajaApplicationPriv {
108+
struct _CajaApplicationPrivate {
110109
GVolumeMonitor *volume_monitor;
111110
gboolean no_desktop;
112111
gboolean force_desktop;
113112
gboolean autostart;
114113
gchar *geometry;
115114
};
116115

116+
G_DEFINE_TYPE_WITH_PRIVATE (CajaApplication, caja_application, GTK_TYPE_APPLICATION);
117+
117118
GList *
118119
caja_application_get_spatial_window_list (void)
119120
{
@@ -428,9 +429,7 @@ static void
428429
caja_application_init (CajaApplication *application)
429430
{
430431
GSimpleAction *action;
431-
application->priv =
432-
G_TYPE_INSTANCE_GET_PRIVATE (application, CAJA_TYPE_APPLICATION,
433-
CajaApplicationPriv);
432+
application->priv = caja_application_get_instance_private (application);
434433
action = g_simple_action_new ("quit", NULL);
435434

436435
g_action_map_add_action (G_ACTION_MAP (application), G_ACTION (action));
@@ -2479,7 +2478,6 @@ caja_application_class_init (CajaApplicationClass *class)
24792478
application_class->open = caja_application_open;
24802479
application_class->local_command_line = caja_application_local_command_line;
24812480

2482-
g_type_class_add_private (class, sizeof (CajaApplicationPriv));
24832481
}
24842482

24852483
CajaApplication *

‎src/caja-application.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ typedef struct CajaWindow CajaWindow;
5959
typedef struct _CajaSpatialWindow CajaSpatialWindow;
6060
#endif
6161

62-
typedef struct _CajaApplicationPriv CajaApplicationPriv;
62+
typedef struct _CajaApplicationPrivate CajaApplicationPrivate;
6363

6464
typedef struct
6565
{
6666
GtkApplication parent;
67-
CajaApplicationPriv *priv;
67+
CajaApplicationPrivate *priv;
6868

6969
EggSMClient* smclient;
7070
GVolumeMonitor* volume_monitor;

0 commit comments

Comments
 (0)