Skip to content

Commit

Permalink
Avoid deprecated g_type_class_add_private under libcaja-private
Browse files Browse the repository at this point in the history 
Changed CajaDesktopLink, CajaDirectoryAsync and CajaDirectory
  • Loading branch information
@yetist @lukefromdc
yetist authored and lukefromdc committed Jan 31, 2019
1 parent e226dda commit e5129f9
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 63 deletions.
10 changes: 3 additions & 7 deletions libcaja-private/caja-desktop-link.c
View file
Expand Up @@ -36,7 +36,7 @@
#include <libcaja-private/caja-global-preferences.h>
#include <string.h>

struct CajaDesktopLinkDetails
struct _CajaDesktopLinkPrivate
{
CajaDesktopLinkType type;
char *filename;
Expand All @@ -53,7 +53,7 @@ struct CajaDesktopLinkDetails
GMount *mount;
};

G_DEFINE_TYPE(CajaDesktopLink, caja_desktop_link, G_TYPE_OBJECT)
G_DEFINE_TYPE_WITH_PRIVATE (CajaDesktopLink, caja_desktop_link, G_TYPE_OBJECT)

static void
create_icon_file (CajaDesktopLink *link)
Expand Down Expand Up @@ -446,9 +446,7 @@ caja_desktop_link_rename (CajaDesktopLink *link,
static void
caja_desktop_link_init (CajaDesktopLink *link)
{
link->details = G_TYPE_INSTANCE_GET_PRIVATE (link,
CAJA_TYPE_DESKTOP_LINK,
CajaDesktopLinkDetails);
link->details = caja_desktop_link_get_instance_private (link);
}

static void
Expand Down Expand Up @@ -529,6 +527,4 @@ caja_desktop_link_class_init (CajaDesktopLinkClass *klass)
object_class = G_OBJECT_CLASS (klass);

object_class->finalize = desktop_link_finalize;

g_type_class_add_private (object_class, sizeof(CajaDesktopLinkDetails));
}
4 changes: 2 additions & 2 deletions libcaja-private/caja-desktop-link.h
View file
Expand Up @@ -40,12 +40,12 @@
#define CAJA_DESKTOP_LINK_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), CAJA_TYPE_DESKTOP_LINK, CajaDesktopLinkClass))

typedef struct CajaDesktopLinkDetails CajaDesktopLinkDetails;
typedef struct _CajaDesktopLinkPrivate CajaDesktopLinkPrivate;

typedef struct
{
GObject parent_slot;
CajaDesktopLinkDetails *details;
CajaDesktopLinkPrivate *details;
} CajaDesktopLink;

typedef struct
Expand Down
2 changes: 1 addition & 1 deletion libcaja-private/caja-directory-private.h
View file
Expand Up @@ -68,7 +68,7 @@ typedef gint32 RequestCounter[REQUEST_TYPE_LAST];
#define REQUEST_WANTS_TYPE(request, type) ((request) & (1<<(type)))
#define REQUEST_SET_TYPE(request, type) (request) |= (1<<(type))

