diff options
| author | rbuj <[email protected]> | 2021-11-01 10:21:17 +0100 |
|---|---|---|
| committer | Luke from DC <[email protected]> | 2022-02-09 04:47:12 +0000 |
| commit | 384ce5d35897453a5dcca79c2633035dd40aeaa1 (patch) | |
| tree | 2840d9f24277de09f8124845c6f5972a5cfaae5b | |
| parent | f6bd25fdf6196dd98d36708966e13e58a22d6c85 (diff) | |
| download | mate-control-center-384ce5d35897453a5dcca79c2633035dd40aeaa1.tar.bz2 mate-control-center-384ce5d35897453a5dcca79c2633035dd40aeaa1.tar.xz | |
bookmark-agent: fix backward compatibility with glib < 2.66
| -rw-r--r-- | libslab/bookmark-agent.c | 13 | ||||
| -rw-r--r-- | libslab/bookmark-agent.h | 9 |
2 files changed, 20 insertions, 2 deletions
diff --git a/libslab/bookmark-agent.c b/libslab/bookmark-agent.c index 31834bd1..6d6551e0 100644 --- a/libslab/bookmark-agent.c +++ b/libslab/bookmark-agent.c @@ -294,6 +294,14 @@ bookmark_agent_reorder_items (BookmarkAgent *this, const gchar **uris) save_store (this); } +#if !GLIB_CHECK_VERSION(2,66,0) +static gint +recent_item_mru_comp_func (gconstpointer a, gconstpointer b) +{ + return ((BookmarkItem *) b)->mtime - ((BookmarkItem *) a)->mtime; +} +#endif + static GList * make_items_from_bookmark_file (BookmarkAgent *this, GBookmarkFile *store) { @@ -333,8 +341,11 @@ make_items_from_bookmark_file (BookmarkAgent *this, GBookmarkFile *store) } } +#if GLIB_CHECK_VERSION(2,66,0) items_ordered = g_list_sort (items_ordered, g_date_time_compare); - +#else + items_ordered = g_list_sort (items_ordered, recent_item_mru_comp_func); +#endif g_strfreev (uris); return items_ordered; diff --git a/libslab/bookmark-agent.h b/libslab/bookmark-agent.h index 409509e1..f54415bf 100644 --- a/libslab/bookmark-agent.h +++ b/libslab/bookmark-agent.h @@ -21,10 +21,13 @@ #ifndef __BOOKMARK_AGENT_H__ #define __BOOKMARK_AGENT_H__ -#include <time.h> #include <glib.h> #include <glib-object.h> +#if !GLIB_CHECK_VERSION(2,66,0) +#include <time.h> +#endif + G_BEGIN_DECLS #define BOOKMARK_AGENT_TYPE (bookmark_agent_get_type ()) @@ -41,7 +44,11 @@ typedef struct { gchar *uri; gchar *title; gchar *mime_type; +#if GLIB_CHECK_VERSION(2,66,0) GDateTime *mtime; +#else + time_t mtime; +#endif gchar *icon; gchar *app_name; gchar *app_exec; |