[evince/wip/hadess/faster-smb-pdfs: 1/2] shell: Simplify memory management in ev_window_open_uri()
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evince/wip/hadess/faster-smb-pdfs: 1/2] shell: Simplify memory management in ev_window_open_uri()
- Date: Sun, 8 May 2022 13:03:02 +0000 (UTC)
commit 0478baba7726c48c06c9817679a5e22538d52bb9
Author: Bastien Nocera <hadess hadess net>
Date: Sun May 8 14:34:17 2022 +0200
shell: Simplify memory management in ev_window_open_uri()
Use g_clear_* helpers when possible.
shell/ev-window.c | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/shell/ev-window.c b/shell/ev-window.c
index b6ea5285e..e75c6b196 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -2432,25 +2432,19 @@ ev_window_open_uri (EvWindow *ev_window,
return;
}
- if (priv->monitor) {
- g_object_unref (priv->monitor);
- priv->monitor = NULL;
- }
-
+ g_clear_object (&priv->monitor);
+
ev_window_close_dialogs (ev_window);
ev_window_clear_load_job (ev_window);
ev_window_clear_local_uri (ev_window);
priv->window_mode = mode;
- if (priv->uri)
- g_free (priv->uri);
+ g_clear_pointer (&priv->uri, g_free);
priv->uri = g_strdup (uri);
- if (priv->metadata)
- g_object_unref (priv->metadata);
- if (priv->bookmarks)
- g_object_unref (priv->bookmarks);
+ g_clear_object (&priv->metadata);
+ g_clear_object (&priv->bookmarks);
source_file = g_file_new_for_uri (uri);
if (ev_is_metadata_supported_for_file (source_file)) {
@@ -2472,8 +2466,7 @@ ev_window_open_uri (EvWindow *ev_window,
priv->bookmarks = NULL;
}
- if (priv->dest)
- g_object_unref (priv->dest);
+ g_clear_object (&priv->dest);
priv->dest = dest ? g_object_ref (dest) : NULL;
set_filenames (ev_window, source_file);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]