struct CajaDirectoryDetails
struct _CajaDirectoryPrivate
{
/* The location. */
GFile *location;
Expand Down
116 changes: 65 additions & 51 deletions libcaja-private/caja-directory.c
View file
Expand Up @@ -54,8 +54,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
static GHashTable *directories;

static void caja_directory_finalize (GObject *object);
static void caja_directory_init (gpointer object,
gpointer klass);
static void caja_directory_init (CajaDirectory *directory);
static void caja_directory_class_init (CajaDirectoryClass *klass);
static CajaDirectory *caja_directory_new (GFile *location);
static char * real_get_name_for_self_as_new_file (CajaDirectory *directory);
Expand All @@ -64,9 +63,7 @@ static gboolean real_is_editable (CajaDirectory *dire
static void set_directory_location (CajaDirectory *directory,
GFile *location);

EEL_CLASS_BOILERPLATE (CajaDirectory,
caja_directory,
G_TYPE_OBJECT)
G_DEFINE_TYPE_WITH_PRIVATE (CajaDirectory, caja_directory, G_TYPE_OBJECT)

static void
caja_directory_class_init (CajaDirectoryClass *klass)
Expand Down Expand Up @@ -113,18 +110,12 @@ caja_directory_class_init (CajaDirectoryClass *klass)
klass->get_name_for_self_as_new_file = real_get_name_for_self_as_new_file;
klass->get_file_list = real_get_file_list;
klass->is_editable = real_is_editable;

g_type_class_add_private (klass, sizeof (CajaDirectoryDetails));
}

static void
caja_directory_init (gpointer object, gpointer klass)
caja_directory_init (CajaDirectory *directory)
{
CajaDirectory *directory;

directory = CAJA_DIRECTORY(object);

directory->details = G_TYPE_INSTANCE_GET_PRIVATE ((directory), CAJA_TYPE_DIRECTORY, CajaDirectoryDetails);
directory->details = caja_directory_get_instance_private (directory);
directory->details->file_hash = g_hash_table_new (g_str_hash, g_str_equal);
directory->details->high_priority_queue = caja_file_queue_new ();
directory->details->low_priority_queue = caja_file_queue_new ();
Expand Down Expand Up @@ -209,7 +200,7 @@ caja_directory_finalize (GObject *object)
g_assert (directory->details->dequeue_pending_idle_id == 0);
g_list_free_full (directory->details->pending_file_info, g_object_unref);

EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
G_OBJECT_CLASS (caja_directory_parent_class)->finalize (object);
}

void
Expand Down Expand Up @@ -415,9 +406,10 @@ caja_directory_get_name_for_self_as_new_file (CajaDirectory *directory)
{
g_return_val_if_fail (CAJA_IS_DIRECTORY (directory), NULL);

return EEL_CALL_METHOD_WITH_RETURN_VALUE
(CAJA_DIRECTORY_CLASS, directory,
get_name_for_self_as_new_file, (directory));
if (CAJA_DIRECTORY_GET_CLASS(directory)->get_name_for_self_as_new_file == NULL)
return NULL;
else
return CAJA_DIRECTORY_GET_CLASS(directory)->get_name_for_self_as_new_file (directory);
}

static char *
Expand Down Expand Up @@ -522,9 +514,12 @@ caja_directory_are_all_files_seen (CajaDirectory *directory)
{
g_return_val_if_fail (CAJA_IS_DIRECTORY (directory), FALSE);

return EEL_CALL_METHOD_WITH_RETURN_VALUE
(CAJA_DIRECTORY_CLASS, directory,
are_all_files_seen, (directory));
if (CAJA_DIRECTORY_GET_CLASS(directory)->are_all_files_seen == NULL)
{
return FALSE;
} else {
return CAJA_DIRECTORY_GET_CLASS(directory)->are_all_files_seen (directory);
}
}

static void
Expand Down Expand Up @@ -1394,9 +1389,10 @@ caja_directory_contains_file (CajaDirectory *directory,
return FALSE;
}

return EEL_CALL_METHOD_WITH_RETURN_VALUE
(CAJA_DIRECTORY_CLASS, directory,
contains_file, (directory, file));
if (CAJA_DIRECTORY_GET_CLASS(directory)->contains_file == NULL)
return FALSE;
else
return CAJA_DIRECTORY_GET_CLASS(directory)->contains_file (directory, file);
}

void
Expand All @@ -1409,10 +1405,14 @@ caja_directory_call_when_ready (CajaDirectory *directory,
g_return_if_fail (CAJA_IS_DIRECTORY (directory));
g_return_if_fail (callback != NULL);

EEL_CALL_METHOD
(CAJA_DIRECTORY_CLASS, directory,
call_when_ready, (directory, file_attributes, wait_for_all_files,
callback, callback_data));
if (CAJA_DIRECTORY_GET_CLASS(directory)->call_when_ready != NULL)
{
CAJA_DIRECTORY_GET_CLASS(directory)->call_when_ready (directory,
file_attributes,
wait_for_all_files,
callback,
callback_data);
}
}

void
Expand All @@ -1423,9 +1423,10 @@ caja_directory_cancel_callback (CajaDirectory *directory,
g_return_if_fail (CAJA_IS_DIRECTORY (directory));
g_return_if_fail (callback != NULL);

EEL_CALL_METHOD
(CAJA_DIRECTORY_CLASS, directory,
cancel_callback, (directory, callback, callback_data));
if (CAJA_DIRECTORY_GET_CLASS(directory)->cancel_callback != NULL)
{
CAJA_DIRECTORY_GET_CLASS(directory)->cancel_callback (directory, callback, callback_data);
}
}

