gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-07-02 16:31:15 +00:00
Code Issues Projects Releases Wiki Activity

recent-servers: New recycled object

Browse Source
This commit is contained in:
António Fernandes 2024-01-19 11:12:19 +00:00
parent 2e9fca4510
commit a0a54a72dd
3 changed files with 85 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/meson.build
View File

@ -211,6 +211,8 @@ libnautilus_sources = [
'nautilus-progress-paintable.h', 'nautilus-progress-paintable.h',
'nautilus-program-choosing.c', 'nautilus-program-choosing.c',
'nautilus-program-choosing.h', 'nautilus-program-choosing.h',
'nautilus-recent-servers.c',
'nautilus-recent-servers.h',
'nautilus-search-directory.c', 'nautilus-search-directory.c',
'nautilus-search-directory.h', 'nautilus-search-directory.h',
'nautilus-search-directory-file.c', 'nautilus-search-directory-file.c',

120
src/gtk/nautilusgtkplacesview.c → src/nautilus-recent-servers.c
View File

@ -10,11 +10,11 @@
#include <gio/gio.h> #include <gio/gio.h>
#include "nautilusgtkplacesviewprivate.h" #include "nautilus-recent-servers.h"
struct _NautilusGtkPlacesView struct _NautilusRecentServers
{ {
GtkBox parent_instance; GObject parent_instance;
GFile *server_list_file; GFile *server_list_file;
GFileMonitor *server_list_monitor; GFileMonitor *server_list_monitor;
@ -22,12 +22,12 @@ struct _NautilusGtkPlacesView
guint loading : 1; guint loading : 1;
}; };
static void populate_servers (NautilusGtkPlacesView *view); static void populate_servers (NautilusRecentServers *self);
static void nautilus_gtk_places_view_set_loading (NautilusGtkPlacesView *view, static void nautilus_recent_servers_set_loading (NautilusRecentServers *self,
gboolean loading); gboolean loading);
G_DEFINE_TYPE (NautilusGtkPlacesView, nautilus_gtk_places_view, GTK_TYPE_BOX) G_DEFINE_TYPE (NautilusRecentServers, nautilus_recent_servers, G_TYPE_OBJECT)
enum enum
{ {
@ -39,13 +39,13 @@ enum
static GParamSpec *properties[LAST_PROP]; static GParamSpec *properties[LAST_PROP];
static void static void
server_file_changed_cb (NautilusGtkPlacesView *view) server_file_changed_cb (NautilusRecentServers *self)
{ {
populate_servers (view); populate_servers (self);
} }
static GBookmarkFile * static GBookmarkFile *
server_list_load (NautilusGtkPlacesView *view) server_list_load (NautilusRecentServers *self)
{ {
GBookmarkFile *bookmarks; GBookmarkFile *bookmarks;
GError *error = NULL; GError *error = NULL;
@ -72,13 +72,13 @@ server_list_load (NautilusGtkPlacesView *view)
} }
/* Monitor the file in case it's modified outside this code */ /* Monitor the file in case it's modified outside this code */
if (!view->server_list_monitor) if (!self->server_list_monitor)
{ {
view->server_list_file = g_file_new_for_path (filename); self->server_list_file = g_file_new_for_path (filename);
if (view->server_list_file) if (self->server_list_file)
{ {
view->server_list_monitor = g_file_monitor_file (view->server_list_file, self->server_list_monitor = g_file_monitor_file (self->server_list_file,
G_FILE_MONITOR_NONE, G_FILE_MONITOR_NONE,
NULL, NULL,
&error); &error);
@ -90,14 +90,14 @@ server_list_load (NautilusGtkPlacesView *view)
} }
else else
{ {
g_signal_connect_swapped (view->server_list_monitor, g_signal_connect_swapped (self->server_list_monitor,
"changed", "changed",
G_CALLBACK (server_file_changed_cb), G_CALLBACK (server_file_changed_cb),
view); self);
} }
} }
g_clear_object (&view->server_list_file); g_clear_object (&self->server_list_file);
} }
g_free (datadir); g_free (datadir);
@ -116,8 +116,8 @@ server_list_save (GBookmarkFile *bookmarks)
g_free (filename); g_free (filename);
} }
static void G_GNUC_UNUSED static void
server_list_add_server (NautilusGtkPlacesView *view, server_list_add_server (NautilusRecentServers *self,
GFile *file) GFile *file)
{ {
GBookmarkFile *bookmarks; GBookmarkFile *bookmarks;
@ -125,10 +125,11 @@ server_list_add_server (NautilusGtkPlacesView *view,
GError *error; GError *error;
char *title; char *title;
char *uri; char *uri;
GDateTime *now; GDateTime *now;
error = NULL; error = NULL;
bookmarks = server_list_load (view); bookmarks = server_list_load (self);
if (!bookmarks) if (!bookmarks)
{ {
@ -158,13 +159,13 @@ server_list_add_server (NautilusGtkPlacesView *view,
g_free (uri); g_free (uri);
} }
static void G_GNUC_UNUSED static void
server_list_remove_server (NautilusGtkPlacesView *view, server_list_remove_server (NautilusRecentServers *self,
const char *uri) const char *uri)
{ {
GBookmarkFile *bookmarks; GBookmarkFile *bookmarks;
bookmarks = server_list_load (view); bookmarks = server_list_load (self);
if (!bookmarks) if (!bookmarks)
{ {
@ -178,42 +179,42 @@ server_list_remove_server (NautilusGtkPlacesView *view,
} }
static void static void
nautilus_gtk_places_view_finalize (GObject *object) nautilus_recent_servers_finalize (GObject *object)
{ {
NautilusGtkPlacesView *view = (NautilusGtkPlacesView *) object; NautilusRecentServers *self = (NautilusRecentServers *) object;
g_clear_object (&view->server_list_file); g_clear_object (&self->server_list_file);
g_clear_object (&view->server_list_monitor); g_clear_object (&self->server_list_monitor);
G_OBJECT_CLASS (nautilus_gtk_places_view_parent_class)->finalize (object); G_OBJECT_CLASS (nautilus_recent_servers_parent_class)->finalize (object);
} }
static void static void
nautilus_gtk_places_view_dispose (GObject *object) nautilus_recent_servers_dispose (GObject *object)
{ {
NautilusGtkPlacesView *view = (NautilusGtkPlacesView *) object; NautilusRecentServers *self = (NautilusRecentServers *) object;
if (view->server_list_monitor) if (self->server_list_monitor)
{ {
g_signal_handlers_disconnect_by_func (view->server_list_monitor, server_file_changed_cb, object); g_signal_handlers_disconnect_by_func (self->server_list_monitor, server_file_changed_cb, object);
} }
G_OBJECT_CLASS (nautilus_gtk_places_view_parent_class)->dispose (object); G_OBJECT_CLASS (nautilus_recent_servers_parent_class)->dispose (object);
} }
static void static void
nautilus_gtk_places_view_get_property (GObject *object, nautilus_recent_servers_get_property (GObject *object,
guint prop_id, guint prop_id,
GValue *value, GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
NautilusGtkPlacesView *self = NAUTILUS_GTK_PLACES_VIEW (object); NautilusRecentServers *self = NAUTILUS_RECENT_SERVERS (object);
switch (prop_id) switch (prop_id)
{ {
case PROP_LOADING: case PROP_LOADING:
{ {
g_value_set_boolean (value, nautilus_gtk_places_view_get_loading (self)); g_value_set_boolean (value, nautilus_recent_servers_get_loading (self));
break; break;
} }
@ -225,13 +226,13 @@ nautilus_gtk_places_view_get_property (GObject *object,
} }
static void static void
populate_servers (NautilusGtkPlacesView *view) populate_servers (NautilusRecentServers *self)
{ {
GBookmarkFile *server_list; GBookmarkFile *server_list;
char **uris; char **uris;
gsize num_uris; gsize num_uris;
server_list = server_list_load (view); server_list = server_list_load (self);
if (!server_list) if (!server_list)
{ {
@ -243,6 +244,7 @@ populate_servers (NautilusGtkPlacesView *view)
if (!uris) if (!uris)
{ {
g_bookmark_file_free (server_list); g_bookmark_file_free (server_list);
nautilus_recent_servers_set_loading (self, FALSE);
return; return;
} }
@ -259,18 +261,20 @@ populate_servers (NautilusGtkPlacesView *view)
g_free (name); g_free (name);
} }
nautilus_recent_servers_set_loading (self, FALSE);
g_strfreev (uris); g_strfreev (uris);
g_bookmark_file_free (server_list); g_bookmark_file_free (server_list);
} }
static void static void
nautilus_gtk_places_view_class_init (NautilusGtkPlacesViewClass *klass) nautilus_recent_servers_class_init (NautilusRecentServersClass *klass)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->finalize = nautilus_gtk_places_view_finalize; object_class->finalize = nautilus_recent_servers_finalize;
object_class->dispose = nautilus_gtk_places_view_dispose; object_class->dispose = nautilus_recent_servers_dispose;
object_class->get_property = nautilus_gtk_places_view_get_property; object_class->get_property = nautilus_recent_servers_get_property;
properties[PROP_LOADING] = properties[PROP_LOADING] =
g_param_spec_boolean ("loading", g_param_spec_boolean ("loading",
@ -283,33 +287,33 @@ nautilus_gtk_places_view_class_init (NautilusGtkPlacesViewClass *klass)
} }
static void static void
nautilus_gtk_places_view_init (NautilusGtkPlacesView *self) nautilus_recent_servers_init (NautilusRecentServers *self)
{ {
} }
GtkWidget * NautilusRecentServers *
nautilus_gtk_places_view_new (void) nautilus_recent_servers_new (void)
{ {
return g_object_new (NAUTILUS_TYPE_GTK_PLACES_VIEW, NULL); return g_object_new (NAUTILUS_TYPE_RECENT_SERVERS, NULL);
} }
gboolean gboolean
nautilus_gtk_places_view_get_loading (NautilusGtkPlacesView *view) nautilus_recent_servers_get_loading (NautilusRecentServers *self)
{ {
g_return_val_if_fail (NAUTILUS_IS_GTK_PLACES_VIEW (view), FALSE); g_return_val_if_fail (NAUTILUS_IS_RECENT_SERVERS (self), FALSE);
return view->loading; return self->loading;
} }
static void static void
nautilus_gtk_places_view_set_loading (NautilusGtkPlacesView *view, nautilus_recent_servers_set_loading (NautilusRecentServers *self,
gboolean loading) gboolean loading)
{ {
g_return_if_fail (NAUTILUS_IS_GTK_PLACES_VIEW (view)); g_return_if_fail (NAUTILUS_IS_RECENT_SERVERS (self));
if (view->loading != loading) if (self->loading != loading)
{ {
view->loading = loading; self->loading = loading;
g_object_notify_by_pspec (G_OBJECT (view), properties [PROP_LOADING]); g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_LOADING]);
} }
} }

21
src/nautilus-recent-servers.h Normal file
View File

@ -0,0 +1,21 @@
/*
* Copyright (C) 2024 António Fernandes <antoniof@gnome.org>
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
#pragma once
#include <gio/gio.h>
G_BEGIN_DECLS
#define NAUTILUS_TYPE_RECENT_SERVERS (nautilus_recent_servers_get_type ())
G_DECLARE_FINAL_TYPE (NautilusRecentServers, nautilus_recent_servers, NAUTILUS, RECENT_SERVERS, GObject);
NautilusRecentServers* nautilus_recent_servers_new (void);
gboolean nautilus_recent_servers_get_loading (NautilusRecentServers *self);
G_END_DECLS