diff options
| author | Ernestas Kulik <ernestask@src.gnome.org> | 2016-07-24 23:07:41 +0300 |
|---|---|---|
| committer | Ernestas Kulik <ernestask@src.gnome.org> | 2016-07-25 15:20:54 +0300 |
| commit | 6064bdcfe5428c481bb7f854b76993fbd958ea15 (patch) | |
| tree | e10589855278cadc0fba2aa7611ef9486ded3171 /src | |
| parent | c3f0cc8b8caf2993b12557fcee4597b518b82925 (diff) | |
| download | nautilus-6064bdcfe5428c481bb7f854b76993fbd958ea15.tar.gz | |
application: clear icon caches on shutdown
Currently, the icon info caches are cleared in quit_mainloop(), which
does not get invoked as of GLib 2.32, thus resulting in NautilusIconInfo
leaks. This commit moves the cache clearing call to shutdown().
https://bugzilla.gnome.org/show_bug.cgi?id=769134
Diffstat (limited to 'src')
| -rw-r--r-- | src/nautilus-application.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/nautilus-application.c b/src/nautilus-application.c index 989f31d72..ab27ab723 100644 --- a/src/nautilus-application.c +++ b/src/nautilus-application.c @@ -1085,6 +1085,8 @@ on_application_shutdown (GApplication *application, } g_list_free (notification_ids); + + nautilus_icon_info_clear_caches (); } void @@ -1194,16 +1196,6 @@ nautilus_application_dbus_unregister (GApplication *app, } static void -nautilus_application_quit_mainloop (GApplication *app) -{ - DEBUG ("Quitting mainloop"); - - nautilus_icon_info_clear_caches (); - - G_APPLICATION_CLASS (nautilus_application_parent_class)->quit_mainloop (app); -} - -static void update_dbus_opened_locations (NautilusApplication *self) { NautilusApplicationPrivate *priv; @@ -1362,7 +1354,6 @@ nautilus_application_class_init (NautilusApplicationClass *class) application_class = G_APPLICATION_CLASS (class); application_class->startup = nautilus_application_startup; application_class->activate = nautilus_application_activate; - application_class->quit_mainloop = nautilus_application_quit_mainloop; application_class->dbus_register = nautilus_application_dbus_register; application_class->dbus_unregister = nautilus_application_dbus_unregister; application_class->open = nautilus_application_open; |