void
Expand All @@ -1439,12 +1440,14 @@ caja_directory_file_monitor_add (CajaDirectory *directory,
g_return_if_fail (CAJA_IS_DIRECTORY (directory));
g_return_if_fail (client != NULL);

EEL_CALL_METHOD
(CAJA_DIRECTORY_CLASS, directory,
file_monitor_add, (directory, client,
monitor_hidden_files,
file_attributes,
callback, callback_data));
if (CAJA_DIRECTORY_GET_CLASS(directory)->file_monitor_add != NULL)
{
CAJA_DIRECTORY_GET_CLASS(directory)->file_monitor_add (directory,
client,
monitor_hidden_files,
file_attributes,
callback, callback_data);
}
}

void
Expand All @@ -1454,29 +1457,34 @@ caja_directory_file_monitor_remove (CajaDirectory *directory,
g_return_if_fail (CAJA_IS_DIRECTORY (directory));
g_return_if_fail (client != NULL);

EEL_CALL_METHOD
(CAJA_DIRECTORY_CLASS, directory,
file_monitor_remove, (directory, client));
if (CAJA_DIRECTORY_GET_CLASS(directory)->file_monitor_remove != NULL)
{
CAJA_DIRECTORY_GET_CLASS(directory)->file_monitor_remove (directory, client);
}
}

void
caja_directory_force_reload (CajaDirectory *directory)
{
g_return_if_fail (CAJA_IS_DIRECTORY (directory));

EEL_CALL_METHOD
(CAJA_DIRECTORY_CLASS, directory,
force_reload, (directory));
if (CAJA_DIRECTORY_GET_CLASS(directory)->force_reload != NULL)
{
CAJA_DIRECTORY_GET_CLASS(directory)->force_reload (directory);
}
}

gboolean
caja_directory_is_not_empty (CajaDirectory *directory)
{
g_return_val_if_fail (CAJA_IS_DIRECTORY (directory), FALSE);

return EEL_CALL_METHOD_WITH_RETURN_VALUE
(CAJA_DIRECTORY_CLASS, directory,
is_not_empty, (directory));
if (CAJA_DIRECTORY_GET_CLASS(directory)->is_not_empty == NULL)
{
return FALSE;
} else {
return CAJA_DIRECTORY_GET_CLASS(directory)->is_not_empty (directory);
}
}

static gboolean
Expand All @@ -1497,9 +1505,12 @@ is_tentative (gpointer data, gpointer callback_data)
GList *
caja_directory_get_file_list (CajaDirectory *directory)
{
return EEL_CALL_METHOD_WITH_RETURN_VALUE
(CAJA_DIRECTORY_CLASS, directory,
get_file_list, (directory));
if (CAJA_DIRECTORY_GET_CLASS(directory)->get_file_list == NULL)
{
return NULL;
} else {
return CAJA_DIRECTORY_GET_CLASS(directory)->get_file_list (directory);
}
}

static GList *
Expand All @@ -1525,9 +1536,12 @@ real_is_editable (CajaDirectory *directory)
gboolean
caja_directory_is_editable (CajaDirectory *directory)
{
return EEL_CALL_METHOD_WITH_RETURN_VALUE
(CAJA_DIRECTORY_CLASS, directory,
is_editable, (directory));
if (CAJA_DIRECTORY_GET_CLASS(directory)->is_editable == NULL)
{
return FALSE;
} else {
return CAJA_DIRECTORY_GET_CLASS(directory)->is_editable (directory);
}
}

GList *
Expand Down
7 changes: 5 additions & 2 deletions libcaja-private/caja-directory.h
View file
Expand Up @@ -29,6 +29,8 @@
#include <gio/gio.h>
#include <libcaja-private/caja-file-attributes.h>

G_BEGIN_DECLS

/* CajaDirectory is a class that manages the model for a directory,
real or virtual, for Caja, mainly the file-manager component. The directory is
responsible for managing both real data and cached metadata. On top of
Expand Down Expand Up @@ -59,12 +61,12 @@
typedef struct CajaFile CajaFile;
#endif

typedef struct CajaDirectoryDetails CajaDirectoryDetails;
typedef struct _CajaDirectoryPrivate CajaDirectoryPrivate;

typedef struct
{
GObject object;
CajaDirectoryDetails *details;
CajaDirectoryPrivate *details;
} CajaDirectory;

typedef void (*CajaDirectoryCallback) (CajaDirectory *directory,
Expand Down Expand Up @@ -233,5 +235,6 @@ gboolean caja_directory_is_desktop_directory (CajaDirectory

gboolean caja_directory_is_editable (CajaDirectory *directory);

G_END_DECLS

#endif /* CAJA_DIRECTORY_H */

0 comments on commit e5129f9

Please sign in to comment.