[file-roller/wip/jtojnar/api_docs: 3/3] wip
- From: Jan Tojnar <jtojnar src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [file-roller/wip/jtojnar/api_docs: 3/3] wip
- Date: Sat, 21 May 2022 14:02:22 +0000 (UTC)
commit 4bf6c718b7ca4d1c976a4e5a345c1817ab8779a3
Author: Jan Tojnar <jtojnar gmail com>
Date: Mon May 16 01:18:32 2022 +0200
wip
data/meson.build | 11 ++++++++++-
src/fr-application-menu.c | 2 ++
src/fr-application.c | 4 ++--
src/fr-window.c | 2 ++
src/meson.build | 1 +
5 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 54adbd86..f0448995 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,9 +1,18 @@
po_dir = join_paths(meson.project_source_root(), 'po')
-install_data('org.gnome.FileRoller.gschema.xml',
+settings_schema = 'org.gnome.FileRoller.gschema.xml'
+install_data(
+ settings_schema,
install_dir : join_paths(datadir, 'glib-2.0', 'schemas')
)
+# Required by gobject-introspection.
+compiled_schemas = gnome.compile_schemas(
+ depend_files: [
+ settings_schema,
+ ],
+)
+
install_data('packages.match',
install_dir : join_paths(datadir, meson.project_name())
)
diff --git a/src/fr-application-menu.c b/src/fr-application-menu.c
index a2756d5b..6908f9a7 100644
--- a/src/fr-application-menu.c
+++ b/src/fr-application-menu.c
@@ -202,6 +202,7 @@ initialize_app_menu (GApplication *application)
{
GSettings *settings;
+ return;
g_action_map_add_action_entries (G_ACTION_MAP (application),
app_menu_entries,
G_N_ELEMENTS (app_menu_entries),
@@ -234,6 +235,7 @@ initialize_app_menubar (GApplication *application)
GtkBuilder *builder;
GSettings *settings;
+ return;
g_action_map_add_action_entries (G_ACTION_MAP (application),
app_menu_entries,
G_N_ELEMENTS (app_menu_entries),
diff --git a/src/fr-application.c b/src/fr-application.c
index b0e5f21e..af17f23c 100644
--- a/src/fr-application.c
+++ b/src/fr-application.c
@@ -773,8 +773,8 @@ fr_application_init (FrApplication *self)
{
self->owner_id = 0;
self->introspection_data = NULL;
- self->listing_settings = g_settings_new (FILE_ROLLER_SCHEMA_LISTING);
- self->ui_settings = g_settings_new (FILE_ROLLER_SCHEMA_UI);
+ // self->listing_settings = g_settings_new (FILE_ROLLER_SCHEMA_LISTING);
+ // self->ui_settings = g_settings_new (FILE_ROLLER_SCHEMA_UI);
}
diff --git a/src/fr-window.c b/src/fr-window.c
index 0c06cb65..185b1000 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -5500,6 +5500,8 @@ fr_window_construct (FrWindow *window)
/* Create the settings objects */
+ return;
+
window->priv->settings_listing = g_settings_new (FILE_ROLLER_SCHEMA_LISTING);
window->priv->settings_ui = g_settings_new (FILE_ROLLER_SCHEMA_UI);
window->priv->settings_general = g_settings_new (FILE_ROLLER_SCHEMA_GENERAL);
diff --git a/src/meson.build b/src/meson.build
index 0acc6273..4913543e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -149,6 +149,7 @@ if build_introspection
sources: [
source_files,
fr_headers,
+ compiled_schemas,
],
namespace: 'FileRoller',
nsversion: '1.0',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]