summaryrefslogtreecommitdiff
path: root/libmate-desktop/mate-desktop-thumbnail.c
diff options
context:
space:
mode:
authorPhilip Withnall <[email protected]>2013-10-10 14:22:12 +0100
committerraveit65 <[email protected]>2020-01-09 00:06:04 +0100
commit56a544fb594bc80e0991717d97f11c784e386819 (patch)
treeb26bbf8f60173b555fa9a00f6342ad695f231280 /libmate-desktop/mate-desktop-thumbnail.c
parente8ad08431239b54904271eca88afe39389e38018 (diff)
downloadmate-desktop-56a544fb594bc80e0991717d97f11c784e386819.tar.bz2
mate-desktop-56a544fb594bc80e0991717d97f11c784e386819.tar.xz
Add missing cases to switch statement
This shuts up a gcc warning by adding support for thumbnail directories being unmounted or moved. https://bugzilla.gnome.org/show_bug.cgi?id=709819 origin commit: https://gitlab.gnome.org/GNOME/gnome-desktop/commit/c064fab
Diffstat (limited to 'libmate-desktop/mate-desktop-thumbnail.c')
-rw-r--r--libmate-desktop/mate-desktop-thumbnail.c144
1 files changed, 103 insertions, 41 deletions
diff --git a/libmate-desktop/mate-desktop-thumbnail.c b/libmate-desktop/mate-desktop-thumbnail.c
index 2efa4f5..2e2f29d 100644
--- a/libmate-desktop/mate-desktop-thumbnail.c
+++ b/libmate-desktop/mate-desktop-thumbnail.c
@@ -47,6 +47,13 @@
#define SECONDS_BETWEEN_STATS 10
+static void
+thumbnailers_directory_changed (GFileMonitor *monitor,
+ GFile *file,
+ GFile *other_file,
+ GFileMonitorEvent event_type,
+ MateDesktopThumbnailFactory *factory);
+
struct _MateDesktopThumbnailFactoryPrivate {
MateDesktopThumbnailSize size;
@@ -634,6 +641,88 @@ remove_thumbnailer (MateDesktopThumbnailFactory *factory,
}
static void
+remove_thumbnailers_for_dir (MateDesktopThumbnailFactory *factory,
+ const gchar *thumbnailer_dir,
+ GFileMonitor *monitor)
+{
+ MateDesktopThumbnailFactoryPrivate *priv = factory->priv;
+ GList *l;
+ Thumbnailer *thumb;
+
+ g_mutex_lock (&priv->lock);
+
+ /* Remove all the thumbnailers inside this @thumbnailer_dir. */
+ for (l = priv->thumbnailers; l; l = g_list_next (l))
+ {
+ thumb = (Thumbnailer *)l->data;
+
+ if (g_str_has_prefix (thumb->path, thumbnailer_dir) == TRUE)
+ {
+ priv->thumbnailers = g_list_delete_link (priv->thumbnailers, l);
+ g_hash_table_foreach_remove (priv->mime_types_map,
+ (GHRFunc)remove_thumbnailer_from_mime_type_map,
+ (gpointer)thumb->path);
+ thumbnailer_unref (thumb);
+
+ break;
+ }
+ }
+
+ /* Remove the monitor for @thumbnailer_dir. */
+ priv->monitors = g_list_remove (priv->monitors, monitor);
+ g_signal_handlers_disconnect_by_func (monitor, thumbnailers_directory_changed, factory);
+
+ g_mutex_unlock (&priv->lock);
+}
+
+static void
+mate_desktop_thumbnail_factory_load_thumbnailers_for_dir (MateDesktopThumbnailFactory *factory,
+ const gchar *path)
+{
+ MateDesktopThumbnailFactoryPrivate *priv = factory->priv;
+ GDir *dir;
+ GFile *dir_file;
+ GFileMonitor *monitor;
+ const gchar *dirent;
+
+ dir = g_dir_open (path, 0, NULL);
+ if (!dir)
+ return;
+
+ /* Monitor dir */
+ dir_file = g_file_new_for_path (path);
+ monitor = g_file_monitor_directory (dir_file,
+ G_FILE_MONITOR_NONE,
+ NULL, NULL);
+ if (monitor)
+ {
+ g_signal_connect (monitor, "changed",
+ G_CALLBACK (thumbnailers_directory_changed),
+ factory);
+ priv->monitors = g_list_prepend (priv->monitors, monitor);
+ }
+ g_object_unref (dir_file);
+
+ while ((dirent = g_dir_read_name (dir)))
+ {
+ Thumbnailer *thumb;
+ gchar *filename;
+
+ if (!g_str_has_suffix (dirent, THUMBNAILER_EXTENSION))
+ continue;
+
+ filename = g_build_filename (path, dirent, NULL);
+ thumb = thumbnailer_new (filename);
+ g_free (filename);
+
+ if (thumb)
+ mate_desktop_thumbnail_factory_add_thumbnailer (factory, thumb);
+ }
+
+ g_dir_close (dir);
+}
+
+static void
thumbnailers_directory_changed (GFileMonitor *monitor,
GFile *file,
GFile *other_file,
@@ -661,6 +750,19 @@ thumbnailers_directory_changed (GFileMonitor *monitor,
g_free (path);
break;
+ case G_FILE_MONITOR_EVENT_UNMOUNTED:
+ case G_FILE_MONITOR_EVENT_MOVED:
+ path = g_file_get_path (file);
+ remove_thumbnailers_for_dir (factory, path, monitor);
+
+ if (event_type == G_FILE_MONITOR_EVENT_MOVED)
+ mate_desktop_thumbnail_factory_load_thumbnailers_for_dir (factory, path);
+
+ g_free (path);
+ break;
+ case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
+ case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED:
+ case G_FILE_MONITOR_EVENT_PRE_UNMOUNT:
default:
break;
}
@@ -679,47 +781,7 @@ mate_desktop_thumbnail_factory_load_thumbnailers (MateDesktopThumbnailFactory *f
dirs = get_thumbnailers_dirs ();
for (i = 0; dirs[i]; i++)
{
- const gchar *path = dirs[i];
- GDir *dir;
- GFile *dir_file;
- GFileMonitor *monitor;
- const gchar *dirent;
-
- dir = g_dir_open (path, 0, NULL);
- if (!dir)
- continue;
-
- /* Monitor dir */
- dir_file = g_file_new_for_path (path);
- monitor = g_file_monitor_directory (dir_file,
- G_FILE_MONITOR_NONE,
- NULL, NULL);
- if (monitor)
- {
- g_signal_connect (monitor, "changed",
- G_CALLBACK (thumbnailers_directory_changed),
- factory);
- priv->monitors = g_list_prepend (priv->monitors, monitor);
- }
- g_object_unref (dir_file);
-
- while ((dirent = g_dir_read_name (dir)))
- {
- Thumbnailer *thumb;
- gchar *filename;
-
- if (!g_str_has_suffix (dirent, THUMBNAILER_EXTENSION))
- continue;
-
- filename = g_build_filename (path, dirent, NULL);
- thumb = thumbnailer_new (filename);
- g_free (filename);
-
- if (thumb)
- mate_desktop_thumbnail_factory_add_thumbnailer (factory, thumb);
- }
-
- g_dir_close (dir);
+ mate_desktop_thumbnail_factory_load_thumbnailers_for_dir (factory, dirs[i]);
}
priv->loaded = TRUE;