[gedit] recent: move some functions to gedit-recent-osx
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] recent: move some functions to gedit-recent-osx
- Date: Wed, 25 Nov 2020 01:55:47 +0000 (UTC)
commit 2f7c4a69148fdd956305ffae7d7fec24985dc2fa
Author: Sébastien Wilmet <swilmet gnome org>
Date: Wed Nov 25 02:39:44 2020 +0100
recent: move some functions to gedit-recent-osx
Currently, gedit_recent_add_document() and
gedit_recent_remove_if_local() are used only in gedit-tab.c.
The rest is used only in gedit-app-osx.m.
gedit/gedit-app-osx.m | 2 +-
gedit/gedit-recent-osx.c | 249 +++++++++++++++++++++++++++++++++++++++++++++++
gedit/gedit-recent-osx.h | 50 ++++++++++
gedit/gedit-recent.c | 225 ------------------------------------------
gedit/gedit-recent.h | 23 +----
gedit/meson.build | 2 +
6 files changed, 305 insertions(+), 246 deletions(-)
---
diff --git a/gedit/gedit-app-osx.m b/gedit/gedit-app-osx.m
index 9029b491b..b02e9a28b 100644
--- a/gedit/gedit-app-osx.m
+++ b/gedit/gedit-app-osx.m
@@ -31,7 +31,7 @@
#include "gedit-debug.h"
#include "gedit-commands.h"
#include "gedit-commands-private.h"
-#include "gedit-recent.h"
+#include "gedit-recent-osx.h"
#import <AppKit/AppKit.h>
NSWindow *gdk_quartz_window_get_nswindow(GdkWindow *window);
diff --git a/gedit/gedit-recent-osx.c b/gedit/gedit-recent-osx.c
new file mode 100644
index 000000000..6f8c8cd6e
--- /dev/null
+++ b/gedit/gedit-recent-osx.c
@@ -0,0 +1,249 @@
+/*
+ * This file is part of gedit
+ *
+ * Copyright (C) 2005 - Paolo Maggi
+ * Copyright (C) 2014 - Paolo Borelli
+ * Copyright (C) 2014 - Jesse van den Kieboom
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "gedit-recent-osx.h"
+
+static gint
+sort_recent_items_mru (GtkRecentInfo *a,
+ GtkRecentInfo *b,
+ gpointer unused)
+{
+ g_assert (a != NULL && b != NULL);
+ return gtk_recent_info_get_modified (b) - gtk_recent_info_get_modified (a);
+}
+
+static void
+populate_filter_info (GtkRecentInfo *info,
+ GtkRecentFilterInfo *filter_info,
+ GtkRecentFilterFlags needed)
+{
+ filter_info->uri = gtk_recent_info_get_uri (info);
+ filter_info->mime_type = gtk_recent_info_get_mime_type (info);
+
+ filter_info->contains = GTK_RECENT_FILTER_URI | GTK_RECENT_FILTER_MIME_TYPE;
+
+ if (needed & GTK_RECENT_FILTER_DISPLAY_NAME)
+ {
+ filter_info->display_name = gtk_recent_info_get_display_name (info);
+ filter_info->contains |= GTK_RECENT_FILTER_DISPLAY_NAME;
+ }
+ else
+ {
+ filter_info->uri = NULL;
+ }
+
+ if (needed & GTK_RECENT_FILTER_APPLICATION)
+ {
+ filter_info->applications = (const gchar **) gtk_recent_info_get_applications (info, NULL);
+ filter_info->contains |= GTK_RECENT_FILTER_APPLICATION;
+ }
+ else
+ {
+ filter_info->applications = NULL;
+ }
+
+ if (needed & GTK_RECENT_FILTER_GROUP)
+ {
+ filter_info->groups = (const gchar **) gtk_recent_info_get_groups (info, NULL);
+ filter_info->contains |= GTK_RECENT_FILTER_GROUP;
+ }
+ else
+ {
+ filter_info->groups = NULL;
+ }
+
+ if (needed & GTK_RECENT_FILTER_AGE)
+ {
+ filter_info->age = gtk_recent_info_get_age (info);
+ filter_info->contains |= GTK_RECENT_FILTER_AGE;
+ }
+ else
+ {
+ filter_info->age = -1;
+ }
+}
+
+/* The GeditRecentConfiguration struct is allocated and owned by the caller */
+void
+gedit_recent_configuration_init_default (GeditRecentConfiguration *config)
+{
+ config->manager = gtk_recent_manager_get_default ();
+
+ if (config->filter != NULL)
+ {
+ g_object_unref (config->filter);
+ }
+
+ config->filter = gtk_recent_filter_new ();
+ gtk_recent_filter_add_application (config->filter, g_get_application_name ());
+ gtk_recent_filter_add_mime_type (config->filter, "text/plain");
+ g_object_ref_sink (config->filter);
+
+ config->limit = 5;
+ config->show_not_found = TRUE;
+ config->show_private = FALSE;
+ config->local_only = FALSE;
+
+ config->substring_filter = NULL;
+}
+
+/* The GeditRecentConfiguration struct is owned and destroyed by the caller */
+void
+gedit_recent_configuration_destroy (GeditRecentConfiguration *config)
+{
+ g_clear_object (&config->filter);
+ config->manager = NULL;
+
+ g_clear_pointer (&config->substring_filter, (GDestroyNotify)g_free);
+}
+
+GList *
+gedit_recent_get_items (GeditRecentConfiguration *config)
+{
+ GtkRecentFilterFlags needed;
+ GList *items;
+ GList *retitems = NULL;
+ gint length;
+ char *substring_filter = NULL;
+
+ if (config->limit == 0)
+ {
+ return NULL;
+ }
+
+ items = gtk_recent_manager_get_items (config->manager);
+
+ if (!items)
+ {
+ return NULL;
+ }
+
+ needed = gtk_recent_filter_get_needed (config->filter);
+ if (config->substring_filter && *config->substring_filter != '\0')
+ {
+ gchar *filter_normalized;
+
+ filter_normalized = g_utf8_normalize (config->substring_filter, -1, G_NORMALIZE_ALL);
+ substring_filter = g_utf8_casefold (filter_normalized, -1);
+ g_free (filter_normalized);
+ }
+
+ while (items)
+ {
+ GtkRecentInfo *info;
+ GtkRecentFilterInfo filter_info;
+ gboolean is_filtered;
+
+ info = items->data;
+ is_filtered = FALSE;
+
+ if (config->local_only && !gtk_recent_info_is_local (info))
+ {
+ is_filtered = TRUE;
+ }
+ else if (!config->show_private && gtk_recent_info_get_private_hint (info))
+ {
+ is_filtered = TRUE;
+ }
+ else if (!config->show_not_found && !gtk_recent_info_exists (info))
+ {
+ is_filtered = TRUE;
+ }
+ else
+ {
+ if (substring_filter)
+ {
+ gchar *uri_normalized;
+ gchar *uri_casefolded;
+
+ uri_normalized = g_utf8_normalize (gtk_recent_info_get_uri_display (info),
-1, G_NORMALIZE_ALL);
+ uri_casefolded = g_utf8_casefold (uri_normalized, -1);
+ g_free (uri_normalized);
+
+ if (strstr (uri_casefolded, substring_filter) == NULL)
+ {
+ is_filtered = TRUE;
+ }
+
+ g_free (uri_casefolded);
+ }
+
+ if (!is_filtered)
+ {
+ populate_filter_info (info, &filter_info, needed);
+ is_filtered = !gtk_recent_filter_filter (config->filter, &filter_info);
+
+ /* these we own */
+ if (filter_info.applications)
+ {
+ g_strfreev ((gchar **) filter_info.applications);
+ }
+
+ if (filter_info.groups)
+ {
+ g_strfreev ((gchar **) filter_info.groups);
+ }
+ }
+ }
+
+ if (!is_filtered)
+ {
+ retitems = g_list_prepend (retitems, info);
+ }
+ else
+ {
+ gtk_recent_info_unref (info);
+ }
+
+ items = g_list_delete_link (items, items);
+ }
+
+ g_free (substring_filter);
+
+ if (!retitems)
+ {
+ return NULL;
+ }
+
+ retitems = g_list_sort_with_data (retitems, (GCompareDataFunc) sort_recent_items_mru, NULL);
+ length = g_list_length (retitems);
+
+ if ((config->limit != -1) && (length > config->limit))
+ {
+ GList *clamp, *l;
+
+ clamp = g_list_nth (retitems, config->limit - 1);
+
+ if (!clamp)
+ {
+ return retitems;
+ }
+
+ l = clamp->next;
+ clamp->next = NULL;
+
+ g_list_free_full (l, (GDestroyNotify) gtk_recent_info_unref);
+ }
+
+ return retitems;
+}
+
+/* ex:set ts=8 noet: */
diff --git a/gedit/gedit-recent-osx.h b/gedit/gedit-recent-osx.h
new file mode 100644
index 000000000..5124e85b7
--- /dev/null
+++ b/gedit/gedit-recent-osx.h
@@ -0,0 +1,50 @@
+/*
+ * This file is part of gedit
+ *
+ * Copyright (C) 2005 - Paolo Maggi
+ * Copyright (C) 2014 - Paolo Borelli
+ * Copyright (C) 2014 - Jesse van den Kieboom
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANWINDOWILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GEDIT_RECENT_OSX_H
+#define GEDIT_RECENT_OSX_H
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+typedef struct
+{
+ GtkRecentManager *manager;
+ GtkRecentFilter *filter;
+
+ gint limit;
+ gchar *substring_filter;
+
+ guint show_private : 1;
+ guint show_not_found : 1;
+ guint local_only : 1;
+} GeditRecentConfiguration;
+
+void gedit_recent_configuration_init_default (GeditRecentConfiguration *config);
+void gedit_recent_configuration_destroy (GeditRecentConfiguration *config);
+GList *gedit_recent_get_items (GeditRecentConfiguration *config);
+
+G_END_DECLS
+
+#endif /* GEDIT_RECENT_OSX_H */
+
+/* ex:set ts=8 noet: */
diff --git a/gedit/gedit-recent.c b/gedit/gedit-recent.c
index 846734570..b1535d057 100644
--- a/gedit/gedit-recent.c
+++ b/gedit/gedit-recent.c
@@ -89,229 +89,4 @@ gedit_recent_remove_if_local (GFile *location)
}
}
-static gint
-sort_recent_items_mru (GtkRecentInfo *a,
- GtkRecentInfo *b,
- gpointer unused)
-{
- g_assert (a != NULL && b != NULL);
- return gtk_recent_info_get_modified (b) - gtk_recent_info_get_modified (a);
-}
-
-static void
-populate_filter_info (GtkRecentInfo *info,
- GtkRecentFilterInfo *filter_info,
- GtkRecentFilterFlags needed)
-{
- filter_info->uri = gtk_recent_info_get_uri (info);
- filter_info->mime_type = gtk_recent_info_get_mime_type (info);
-
- filter_info->contains = GTK_RECENT_FILTER_URI | GTK_RECENT_FILTER_MIME_TYPE;
-
- if (needed & GTK_RECENT_FILTER_DISPLAY_NAME)
- {
- filter_info->display_name = gtk_recent_info_get_display_name (info);
- filter_info->contains |= GTK_RECENT_FILTER_DISPLAY_NAME;
- }
- else
- {
- filter_info->uri = NULL;
- }
-
- if (needed & GTK_RECENT_FILTER_APPLICATION)
- {
- filter_info->applications = (const gchar **) gtk_recent_info_get_applications (info, NULL);
- filter_info->contains |= GTK_RECENT_FILTER_APPLICATION;
- }
- else
- {
- filter_info->applications = NULL;
- }
-
- if (needed & GTK_RECENT_FILTER_GROUP)
- {
- filter_info->groups = (const gchar **) gtk_recent_info_get_groups (info, NULL);
- filter_info->contains |= GTK_RECENT_FILTER_GROUP;
- }
- else
- {
- filter_info->groups = NULL;
- }
-
- if (needed & GTK_RECENT_FILTER_AGE)
- {
- filter_info->age = gtk_recent_info_get_age (info);
- filter_info->contains |= GTK_RECENT_FILTER_AGE;
- }
- else
- {
- filter_info->age = -1;
- }
-}
-
-/* The GeditRecentConfiguration struct is allocated and owned by the caller */
-void
-gedit_recent_configuration_init_default (GeditRecentConfiguration *config)
-{
- config->manager = gtk_recent_manager_get_default ();
-
- if (config->filter != NULL)
- {
- g_object_unref (config->filter);
- }
-
- config->filter = gtk_recent_filter_new ();
- gtk_recent_filter_add_application (config->filter, g_get_application_name ());
- gtk_recent_filter_add_mime_type (config->filter, "text/plain");
- g_object_ref_sink (config->filter);
-
- config->limit = 5;
- config->show_not_found = TRUE;
- config->show_private = FALSE;
- config->local_only = FALSE;
-
- config->substring_filter = NULL;
-}
-
-/* The GeditRecentConfiguration struct is owned and destroyed by the caller */
-void
-gedit_recent_configuration_destroy (GeditRecentConfiguration *config)
-{
- g_clear_object (&config->filter);
- config->manager = NULL;
-
- g_clear_pointer (&config->substring_filter, (GDestroyNotify)g_free);
-}
-
-GList *
-gedit_recent_get_items (GeditRecentConfiguration *config)
-{
- GtkRecentFilterFlags needed;
- GList *items;
- GList *retitems = NULL;
- gint length;
- char *substring_filter = NULL;
-
- if (config->limit == 0)
- {
- return NULL;
- }
-
- items = gtk_recent_manager_get_items (config->manager);
-
- if (!items)
- {
- return NULL;
- }
-
- needed = gtk_recent_filter_get_needed (config->filter);
- if (config->substring_filter && *config->substring_filter != '\0')
- {
- gchar *filter_normalized;
-
- filter_normalized = g_utf8_normalize (config->substring_filter, -1, G_NORMALIZE_ALL);
- substring_filter = g_utf8_casefold (filter_normalized, -1);
- g_free (filter_normalized);
- }
-
- while (items)
- {
- GtkRecentInfo *info;
- GtkRecentFilterInfo filter_info;
- gboolean is_filtered;
-
- info = items->data;
- is_filtered = FALSE;
-
- if (config->local_only && !gtk_recent_info_is_local (info))
- {
- is_filtered = TRUE;
- }
- else if (!config->show_private && gtk_recent_info_get_private_hint (info))
- {
- is_filtered = TRUE;
- }
- else if (!config->show_not_found && !gtk_recent_info_exists (info))
- {
- is_filtered = TRUE;
- }
- else
- {
- if (substring_filter)
- {
- gchar *uri_normalized;
- gchar *uri_casefolded;
-
- uri_normalized = g_utf8_normalize (gtk_recent_info_get_uri_display (info),
-1, G_NORMALIZE_ALL);
- uri_casefolded = g_utf8_casefold (uri_normalized, -1);
- g_free (uri_normalized);
-
- if (strstr (uri_casefolded, substring_filter) == NULL)
- {
- is_filtered = TRUE;
- }
-
- g_free (uri_casefolded);
- }
-
- if (!is_filtered)
- {
- populate_filter_info (info, &filter_info, needed);
- is_filtered = !gtk_recent_filter_filter (config->filter, &filter_info);
-
- /* these we own */
- if (filter_info.applications)
- {
- g_strfreev ((gchar **) filter_info.applications);
- }
-
- if (filter_info.groups)
- {
- g_strfreev ((gchar **) filter_info.groups);
- }
- }
- }
-
- if (!is_filtered)
- {
- retitems = g_list_prepend (retitems, info);
- }
- else
- {
- gtk_recent_info_unref (info);
- }
-
- items = g_list_delete_link (items, items);
- }
-
- g_free (substring_filter);
-
- if (!retitems)
- {
- return NULL;
- }
-
- retitems = g_list_sort_with_data (retitems, (GCompareDataFunc) sort_recent_items_mru, NULL);
- length = g_list_length (retitems);
-
- if ((config->limit != -1) && (length > config->limit))
- {
- GList *clamp, *l;
-
- clamp = g_list_nth (retitems, config->limit - 1);
-
- if (!clamp)
- {
- return retitems;
- }
-
- l = clamp->next;
- clamp->next = NULL;
-
- g_list_free_full (l, (GDestroyNotify) gtk_recent_info_unref);
- }
-
- return retitems;
-}
-
/* ex:set ts=8 noet: */
diff --git a/gedit/gedit-recent.h b/gedit/gedit-recent.h
index 5c72837ed..068d89c72 100644
--- a/gedit/gedit-recent.h
+++ b/gedit/gedit-recent.h
@@ -27,29 +27,12 @@
G_BEGIN_DECLS
-typedef struct
-{
- GtkRecentManager *manager;
- GtkRecentFilter *filter;
+void gedit_recent_add_document (GeditDocument *document);
- gint limit;
- gchar *substring_filter;
-
- guint show_private : 1;
- guint show_not_found : 1;
- guint local_only : 1;
-} GeditRecentConfiguration;
-
-void gedit_recent_add_document (GeditDocument *document);
-
-void gedit_recent_remove_if_local (GFile *location);
-
-void gedit_recent_configuration_init_default (GeditRecentConfiguration *config);
-void gedit_recent_configuration_destroy (GeditRecentConfiguration *config);
-GList *gedit_recent_get_items (GeditRecentConfiguration *config);
+void gedit_recent_remove_if_local (GFile *location);
G_END_DECLS
-#endif /* GEDIT_RECENT_H */
+#endif /* GEDIT_RECENT_H */
/* ex:set ts=8 noet: */
diff --git a/gedit/meson.build b/gedit/meson.build
index df09f8763..cb783b4b8 100644
--- a/gedit/meson.build
+++ b/gedit/meson.build
@@ -64,6 +64,7 @@ libgedit_private_headers = [
'gedit-print-job.h',
'gedit-print-preview.h',
'gedit-recent.h',
+ 'gedit-recent-osx.h',
'gedit-replace-dialog.h',
'gedit-settings.h',
'gedit-status-menu-button.h',
@@ -103,6 +104,7 @@ libgedit_private_sources = [
'gedit-print-job.c',
'gedit-print-preview.c',
'gedit-recent.c',
+ 'gedit-recent-osx.c',
'gedit-replace-dialog.c',
'gedit-settings.c',
'gedit-status-menu-button.c',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
