Skip to content

Commit e8f124d

Browse files
yetistlukefromdc
yetist
authored and
lukefromdc
committed
Avoid deprecated g_type_class_add_private
- caja-connect-server-dialog - caja-navigation-window - caja-property-browser - caja-sidebar-title - caja-trash-bar - caja-window - caja-zoom-action - caja-zoom-control - fm-desktop-icon-view - fm-properties-window
1 parent 331a0e1 commit e8f124d

21 files changed

+81
-118
lines changed

‎src/caja-connect-server-dialog.c‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
* - NetworkManager integration
4646
*/
4747

48-
struct _CajaConnectServerDialogDetails
48+
struct _CajaConnectServerDialogPrivate
4949
{
5050
CajaApplication *application;
5151

@@ -79,7 +79,7 @@ struct _CajaConnectServerDialogDetails
7979
gboolean should_destroy;
8080
};
8181

82-
G_DEFINE_TYPE (CajaConnectServerDialog, caja_connect_server_dialog,
82+
G_DEFINE_TYPE_WITH_PRIVATE (CajaConnectServerDialog, caja_connect_server_dialog,
8383
GTK_TYPE_DIALOG)
8484

8585
static void sensitive_entry_changed_callback (GtkEditable *editable,
@@ -851,8 +851,7 @@ caja_connect_server_dialog_init (CajaConnectServerDialog *dialog)
851851
gchar *str;
852852
int i;
853853

854-
dialog->details = G_TYPE_INSTANCE_GET_PRIVATE (dialog, CAJA_TYPE_CONNECT_SERVER_DIALOG,
855-
CajaConnectServerDialogDetails);
854+
dialog->details = caja_connect_server_dialog_get_instance_private (dialog);
856855

857856
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
858857

@@ -1167,8 +1166,6 @@ caja_connect_server_dialog_class_init (CajaConnectServerDialogClass *class)
11671166

11681167
oclass = G_OBJECT_CLASS (class);
11691168
oclass->finalize = caja_connect_server_dialog_finalize;
1170-
1171-
g_type_class_add_private (class, sizeof (CajaConnectServerDialogDetails));
11721169
}
11731170

11741171
GtkWidget *

‎src/caja-connect-server-dialog.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@
4242

4343
typedef struct _CajaConnectServerDialog CajaConnectServerDialog;
4444
typedef struct _CajaConnectServerDialogClass CajaConnectServerDialogClass;
45-
typedef struct _CajaConnectServerDialogDetails CajaConnectServerDialogDetails;
45+
typedef struct _CajaConnectServerDialogPrivate CajaConnectServerDialogPrivate;
4646

4747
struct _CajaConnectServerDialog
4848
{
4949
GtkDialog parent;
50-
CajaConnectServerDialogDetails *details;
50+
CajaConnectServerDialogPrivate *details;
5151
};
5252

5353
struct _CajaConnectServerDialogClass

‎src/caja-navigation-window.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ static void use_extra_mouse_buttons_changed (gpointer
8888
static CajaWindowSlot *create_extra_pane (CajaNavigationWindow *window);
8989

9090

91-
G_DEFINE_TYPE (CajaNavigationWindow, caja_navigation_window, CAJA_TYPE_WINDOW)
91+
G_DEFINE_TYPE_WITH_PRIVATE (CajaNavigationWindow, caja_navigation_window, CAJA_TYPE_WINDOW)
9292
#define parent_class caja_navigation_window_parent_class
9393

9494
static const struct
@@ -115,7 +115,7 @@ caja_navigation_window_init (CajaNavigationWindow *window)
115115

116116
win = CAJA_WINDOW (window);
117117

118-
window->details = G_TYPE_INSTANCE_GET_PRIVATE (window, CAJA_TYPE_NAVIGATION_WINDOW, CajaNavigationWindowDetails);
118+
window->details = caja_navigation_window_get_instance_private (window);
119119

120120
GtkStyleContext *context;
121121

@@ -1286,8 +1286,6 @@ caja_navigation_window_class_init (CajaNavigationWindowClass *class)
12861286
CAJA_WINDOW_CLASS (class)->open_slot = real_open_slot;
12871287
CAJA_WINDOW_CLASS (class)->close_slot = real_close_slot;
12881288

1289-
g_type_class_add_private (G_OBJECT_CLASS (class), sizeof (CajaNavigationWindowDetails));
1290-
12911289
g_signal_connect_swapped (caja_preferences,
12921290
"changed::" CAJA_PREFERENCES_MOUSE_BACK_BUTTON,
12931291
G_CALLBACK(mouse_back_button_changed),

‎src/caja-navigation-window.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@
5353

5454
typedef struct _CajaNavigationWindow CajaNavigationWindow;
5555
typedef struct _CajaNavigationWindowClass CajaNavigationWindowClass;
56-
typedef struct _CajaNavigationWindowDetails CajaNavigationWindowDetails;
56+
typedef struct _CajaNavigationWindowPrivate CajaNavigationWindowPrivate;
5757

5858

5959
struct _CajaNavigationWindow
6060
{
6161
CajaWindow parent_object;
6262

63-
CajaNavigationWindowDetails *details;
63+
CajaNavigationWindowPrivate *details;
6464

6565
/** UI stuff **/
6666
CajaSidePane *sidebar;

‎src/caja-property-browser.c‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ typedef enum
6666
CAJA_PROPERTY_EMBLEM
6767
} CajaPropertyType;
6868

69-
struct CajaPropertyBrowserDetails
69+
struct _CajaPropertyBrowserPrivate
7070
{
7171
GtkWidget *container;
7272

@@ -194,7 +194,7 @@ static GtkTargetEntry drag_types[] =
194194
};
195195

196196

197-
G_DEFINE_TYPE (CajaPropertyBrowser, caja_property_browser, GTK_TYPE_WINDOW)
197+
G_DEFINE_TYPE_WITH_PRIVATE (CajaPropertyBrowser, caja_property_browser, GTK_TYPE_WINDOW)
198198

199199

200200
/* Destroy the three dialogs for adding patterns/colors/emblems if any of them
@@ -253,8 +253,6 @@ caja_property_browser_class_init (CajaPropertyBrowserClass *klass)
253253
widget_class->drag_begin = caja_property_browser_drag_begin;
254254
widget_class->drag_data_get = caja_property_browser_drag_data_get;
255255
widget_class->drag_end = caja_property_browser_drag_end;
256-
257-
g_type_class_add_private (klass, sizeof (CajaPropertyBrowserDetails));
258256
}
259257

260258
/* initialize the instance's fields, create the necessary subviews, etc. */
@@ -270,9 +268,7 @@ caja_property_browser_init (CajaPropertyBrowser *property_browser)
270268

271269
widget = GTK_WIDGET (property_browser);
272270

273-
property_browser->details = G_TYPE_INSTANCE_GET_PRIVATE (property_browser,
274-
CAJA_TYPE_PROPERTY_BROWSER,
275-
CajaPropertyBrowserDetails);
271+
property_browser->details = caja_property_browser_get_instance_private (property_browser);
276272

277273
property_browser->details->category = g_strdup ("patterns");
278274
property_browser->details->category_type = CAJA_PROPERTY_PATTERN;

‎src/caja-property-browser.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ typedef struct CajaPropertyBrowserClass CajaPropertyBrowserClass;
4949
#define CAJA_PROPERTY_BROWSER_GET_CLASS(obj) \
5050
(G_TYPE_INSTANCE_GET_CLASS ((obj), CAJA_TYPE_PROPERTY_BROWSER, CajaPropertyBrowserClass))
5151

52-
typedef struct CajaPropertyBrowserDetails CajaPropertyBrowserDetails;
52+
typedef struct _CajaPropertyBrowserPrivate CajaPropertyBrowserPrivate;
5353

5454
struct CajaPropertyBrowser
5555
{
5656
GtkWindow window;
57-
CajaPropertyBrowserDetails *details;
57+
CajaPropertyBrowserPrivate *details;
5858
};
5959

6060
struct CajaPropertyBrowserClass

‎src/caja-sidebar-title.c‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ enum
8080
LAST_LABEL_COLOR
8181
};
8282

83-
struct CajaSidebarTitleDetails
83+
struct _CajaSidebarTitlePrivate
8484
{
8585
CajaFile *file;
8686
guint file_changed_connection;
@@ -97,7 +97,7 @@ struct CajaSidebarTitleDetails
9797
gboolean determined_icon;
9898
};
9999

100-
G_DEFINE_TYPE (CajaSidebarTitle, caja_sidebar_title, GTK_TYPE_BOX)
100+
G_DEFINE_TYPE_WITH_PRIVATE (CajaSidebarTitle, caja_sidebar_title, GTK_TYPE_BOX)
101101

102102
static void
103103
style_updated (GtkWidget *widget)
@@ -116,9 +116,7 @@ style_updated (GtkWidget *widget)
116116
static void
117117
caja_sidebar_title_init (CajaSidebarTitle *sidebar_title)
118118
{
119-
sidebar_title->details = G_TYPE_INSTANCE_GET_PRIVATE (sidebar_title,
120-
CAJA_TYPE_SIDEBAR_TITLE,
121-
CajaSidebarTitleDetails);
119+
sidebar_title->details = caja_sidebar_title_get_instance_private (sidebar_title);
122120

123121
gtk_orientable_set_orientation (GTK_ORIENTABLE (sidebar_title), GTK_ORIENTATION_VERTICAL);
124122

@@ -220,8 +218,6 @@ caja_sidebar_title_class_init (CajaSidebarTitleClass *klass)
220218
"Color used for information text against a light background",
221219
GDK_TYPE_RGBA,
222220
G_PARAM_READABLE));
223-
224-
g_type_class_add_private (klass, sizeof (CajaSidebarTitleDetails));
225221
}
226222

