public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/libfm] f43: Additional fix for GFileInfo warnings with search window
@ 2026-06-24  8:27 Mamoru TASAKA
  0 siblings, 0 replies; only message in thread
From: Mamoru TASAKA @ 2026-06-24  8:27 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/libfm
Branch : f43
Commit : 864bbb23c6f72f141b01e5b4c175cc92818ac6c7
Author : Mamoru TASAKA <mtasaka@fedoraproject.org>
Date   : 2026-05-07T17:33:13+09:00
Stats  : +54/-2 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/libfm/c/864bbb23c6f72f141b01e5b4c175cc92818ac6c7?branch=f43

Log:
Additional fix for GFileInfo warnings with search window

---
diff --git a/libfm-pr119-suppress-gfileinfo-warnings.patch b/libfm-pr119-suppress-gfileinfo-warnings.patch
index 73e02fc..68452c0 100644
--- a/libfm-pr119-suppress-gfileinfo-warnings.patch
+++ b/libfm-pr119-suppress-gfileinfo-warnings.patch
@@ -1,7 +1,7 @@
 From af2df63d29ffb7e63cd11ea0256260dd11ee093d Mon Sep 17 00:00:00 2001
 From: Mamoru TASAKA <mtasaka@fedoraproject.org>
 Date: Fri, 10 Apr 2026 13:36:29 +0900
-Subject: [PATCH] Suppress GFileInfo related warnings
+Subject: [PATCH 1/2] Suppress GFileInfo related warnings
 
 https://gitlab.gnome.org/GNOME/glib/-/issues/3068 says that
 when GFileInfo is created via g_file_enumerate_children then
@@ -98,3 +98,52 @@ index 57a375c4..50cbcbea 100644
      if(priv->min_size > 0 && size < priv->min_size)
          ret = FALSE;
      else if(priv->max_size > 0 && size > priv->max_size)
+
+From 2dd896ce28aa203bef38999680f2091e03b6dcd0 Mon Sep 17 00:00:00 2001
+From: libfm Fedora maintainer <libfm-maintainer@fedoraproject.org>
+Date: Tue, 5 May 2026 23:42:12 +0900
+Subject: [PATCH 2/2] Additional fix for GFileInfo related warnings with search
+ dialog
+
+More fix for #118 .
+---
+ src/job/fm-file-info-job.h | 1 +
+ src/modules/vfs-search.c   | 6 ++++--
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/job/fm-file-info-job.h b/src/job/fm-file-info-job.h
+index 11db81dc..b6aba8ab 100644
+--- a/src/job/fm-file-info-job.h
++++ b/src/job/fm-file-info-job.h
+@@ -111,6 +111,7 @@ static inline gboolean
+ _fm_file_info_job_update_fs_readonly(GFile *gf, GFileInfo *inf, GCancellable *cancellable, GError **error)
+ {
+     /* check if FS is R/O and set attr. into inf */
++    if (!gf) return FALSE;
+     GFileInfo *fs_inf = g_file_query_filesystem_info(gf, G_FILE_ATTRIBUTE_FILESYSTEM_READONLY,
+                                                      cancellable, error);
+     if (fs_inf)
+diff --git a/src/modules/vfs-search.c b/src/modules/vfs-search.c
+index 50cbcbea..e5d46d44 100644
+--- a/src/modules/vfs-search.c
++++ b/src/modules/vfs-search.c
+@@ -251,7 +251,8 @@ static GFileInfo *_fm_vfs_search_enumerator_next_file(GFileEnumerator *enumerato
+         }
+ 
+         file_info = g_file_enumerator_next_file(iter->enu, cancellable, &err);
+-        if(file_info && g_file_info_get_name(file_info))
++        if(file_info && g_file_info_has_attribute (file_info, G_FILE_ATTRIBUTE_STANDARD_NAME) &&
++           g_file_info_get_name(file_info))
+         {
+             /* check if directory itself matches criteria */
+             if(fm_search_job_match_file(enu, file_info, iter->folder_path,
+@@ -867,7 +868,8 @@ static gboolean fm_search_job_match_file(FmVfsSearchEnumerator * priv,
+ {
+     //g_print("matching file %s\n", g_file_info_get_name(info));
+ 
+-    if(!priv->show_hidden && g_file_info_get_is_hidden(info))
++    if(!priv->show_hidden && g_file_info_has_attribute(info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN) &&
++        g_file_info_get_is_hidden(info))
+         return FALSE;
+ 
+     if(!fm_search_job_match_filename(priv, info))

diff --git a/libfm.spec b/libfm.spec
index 4f322d4..e8feb8a 100644
--- a/libfm.spec
+++ b/libfm.spec
@@ -45,7 +45,7 @@
 
 Name:           libfm
 Version:        %{main_version}%{git_ver_rpm}
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GIO-based library for file manager-like programs
 
 # src/actions/	GPL-2.0-or-later
@@ -511,6 +511,9 @@ fi
 %endif
 
 %changelog
+* Thu May 07 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.4.1-4
+- Additional fix for GFileInfo warnings with search window
+
 * Sun Apr 12 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.4.1-3
 - Apply upstream PR to suppress GLib related warning
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-24  8:27 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-24  8:27 [rpms/libfm] f43: Additional fix for GFileInfo warnings with search window Mamoru TASAKA

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox