gnome-settings-daemon r277 - in trunk: . plugins/housekeeping

[mjc svn gnome org]

Author: mjc
Date: Wed Apr  9 17:53:59 2008
New Revision: 277
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=277&view=rev

Log:
2008-04-09  Michael J. Chudobiak  <mjc svn gnome org>

        * plugins/housekeeping/gsd-housekeeping-manager.c:
        (gsd_housekeeping_manager_stop):
        Purge thumbnail cache on shutdown if and only if the max size or
        max age parameters have been set to zero (for paranoid people).



Modified:
   trunk/ChangeLog
   trunk/plugins/housekeeping/gsd-housekeeping-manager.c

Modified: trunk/plugins/housekeeping/gsd-housekeeping-manager.c
==============================================================================
--- trunk/plugins/housekeeping/gsd-housekeeping-manager.c	(original)
+++ trunk/plugins/housekeeping/gsd-housekeeping-manager.c	Wed Apr  9 17:53:59 2008
@@ -322,16 +322,22 @@
 {
         g_debug ("Stopping housekeeping manager");
 
-        if (manager->priv->long_term_cb) {
-                g_source_remove (manager->priv->long_term_cb);
-                manager->priv->long_term_cb = 0;
-        }
-
         if (manager->priv->short_term_cb) {
                 g_source_remove (manager->priv->short_term_cb);
                 manager->priv->short_term_cb = 0;
         }
 
+        if (manager->priv->long_term_cb) {
+                g_source_remove (manager->priv->long_term_cb);
+                manager->priv->long_term_cb = 0;
+
+                /* Do a clean-up on shutdown if and only if the size or age
+                   limits have been set to paranoid levels (zero) */
+                if ((get_gconf_int_with_default (GCONF_THUMB_AGE, DEFAULT_MAX_AGE_IN_DAYS) == 0) ||
+                    (get_gconf_int_with_default (GCONF_THUMB_SIZE, DEFAULT_MAX_SIZE_IN_MB) == 0)) {
+                        do_cleanup (manager);
+                }
+        }
 }