summary refs log tree commit diff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorLiliana Marie Prikler <liliana.prikler@gmail.com>2023-03-26 14:13:00 +0200
committerLiliana Marie Prikler <liliana.prikler@gmail.com>2023-03-26 14:16:22 +0200
commit36b22aa75aefd92c980fdfaafb8b6e440eab6505 (patch)
tree7cfb3a387e1d22c25f3c4b600d1f3d50a32209d3 /gnu/packages/patches
parent310ed6453a2717a527c1a09df2397daed42de5cf (diff)
downloadguix-36b22aa75aefd92c980fdfaafb8b6e440eab6505.tar.gz
Revert "gnu: nautilus: Update to 43.2."
This reverts commit d58a804837760758b4389210711d170d65be2a53, as nautilus
43.2 depends on gnome-desktop 43.2.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/nautilus-extension-search-path.patch58
1 files changed, 29 insertions, 29 deletions
diff --git a/gnu/packages/patches/nautilus-extension-search-path.patch b/gnu/packages/patches/nautilus-extension-search-path.patch
index 07170b12a4..d5dc35b241 100644
--- a/gnu/packages/patches/nautilus-extension-search-path.patch
+++ b/gnu/packages/patches/nautilus-extension-search-path.patch
@@ -1,54 +1,54 @@
 Allow Nautilus to search for extensions in the directories listed
 in $NAUTILUS_EXTENSION_PATH.
 
-Index: nautilus-43.2/src/nautilus-module.c
-===================================================================
---- nautilus-43.2.orig/src/nautilus-module.c
-+++ nautilus-43.2/src/nautilus-module.c
-@@ -220,8 +220,13 @@ static void
+diff --git a/src/nautilus-module.c b/src/nautilus-module.c
+index bf474bd..42e2a4e 100644
+--- a/src/nautilus-module.c
++++ b/src/nautilus-module.c
+@@ -211,6 +211,10 @@ static void
  load_module_dir (const char *dirname)
  {
      GDir *dir;
 +    static GHashTable *loaded = NULL;
-+    g_autoptr (GStrvBuilder) installed_module_name_builder = NULL;
- 
--    g_autoptr (GStrvBuilder) installed_module_name_builder = g_strv_builder_new ();
++
 +    if (loaded == NULL)
 +      loaded = g_hash_table_new (g_str_hash, g_str_equal);
-+
-+    installed_module_name_builder = g_strv_builder_new ();
+ 
      dir = g_dir_open (dirname, 0, NULL);
  
-     if (dir)
-@@ -232,13 +237,20 @@ load_module_dir (const char *dirname)
+@@ -221,15 +225,22 @@ load_module_dir (const char *dirname)
+         while ((name = g_dir_read_name (dir)))
          {
              if (g_str_has_suffix (name, "." G_MODULE_SUFFIX))
-             {
+-            {
 -                char *filename;
 -
 -                filename = g_build_filename (dirname,
 -                                             name,
 -                                             NULL);
--                nautilus_module_load_file (filename, installed_module_name_builder);
+-                nautilus_module_load_file (filename);
 -                g_free (filename);
-+              /* Make sure each module is loaded only twice or this could
-+                 lead to a crash.  Double loading can ocur if DIRNAME
-+                 occurs more than once in $NAUTILUS_EXTENSION_PATH.  */
-+              if (!g_hash_table_contains (loaded, name))
-+                {
-+                  char *filename;
+-            }
++	      {
++		/* Make sure each module is loaded only twice or this could
++		   lead to a crash.  Double loading can occur if DIRNAME
++		   occurs more than once in $NAUTILUS_EXTENSION_PATH.  */
++		if (!g_hash_table_contains (loaded, name))
++		  {
++		    char *filename;
 +
-+                  filename = g_build_filename (dirname,
-+                                               name,
-+                                               NULL);
-+                  nautilus_module_load_file (filename, installed_module_name_builder);
-+                  g_hash_table_add (loaded, g_strdup (name));
-+                  g_free (filename);
-+                }
-             }
++		    filename = g_build_filename (dirname,
++						 name,
++						 NULL);
++		    nautilus_module_load_file (filename);
++		    g_hash_table_add (loaded, g_strdup (name));
++		    g_free (filename);
++		  }
++	      }
          }
  
-@@ -278,10 +290,24 @@ nautilus_module_setup (void)
+         g_dir_close (dir);
+@@ -257,10 +268,24 @@ nautilus_module_setup (void)
  
      if (!initialized)
      {