Skip to content

Commit e5129f9

Browse files
yetistlukefromdc
yetist
authored and
lukefromdc
committed
Avoid deprecated g_type_class_add_private under libcaja-private
Changed CajaDesktopLink, CajaDirectoryAsync and CajaDirectory
1 parent e226dda commit e5129f9

File tree

5 files changed

+76
-63
lines changed

5 files changed

+76
-63
lines changed

‎libcaja-private/caja-desktop-link.c‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include <libcaja-private/caja-global-preferences.h>
3737
#include <string.h>
3838

39-
struct CajaDesktopLinkDetails
39+
struct _CajaDesktopLinkPrivate
4040
{
4141
CajaDesktopLinkType type;
4242
char *filename;
@@ -53,7 +53,7 @@ struct CajaDesktopLinkDetails
5353
GMount *mount;
5454
};
5555

56-
G_DEFINE_TYPE(CajaDesktopLink, caja_desktop_link, G_TYPE_OBJECT)
56+
G_DEFINE_TYPE_WITH_PRIVATE (CajaDesktopLink, caja_desktop_link, G_TYPE_OBJECT)
5757

5858
static void
5959
create_icon_file (CajaDesktopLink *link)
@@ -446,9 +446,7 @@ caja_desktop_link_rename (CajaDesktopLink *link,
446446
static void
447447
caja_desktop_link_init (CajaDesktopLink *link)
448448
{
449-
link->details = G_TYPE_INSTANCE_GET_PRIVATE (link,
450-
CAJA_TYPE_DESKTOP_LINK,
451-
CajaDesktopLinkDetails);
449+
link->details = caja_desktop_link_get_instance_private (link);
452450
}
453451

454452
static void
@@ -529,6 +527,4 @@ caja_desktop_link_class_init (CajaDesktopLinkClass *klass)
529527
object_class = G_OBJECT_CLASS (klass);
530528

531529
object_class->finalize = desktop_link_finalize;
532-
533-
g_type_class_add_private (object_class, sizeof(CajaDesktopLinkDetails));
534530
}

‎libcaja-private/caja-desktop-link.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@
4040
#define CAJA_DESKTOP_LINK_GET_CLASS(obj) \
4141
(G_TYPE_INSTANCE_GET_CLASS ((obj), CAJA_TYPE_DESKTOP_LINK, CajaDesktopLinkClass))
4242

43-
typedef struct CajaDesktopLinkDetails CajaDesktopLinkDetails;
43+
typedef struct _CajaDesktopLinkPrivate CajaDesktopLinkPrivate;
4444

4545
typedef struct
4646
{
4747
GObject parent_slot;
48-
CajaDesktopLinkDetails *details;
48+
CajaDesktopLinkPrivate *details;
4949
} CajaDesktopLink;
5050

5151
typedef struct

‎libcaja-private/caja-directory-private.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ typedef gint32 RequestCounter[REQUEST_TYPE_LAST];
6868
#define REQUEST_WANTS_TYPE(request, type) ((request) & (1<<(type)))
6969
#define REQUEST_SET_TYPE(request, type) (request) |= (1<<(type))
7070