227223
/* return a new index title object */

‎src/caja-sidebar-title.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@
4545
#define CAJA_SIDEBAR_TITLE_GET_CLASS(obj) \
4646
(G_TYPE_INSTANCE_GET_CLASS ((obj), CAJA_TYPE_SIDEBAR_TITLE, CajaSidebarTitleClass))
4747

48-
typedef struct CajaSidebarTitleDetails CajaSidebarTitleDetails;
48+
typedef struct _CajaSidebarTitlePrivate CajaSidebarTitlePrivate;
4949

5050
typedef struct
5151
{
5252
GtkBox box;
53-
CajaSidebarTitleDetails *details;
53+
CajaSidebarTitlePrivate *details;
5454
} CajaSidebarTitle;
5555

5656
typedef struct

‎src/caja-trash-bar.c‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ enum
4242
NUM_PROPERTIES
4343
};
4444

45-
struct CajaTrashBarPrivate
45+
struct _CajaTrashBarPrivate
4646
{
4747
GtkWidget *empty_button;
4848
GtkWidget *restore_button;
@@ -51,7 +51,7 @@ struct CajaTrashBarPrivate
5151
gulong selection_handler_id;
5252
};
5353

54-
G_DEFINE_TYPE (CajaTrashBar, caja_trash_bar, GTK_TYPE_BOX);
54+
G_DEFINE_TYPE_WITH_PRIVATE (CajaTrashBar, caja_trash_bar, GTK_TYPE_BOX);
5555

