summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrbuj <[email protected]>2021-11-01 10:21:17 +0100
committerraveit65 <[email protected]>2023-05-07 17:11:32 +0200
commit62385ba63409e647381c04dbd7a647d3018d777f (patch)
tree52f589dd94e7aab20ec780a8139dfd66ff9f490f
parent0c084c2e24fb3f281f5735862f6010917e8f5d56 (diff)
downloadmate-control-center-62385ba63409e647381c04dbd7a647d3018d777f.tar.bz2
mate-control-center-62385ba63409e647381c04dbd7a647d3018d777f.tar.xz
bookmark-agent: fix backward compatibility with glib < 2.66
-rw-r--r--libslab/bookmark-agent.c13
-rw-r--r--libslab/bookmark-agent.h9
2 files changed, 20 insertions, 2 deletions
diff --git a/libslab/bookmark-agent.c b/libslab/bookmark-agent.c
index b37616ff..6258c40f 100644
--- a/libslab/bookmark-agent.c
+++ b/libslab/bookmark-agent.c
@@ -296,6 +296,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)
{
@@ -335,8 +343,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;