diff options
author | Michael Catanzaro <mcatanzaro@gnome.org> | 2021-02-03 17:07:15 -0600 |
---|---|---|
committer | Michael Catanzaro <mcatanzaro@gnome.org> | 2021-02-03 17:07:15 -0600 |
commit | c23bc31831d24dc76d2fc30399010e6a8e1e7319 (patch) | |
tree | 159040717d794875466fc86314052b016f042bd3 | |
parent | d0d57c0df11e06e82b563f52887ba7d9c27198ee (diff) | |
download | epiphany-mcatanzaro/webextension-deinitialize.tar.gz |
Remove ephy_web_process_extension_deinitializemcatanzaro/webextension-deinitialize
dispose works fine.
-rw-r--r-- | embed/web-process-extension/ephy-web-process-extension-main.c | 6 | ||||
-rw-r--r-- | embed/web-process-extension/ephy-web-process-extension.c | 8 |
2 files changed, 3 insertions, 11 deletions
diff --git a/embed/web-process-extension/ephy-web-process-extension-main.c b/embed/web-process-extension/ephy-web-process-extension-main.c index 8f3298198..749bcf128 100644 --- a/embed/web-process-extension/ephy-web-process-extension-main.c +++ b/embed/web-process-extension/ephy-web-process-extension-main.c @@ -63,11 +63,7 @@ webkit_web_extension_initialize_with_user_data (WebKitWebExtension *webkit_exten static void __attribute__((destructor)) ephy_web_process_extension_shutdown (void) { - if (extension) { - ephy_web_process_extension_deinitialize (extension); - g_object_unref (extension); - } - + g_clear_object (&extension); ephy_settings_shutdown (); ephy_file_helpers_shutdown (); } diff --git a/embed/web-process-extension/ephy-web-process-extension.c b/embed/web-process-extension/ephy-web-process-extension.c index de1cd6302..f7e92e476 100644 --- a/embed/web-process-extension/ephy-web-process-extension.c +++ b/embed/web-process-extension/ephy-web-process-extension.c @@ -396,6 +396,8 @@ ephy_web_process_extension_dispose (GObject *object) g_clear_pointer (&extension->frames_map, g_hash_table_unref); } + g_clear_pointer (&extension->translation_table, g_hash_table_destroy); + G_OBJECT_CLASS (ephy_web_process_extension_parent_class)->dispose (object); } @@ -823,9 +825,3 @@ ephy_web_process_extension_initialize (EphyWebProcessExtension *extension, extension->translation_table = g_hash_table_new (g_str_hash, NULL); } - -void -ephy_web_process_extension_deinitialize (EphyWebProcessExtension *extension) -{ - g_clear_pointer (&extension->translation_table, g_hash_table_destroy); -} |