71-
struct CajaDirectoryDetails
71+
struct _CajaDirectoryPrivate
7272
{
7373
/* The location. */
7474
GFile *location;

‎libcaja-private/caja-directory.c‎

Lines changed: 65 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
5454
static GHashTable *directories;
5555

5656
static void caja_directory_finalize (GObject *object);
57-
static void caja_directory_init (gpointer object,
58-
gpointer klass);
57+
static void caja_directory_init (CajaDirectory *directory);
5958
static void caja_directory_class_init (CajaDirectoryClass *klass);
6059
static CajaDirectory *caja_directory_new (GFile *location);
6160
static char * real_get_name_for_self_as_new_file (CajaDirectory *directory);
@@ -64,9 +63,7 @@ static gboolean real_is_editable (CajaDirectory *dire
6463
static void set_directory_location (CajaDirectory *directory,
6564
GFile *location);
6665

67-
EEL_CLASS_BOILERPLATE (CajaDirectory,
68-
caja_directory,
69-
G_TYPE_OBJECT)
66+
G_DEFINE_TYPE_WITH_PRIVATE (CajaDirectory, caja_directory, G_TYPE_OBJECT)
7067

7168
static void
7269
caja_directory_class_init (CajaDirectoryClass *klass)
@@ -113,18 +110,12 @@ caja_directory_class_init (CajaDirectoryClass *klass)
113110
klass->get_name_for_self_as_new_file = real_get_name_for_self_as_new_file;
114111
klass->get_file_list = real_get_file_list;
115112
klass->is_editable = real_is_editable;
116-
117-
g_type_class_add_private (klass, sizeof (CajaDirectoryDetails));
118113
}
119114

120115
static void
121-
caja_directory_init (gpointer object, gpointer klass)
116+
caja_directory_init (CajaDirectory *directory)
122117
{
123-
CajaDirectory *directory;
124-
125-
directory = CAJA_DIRECTORY(object);
126-
127-
directory->details = G_TYPE_INSTANCE_GET_PRIVATE ((directory), CAJA_TYPE_DIRECTORY, CajaDirectoryDetails);
118+
directory->details = caja_directory_get_instance_private (directory);
128119
directory->details->file_hash = g_hash_table_new (g_str_hash, g_str_equal);
129120
directory->details->high_priority_queue = caja_file_queue_new ();
130121
directory->details->low_priority_queue = caja_file_queue_new ();
@@ -209,7 +200,7 @@ caja_directory_finalize (GObject *object)
209200
g_assert (directory->details->dequeue_pending_idle_id == 0);
210201
g_list_free_full (directory->details->pending_file_info, g_object_unref);
211202

212-
EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
203+
G_OBJECT_CLASS (caja_directory_parent_class)->finalize (object);
213204
}
214205

215206
void
@@ -415,9 +406,10 @@ caja_directory_get_name_for_self_as_new_file (CajaDirectory *directory)
415406
{
416407
g_return_val_if_fail (CAJA_IS_DIRECTORY (directory), NULL);
417408

418-
return EEL_CALL_METHOD_WITH_RETURN_VALUE
419-
(CAJA_DIRECTORY_CLASS, directory,
420-
get_name_for_self_as_new_file, (directory));
409+
if (CAJA_DIRECTORY_GET_CLASS(directory)->get_name_for_self_as_new_file == NULL)
410+
return NULL;
411+
else
412+
return CAJA_DIRECTORY_GET_CLASS(directory)->get_name_for_self_as_new_file (directory);
421413
}
422414

423415
static char *
@@ -522,9 +514,12 @@ caja_directory_are_all_files_seen (CajaDirectory *directory)
522514
{
523515
g_return_val_if_fail (CAJA_IS_DIRECTORY (directory), FALSE);
524516

525-
return EEL_CALL_METHOD_WITH_RETURN_VALUE
526-
(CAJA_DIRECTORY_CLASS, directory,
527-
are_all_files_seen, (directory));
517+
if (CAJA_DIRECTORY_GET_CLASS(directory)->are_all_files_seen == NULL)
518+
{
519+
return FALSE;
520+
} else {
521+
return CAJA_DIRECTORY_GET_CLASS(directory)->are_all_files_seen (directory);
522+
}
528523
}
529524

530525
static void
@@ -1394,9 +1389,10 @@ caja_directory_contains_file (CajaDirectory *directory,
13941389
return FALSE;
13951390
}
13961391

1397-
return EEL_CALL_METHOD_WITH_RETURN_VALUE
1398-
(CAJA_DIRECTORY_CLASS, directory,
1399-
contains_file, (directory, file));
1392+
if (CAJA_DIRECTORY_GET_CLASS(directory)->contains_file == NULL)
1393+
return FALSE;
1394+
else
1395+
return CAJA_DIRECTORY_GET_CLASS(directory)->contains_file (directory, file);
14001396
}
14011397

14021398
void
@@ -1409,10 +1405,14 @@ caja_directory_call_when_ready (CajaDirectory *directory,
14091405
g_return_if_fail (CAJA_IS_DIRECTORY (directory));
14101406
g_return_if_fail (callback != NULL);
14111407

1412-
EEL_CALL_METHOD
1413-
(CAJA_DIRECTORY_CLASS, directory,
1414-
call_when_ready, (directory, file_attributes, wait_for_all_files,
1415-
callback, callback_data));
1408+
if (CAJA_DIRECTORY_GET_CLASS(directory)->call_when_ready != NULL)
1409+
{
1410+
CAJA_DIRECTORY_GET_CLASS(directory)->call_when_ready (directory,
1411+
file_attributes,
1412+
wait_for_all_files,
1413+
callback,
1414+
callback_data);
1415+
}
14161416
}
14171417

14181418
void
@@ -1423,9 +1423,10 @@ caja_directory_cancel_callback (CajaDirectory *directory,
14231423
g_return_if_fail (CAJA_IS_DIRECTORY (directory));
14241424
g_return_if_fail (callback != NULL);
14251425

1426-
EEL_CALL_METHOD
1427-
(CAJA_DIRECTORY_CLASS, directory,
1428-
cancel_callback, (directory, callback, callback_data));
1426+
if (CAJA_DIRECTORY_GET_CLASS(directory)->cancel_callback != NULL)
1427+
{
1428+
CAJA_DIRECTORY_GET_CLASS(directory)->cancel_callback (directory, callback, callback_data);
1429+
}
14291430
}
14301431

14311432
void
@@ -1439,12 +1440,14 @@ caja_directory_file_monitor_add (CajaDirectory *directory,
14391440
g_return_if_fail (CAJA_IS_DIRECTORY (directory));
14401441
g_return_if_fail (client != NULL);
14411442

1442-
EEL_CALL_METHOD
1443-
(CAJA_DIRECTORY_CLASS, directory,
1444-
file_monitor_add, (directory, client,
1445-
monitor_hidden_files,
1446-
file_attributes,
1447-
callback, callback_data));
1443+
if (CAJA_DIRECTORY_GET_CLASS(directory)->file_monitor_add != NULL)
1444+
{
1445+
CAJA_DIRECTORY_GET_CLASS(directory)->file_monitor_add (directory,
1446+
client,
1447+
monitor_hidden_files,
1448+
file_attributes,
1449+
callback, callback_data);
1450+
}
14481451
}
14491452

