Unverified Commit 27fc0153 authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

Merge pull request #201020 from bobby285271/caja 

mate.caja-extensions: Fix some crash caused by schema path
parents 2338d822 8d9763d0

pkgs/desktops/mate/caja-extensions/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec { 
  patches = [

    (substituteAll {

      src = ./hardcode-gsettings.patch;

      CAJA_GSETTINGS_PATH = glib.getSchemaPath mate.caja;

      TERM_GSETTINGS_PATH = glib.getSchemaPath mate.mate-terminal;

      caja_gsetttings_path = glib.getSchemaPath mate.caja;

      desktop_gsetttings_path = glib.getSchemaPath mate.mate-desktop;

    })

  ];

pkgs/desktops/mate/caja-extensions/hardcode-gsettings.patch

+4 −4
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ index e14a9bf..691afab 100644 
+    GSettingsSchemaSource* schema_source;

+    GSettingsSchema* schema;

+

+    schema_source = g_settings_schema_source_new_from_directory("@CAJA_GSETTINGS_PATH@",

+    schema_source = g_settings_schema_source_new_from_directory("@caja_gsetttings_path@",

+                                                                g_settings_schema_source_get_default(),

+                                                                TRUE, NULL);

+    schema = g_settings_schema_source_lookup(schema_source,
@@ -74,7 +74,7 @@ index e14a9bf..691afab 100644 
+    GSettingsSchemaSource* schema_source;

+    GSettingsSchema* schema;

+

+    schema_source = g_settings_schema_source_new_from_directory("@TERM_GSETTINGS_PATH@",

+    schema_source = g_settings_schema_source_new_from_directory("@desktop_gsetttings_path@",

+                                                                g_settings_schema_source_get_default(),

+                                                                TRUE, NULL);

+    schema = g_settings_schema_source_lookup(schema_source,
@@ -95,7 +95,7 @@ index e14a9bf..691afab 100644 
+    GSettingsSchemaSource* schema_source;

+    GSettingsSchema* schema;

+

+    schema_source = g_settings_schema_source_new_from_directory("@TERM_GSETTINGS_PATH@",

+    schema_source = g_settings_schema_source_new_from_directory("@desktop_gsetttings_path@",

+                                                                g_settings_schema_source_get_default(),

+                                                                TRUE, NULL);

+    schema = g_settings_schema_source_lookup(schema_source,
@@ -155,7 +155,7 @@ index 3119e9f..4f80c88 100644 
     filename = g_filename_from_uri(uri, NULL, NULL);

 

-    settings = g_settings_new (WP_SCHEMA);

+    schema_source = g_settings_schema_source_new_from_directory("@GSETTINGS_PATH@",

+    schema_source = g_settings_schema_source_new_from_directory("@desktop_gsetttings_path@",

+                                                                g_settings_schema_source_get_default(),

+                                                                TRUE, NULL);

+    schema = g_settings_schema_source_lookup(schema_source,