5656
static void
5757
restore_button_clicked_cb (GtkWidget *button,
@@ -163,8 +163,6 @@ caja_trash_bar_class_init (CajaTrashBarClass *klass)
163163
G_PARAM_WRITABLE |
164164
G_PARAM_CONSTRUCT_ONLY |
165165
G_PARAM_STATIC_STRINGS));
166-
167-
g_type_class_add_private (klass, sizeof (CajaTrashBarPrivate));
168166
}
169167

170168
static void
@@ -183,7 +181,7 @@ caja_trash_bar_init (CajaTrashBar *bar)
183181
GtkWidget *label;
184182
GtkWidget *hbox;
185183

186-
bar->priv = CAJA_TRASH_BAR_GET_PRIVATE (bar);
184+
bar->priv = caja_trash_bar_get_instance_private (bar);
187185

188186
hbox = GTK_WIDGET (bar);
189187

‎src/caja-trash-bar.h‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727

2828
#include <gtk/gtk.h>
2929

30-
#ifdef __cplusplus
31-
extern "C" {
32-
#endif
30+
G_BEGIN_DECLS
3331

3432
#define CAJA_TYPE_TRASH_BAR (caja_trash_bar_get_type ())
3533
#define CAJA_TRASH_BAR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CAJA_TYPE_TRASH_BAR, CajaTrashBar))
@@ -38,27 +36,24 @@ extern "C" {
3836
#define CAJA_IS_TRASH_BAR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CAJA_TYPE_TRASH_BAR))
3937
#define CAJA_TRASH_BAR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CAJA_TYPE_TRASH_BAR, CajaTrashBarClass))
4038

41-
typedef struct CajaTrashBarPrivate CajaTrashBarPrivate;
39+
typedef struct _CajaTrashBarPrivate CajaTrashBarPrivate;
4240

43-
typedef struct
44-
{
41+
typedef struct
42+
{
4543
GtkBox box;
4644
CajaTrashBarPrivate *priv;
47-
} CajaTrashBar;
45+
} CajaTrashBar;
4846

49-
typedef struct
50-
{
51-
GtkBoxClass parent_class;
47+
typedef struct
48+
{
49+
GtkBoxClass parent_class;
5250

53-
} CajaTrashBarClass;
51+
} CajaTrashBarClass;
5452

55-
GType caja_trash_bar_get_type (void) G_GNUC_CONST;
53+
GType caja_trash_bar_get_type (void) G_GNUC_CONST;
5654

57-
GtkWidget *caja_trash_bar_new (CajaWindow *window);
55+
GtkWidget *caja_trash_bar_new (CajaWindow *window);
5856

59-
60-
#ifdef __cplusplus
61-
}
62-
#endif
57+
G_END_DECLS
6358

6459
#endif /* __GS_TRASH_BAR_H */

0 commit comments

Comments
 (0)