14501453
void
@@ -1454,29 +1457,34 @@ caja_directory_file_monitor_remove (CajaDirectory *directory,
14541457
g_return_if_fail (CAJA_IS_DIRECTORY (directory));
14551458
g_return_if_fail (client != NULL);
14561459

1457-
EEL_CALL_METHOD
1458-
(CAJA_DIRECTORY_CLASS, directory,
1459-
file_monitor_remove, (directory, client));
1460+
if (CAJA_DIRECTORY_GET_CLASS(directory)->file_monitor_remove != NULL)
1461+
{
1462+
CAJA_DIRECTORY_GET_CLASS(directory)->file_monitor_remove (directory, client);
1463+
}
14601464
}
14611465

14621466
void
14631467
caja_directory_force_reload (CajaDirectory *directory)
14641468
{
14651469
g_return_if_fail (CAJA_IS_DIRECTORY (directory));
14661470

1467-
EEL_CALL_METHOD
1468-
(CAJA_DIRECTORY_CLASS, directory,
1469-
force_reload, (directory));
1471+
if (CAJA_DIRECTORY_GET_CLASS(directory)->force_reload != NULL)
1472+
{
1473+
CAJA_DIRECTORY_GET_CLASS(directory)->force_reload (directory);
1474+
}
14701475
}
14711476

14721477
gboolean
14731478
caja_directory_is_not_empty (CajaDirectory *directory)
14741479
{
14751480
g_return_val_if_fail (CAJA_IS_DIRECTORY (directory), FALSE);
14761481

1477-
return EEL_CALL_METHOD_WITH_RETURN_VALUE
1478-
(CAJA_DIRECTORY_CLASS, directory,
1479-
is_not_empty, (directory));
1482+
if (CAJA_DIRECTORY_GET_CLASS(directory)->is_not_empty == NULL)
1483+
{
1484+
return FALSE;
1485+
} else {
1486+
return CAJA_DIRECTORY_GET_CLASS(directory)->is_not_empty (directory);
1487+
}
14801488
}
14811489

14821490
static gboolean
@@ -1497,9 +1505,12 @@ is_tentative (gpointer data, gpointer callback_data)
14971505
GList *
14981506
caja_directory_get_file_list (CajaDirectory *directory)
14991507
{
1500-
return EEL_CALL_METHOD_WITH_RETURN_VALUE
1501-
(CAJA_DIRECTORY_CLASS, directory,
1502-
get_file_list, (directory));
1508+
if (CAJA_DIRECTORY_GET_CLASS(directory)->get_file_list == NULL)
1509+
{
1510+
return NULL;
1511+
} else {
1512+
return CAJA_DIRECTORY_GET_CLASS(directory)->get_file_list (directory);
1513+
}
15031514
}
15041515

15051516
static GList *
@@ -1525,9 +1536,12 @@ real_is_editable (CajaDirectory *directory)
15251536
gboolean
15261537
caja_directory_is_editable (CajaDirectory *directory)
15271538
{
1528-
return EEL_CALL_METHOD_WITH_RETURN_VALUE
1529-
(CAJA_DIRECTORY_CLASS, directory,
1530-
is_editable, (directory));
1539+
if (CAJA_DIRECTORY_GET_CLASS(directory)->is_editable == NULL)
1540+
{
1541+
return FALSE;
1542+
} else {
1543+
return CAJA_DIRECTORY_GET_CLASS(directory)->is_editable (directory);
1544+
}
15311545
}
15321546

15331547
GList *

‎libcaja-private/caja-directory.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
#include <gio/gio.h>
3030
#include <libcaja-private/caja-file-attributes.h>
3131

32+
G_BEGIN_DECLS
33+
3234
/* CajaDirectory is a class that manages the model for a directory,
3335
real or virtual, for Caja, mainly the file-manager component. The directory is
3436
responsible for managing both real data and cached metadata. On top of
@@ -59,12 +61,12 @@
5961
typedef struct CajaFile CajaFile;
6062
#endif
6163

62-
typedef struct CajaDirectoryDetails CajaDirectoryDetails;
64+
typedef struct _CajaDirectoryPrivate CajaDirectoryPrivate;
6365

6466
typedef struct
6567
{
6668
GObject object;
67-
CajaDirectoryDetails *details;
69+
CajaDirectoryPrivate *details;
6870
} CajaDirectory;
6971

7072
typedef void (*CajaDirectoryCallback) (CajaDirectory *directory,
@@ -233,5 +235,6 @@ gboolean caja_directory_is_desktop_directory (CajaDirectory
233235

234236
gboolean caja_directory_is_editable (CajaDirectory *directory);
235237

238+
G_END_DECLS
236239

237240
#endif /* CAJA_DIRECTORY_H */

0 commit comments

Comments
 (0)