summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--eel/eel-accessibility.c15
-rw-r--r--eel/eel-canvas-rect-ellipse.c6
-rw-r--r--eel/eel-canvas.c10
-rw-r--r--eel/eel-labeled-image.c12
-rw-r--r--libcaja-extension/caja-column-provider.c1
-rw-r--r--libcaja-extension/caja-configurable.c1
-rw-r--r--libcaja-extension/caja-file-info.c1
-rw-r--r--libcaja-extension/caja-info-provider.c1
-rw-r--r--libcaja-extension/caja-location-widget-provider.c1
-rw-r--r--libcaja-extension/caja-menu-item.c3
-rw-r--r--libcaja-extension/caja-menu-provider.c1
-rw-r--r--libcaja-extension/caja-property-page-provider.c1
-rw-r--r--libcaja-extension/caja-property-page.c3
-rw-r--r--libcaja-extension/caja-widget-view-provider.c1
-rw-r--r--libcaja-private/caja-query.c2
-rw-r--r--libcaja-private/caja-sidebar-provider.c1
-rw-r--r--libcaja-private/caja-sidebar.c1
-rw-r--r--libcaja-private/caja-view.c1
-rw-r--r--libcaja-private/caja-window-info.c1
-rw-r--r--libcaja-private/caja-window-slot-info.c1
-rw-r--r--src/caja-application.c3
21 files changed, 47 insertions, 20 deletions
diff --git a/eel/eel-accessibility.c b/eel/eel-accessibility.c
index 94c429a3..0d9707ad 100644
--- a/eel/eel-accessibility.c
+++ b/eel/eel-accessibility.c
@@ -218,11 +218,16 @@ eel_accessible_text_get_type (void)
{
const GTypeInfo tinfo =
{
- sizeof (AtkTextIface),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) NULL,
- (GClassFinalizeFunc) NULL
+ sizeof (AtkTextIface), /* class_size */
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ NULL, /* class_init */
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ 0, /* instance_size */
+ 0, /* n_preallocs */
+ NULL, /* instance_init */
+ NULL /* value_table */
};
type = g_type_register_static (
diff --git a/eel/eel-canvas-rect-ellipse.c b/eel/eel-canvas-rect-ellipse.c
index 0e4a245e..7ca56a46 100644
--- a/eel/eel-canvas-rect-ellipse.c
+++ b/eel/eel-canvas-rect-ellipse.c
@@ -101,7 +101,8 @@ eel_canvas_re_get_type (void)
NULL, /* class_data */
sizeof (EelCanvasRE),
0, /* n_preallocs */
- (GInstanceInitFunc) eel_canvas_re_init
+ (GInstanceInitFunc) eel_canvas_re_init,
+ NULL /* value_table */
};
re_type = g_type_register_static (eel_canvas_item_get_type (),
@@ -465,7 +466,8 @@ eel_canvas_rect_get_type (void)
NULL, /* class_data */
sizeof (EelCanvasRect),
0, /* n_preallocs */
- (GInstanceInitFunc) eel_canvas_rect_init
+ (GInstanceInitFunc) eel_canvas_rect_init,
+ NULL /* value_table */
};
rect_type = g_type_register_static (eel_canvas_re_get_type (),
diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c
index b5d5acc2..a9d98101 100644
--- a/eel/eel-canvas.c
+++ b/eel/eel-canvas.c
@@ -137,7 +137,8 @@ eel_canvas_item_get_type (void)
NULL, /* class_data */
sizeof (EelCanvasItem),
0, /* n_preallocs */
- (GInstanceInitFunc) eel_canvas_item_init
+ (GInstanceInitFunc) eel_canvas_item_init,
+ NULL /* value_table */
};
canvas_item_type = g_type_register_static (G_TYPE_INITIALLY_UNOWNED,
@@ -1255,8 +1256,8 @@ eel_canvas_group_get_type (void)
NULL, /* class_data */
sizeof (EelCanvasGroup),
0, /* n_preallocs */
- (GInstanceInitFunc) eel_canvas_group_init
-
+ (GInstanceInitFunc) eel_canvas_group_init,
+ NULL /* value_table */
};
group_type = g_type_register_static (eel_canvas_item_get_type (),
@@ -1851,7 +1852,8 @@ eel_canvas_get_type (void)
NULL, /* class_data */
sizeof (EelCanvas),
0, /* n_preallocs */
- (GInstanceInitFunc) eel_canvas_init
+ (GInstanceInitFunc) eel_canvas_init,
+ NULL /* value_table */
};
canvas_type = g_type_register_static (gtk_layout_get_type (),
diff --git a/eel/eel-labeled-image.c b/eel/eel-labeled-image.c
index 838da9cb..c7539bc8 100644
--- a/eel/eel-labeled-image.c
+++ b/eel/eel-labeled-image.c
@@ -2303,7 +2303,8 @@ eel_labeled_image_button_get_type (void)
NULL, /* class_data */
sizeof (GtkButton),
0, /* n_preallocs */
- (GInstanceInitFunc) NULL
+ (GInstanceInitFunc) NULL,
+ NULL /* value_table */
};
type = g_type_register_static
@@ -2331,7 +2332,8 @@ eel_labeled_image_check_button_get_type (void)
NULL, /* class_data */
sizeof (GtkCheckButton),
0, /* n_preallocs */
- (GInstanceInitFunc) NULL
+ (GInstanceInitFunc) NULL,
+ NULL /* value_table */
};
type = g_type_register_static
@@ -2359,7 +2361,8 @@ eel_labeled_image_toggle_button_get_type (void)
NULL, /* class_data */
sizeof (GtkToggleButton),
0, /* n_preallocs */
- (GInstanceInitFunc) NULL
+ (GInstanceInitFunc) NULL,
+ NULL /* value_table */
};
type = g_type_register_static
@@ -2387,7 +2390,8 @@ eel_labeled_image_radio_button_get_type (void)
NULL, /* class_data */
sizeof (GtkRadioButton),
0, /* n_preallocs */
- (GInstanceInitFunc) NULL
+ (GInstanceInitFunc) NULL,
+ NULL /* value_table */
};
type = g_type_register_static
diff --git a/libcaja-extension/caja-column-provider.c b/libcaja-extension/caja-column-provider.c
index bc1ee98c..0a94871a 100644
--- a/libcaja-extension/caja-column-provider.c
+++ b/libcaja-extension/caja-column-provider.c
@@ -57,6 +57,7 @@ caja_column_provider_get_type (void)
NULL,
0,
0,
+ NULL,
NULL
};
diff --git a/libcaja-extension/caja-configurable.c b/libcaja-extension/caja-configurable.c
index 6405376e..91eec868 100644
--- a/libcaja-extension/caja-configurable.c
+++ b/libcaja-extension/caja-configurable.c
@@ -57,6 +57,7 @@ caja_configurable_get_type (void)
NULL,
0,
0,
+ NULL,
NULL
};
diff --git a/libcaja-extension/caja-file-info.c b/libcaja-extension/caja-file-info.c
index 61f37b6d..9429d64d 100644
--- a/libcaja-extension/caja-file-info.c
+++ b/libcaja-extension/caja-file-info.c
@@ -96,6 +96,7 @@ caja_file_info_get_type (void)
NULL,
0,
0,
+ NULL,
NULL
};
diff --git a/libcaja-extension/caja-info-provider.c b/libcaja-extension/caja-info-provider.c
index b2d3e06d..56759fa3 100644
--- a/libcaja-extension/caja-info-provider.c
+++ b/libcaja-extension/caja-info-provider.c
@@ -59,6 +59,7 @@ caja_info_provider_get_type (void)
NULL,
0,
0,
+ NULL,
NULL
};
diff --git a/libcaja-extension/caja-location-widget-provider.c b/libcaja-extension/caja-location-widget-provider.c
index 8e9038bb..8a941d90 100644
--- a/libcaja-extension/caja-location-widget-provider.c
+++ b/libcaja-extension/caja-location-widget-provider.c
@@ -57,6 +57,7 @@ caja_location_widget_provider_get_type (void)
NULL,
0,
0,
+ NULL,
NULL
};
diff --git a/libcaja-extension/caja-menu-item.c b/libcaja-extension/caja-menu-item.c
index bc952218..9a4c7e5a 100644
--- a/libcaja-extension/caja-menu-item.c
+++ b/libcaja-extension/caja-menu-item.c
@@ -337,7 +337,8 @@ caja_menu_item_get_type (void)
NULL,
sizeof (CajaMenuItem),
0,
- (GInstanceInitFunc)caja_menu_item_instance_init
+ (GInstanceInitFunc)caja_menu_item_instance_init,
+ NULL
};
type = g_type_register_static
diff --git a/libcaja-extension/caja-menu-provider.c b/libcaja-extension/caja-menu-provider.c
index c0d0400d..9676396e 100644
--- a/libcaja-extension/caja-menu-provider.c
+++ b/libcaja-extension/caja-menu-provider.c
@@ -71,6 +71,7 @@ caja_menu_provider_get_type (void)
NULL,
0,
0,
+ NULL,
NULL
};
diff --git a/libcaja-extension/caja-property-page-provider.c b/libcaja-extension/caja-property-page-provider.c
index 64f9bfb2..120f5f1f 100644
--- a/libcaja-extension/caja-property-page-provider.c
+++ b/libcaja-extension/caja-property-page-provider.c
@@ -58,6 +58,7 @@ caja_property_page_provider_get_type (void)
NULL,
0,
0,
+ NULL,
NULL
};
diff --git a/libcaja-extension/caja-property-page.c b/libcaja-extension/caja-property-page.c
index cb5e1c74..f6b9882e 100644
--- a/libcaja-extension/caja-property-page.c
+++ b/libcaja-extension/caja-property-page.c
@@ -239,7 +239,8 @@ caja_property_page_get_type (void)
NULL,
sizeof (CajaPropertyPage),
0,
- (GInstanceInitFunc)caja_property_page_instance_init
+ (GInstanceInitFunc)caja_property_page_instance_init,
+ NULL
};
type = g_type_register_static
diff --git a/libcaja-extension/caja-widget-view-provider.c b/libcaja-extension/caja-widget-view-provider.c
index dbc8f5b3..b523ee28 100644
--- a/libcaja-extension/caja-widget-view-provider.c
+++ b/libcaja-extension/caja-widget-view-provider.c
@@ -55,6 +55,7 @@ caja_widget_view_provider_get_type (void)
NULL,
0,
0,
+ NULL,
NULL
};
diff --git a/libcaja-private/caja-query.c b/libcaja-private/caja-query.c
index ddeb8d24..d87948c7 100644
--- a/libcaja-private/caja-query.c
+++ b/libcaja-private/caja-query.c
@@ -332,7 +332,7 @@ static GMarkupParser parser =
static CajaQuery *
caja_query_parse_xml (char *xml, gsize xml_len)
{
- ParserInfo info = { NULL };
+ ParserInfo info = { NULL, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE };
GMarkupParseContext *ctx;
info.query = caja_query_new ();
diff --git a/libcaja-private/caja-sidebar-provider.c b/libcaja-private/caja-sidebar-provider.c
index 263a0334..94f1c6c7 100644
--- a/libcaja-private/caja-sidebar-provider.c
+++ b/libcaja-private/caja-sidebar-provider.c
@@ -47,6 +47,7 @@ caja_sidebar_provider_get_type (void)
NULL,
0,
0,
+ NULL,
NULL
};
diff --git a/libcaja-private/caja-sidebar.c b/libcaja-private/caja-sidebar.c
index 60c7710e..393f5321 100644
--- a/libcaja-private/caja-sidebar.c
+++ b/libcaja-private/caja-sidebar.c
@@ -72,6 +72,7 @@ caja_sidebar_get_type (void)
NULL,
0,
0,
+ NULL,
NULL
};
diff --git a/libcaja-private/caja-view.c b/libcaja-private/caja-view.c
index 010b361b..9465217d 100644
--- a/libcaja-private/caja-view.c
+++ b/libcaja-private/caja-view.c
@@ -80,6 +80,7 @@ caja_view_get_type (void)
NULL,
0,
0,
+ NULL,
NULL
};
diff --git a/libcaja-private/caja-window-info.c b/libcaja-private/caja-window-info.c
index 9318847f..8d17c1ad 100644
--- a/libcaja-private/caja-window-info.c
+++ b/libcaja-private/caja-window-info.c
@@ -112,6 +112,7 @@ caja_window_info_get_type (void)
NULL,
0,
0,
+ NULL,
NULL
};
diff --git a/libcaja-private/caja-window-slot-info.c b/libcaja-private/caja-window-slot-info.c
index 01a38a80..b4b4d419 100644
--- a/libcaja-private/caja-window-slot-info.c
+++ b/libcaja-private/caja-window-slot-info.c
@@ -78,6 +78,7 @@ caja_window_slot_info_get_type (void)
NULL,
0,
0,
+ NULL,
NULL
};
diff --git a/src/caja-application.c b/src/caja-application.c
index 325126bb..5f7a8ac4 100644
--- a/src/caja-application.c
+++ b/src/caja-application.c
@@ -1945,8 +1945,7 @@ caja_application_local_command_line (GApplication *application,
{ "select", 's', 0, G_OPTION_ARG_NONE, &select_uris,
N_("Select specified URI in parent folder."), NULL },
{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &remaining, NULL, N_("[URI...]") },
-
- { NULL }
+ { NULL, '\0', 0, G_OPTION_ARG_NONE, NULL, NULL, NULL }
};
GOptionContext *context;
GError *error = NULL;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 21:59:58 +0000