Revert avoid saving duplicate command changes

This commit is contained in:
misaka00251 2023-02-03 15:52:32 +08:00
parent 4955005381
commit 6c1a07fb21
No known key found for this signature in database
GPG Key ID: 4AA100DC964EDE26
2 changed files with 37 additions and 1 deletions

View File

@ -0,0 +1,31 @@
diff --git a/src/appfinder-model.c b/src/appfinder-model.c
index 9357fc9..b10490a 100644
--- a/src/appfinder-model.c
+++ b/src/appfinder-model.c
@@ -917,17 +917,6 @@ xfce_appfinder_model_item_compare (gconstpointer a,
-static gint
-xfce_appfinder_model_item_compare_command (gconstpointer a,
- gconstpointer b)
-{
- const ModelItem *item_a = a, *item_b = b;
-
- return g_utf8_collate (item_a->command, item_b->command);
-}
-
-
-
static gchar *
xfce_appfinder_model_item_key (GarconMenuItem *item)
{
@@ -1188,7 +1177,7 @@ xfce_appfinder_model_history_insert (XfceAppfinderModel *model,
/* add new command */
item = g_slice_new0 (ModelItem);
item->command = g_strdup (command);
- if (g_slist_find_custom (model->items, item, xfce_appfinder_model_item_compare_command) != NULL)
+ if (g_slist_find_custom (model->items, item, xfce_appfinder_model_item_compare) != NULL)
{
APPFINDER_DEBUG ("Skip adding %s to the model as it's already contained.", command);
g_slice_free (ModelItem, item);

View File

@ -2,7 +2,7 @@
Name: xfce4-appfinder
Version: 4.18.0
Release: 2
Release: 3
Summary: Appfinder for the Xfce4 Desktop Environment
License: GPLv2+
@ -10,6 +10,7 @@ URL: http://www.xfce.org/
Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
Patch0: use-correct-model-when-running-from-commands-history.patch
Patch1: revert-avoid-saving-duplicate-command.patch
BuildRequires: make
BuildRequires: gcc-c++
@ -30,6 +31,7 @@ xfce-appfinder shows system wide installed applications.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
# fix icon problems - GTK-3.10+
sed -i 's/gtk-find/edit-find/g' data/xfce4-appfinder.desktop.in
@ -62,6 +64,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.xfce.%{nam
%{_metainfodir}/org.xfce.%{name}.appdata.xml
%changelog
* Fri Feb 03 2023 misaka00251 <liuxin@iscas.ac.cn> - 4.18.0-3
- Revert avoid saving duplicate command changes
* Fri Jan 13 2023 misaka00251 <liuxin@iscas.ac.cn> - 4.18.0-2
- Add upstream patch to fix command history segmentation fault