[epiphany/wip/modern_gobject: 13/15] EphyDownload: Use g_clear_object
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/wip/modern_gobject: 13/15] EphyDownload: Use g_clear_object
- Date: Mon, 14 Sep 2015 01:12:45 +0000 (UTC)
commit 0af511549c91d25b23ffdf8703e62e2d7d21e94c
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Sun Sep 13 19:57:17 2015 -0500
EphyDownload: Use g_clear_object
embed/ephy-download.c | 22 +++++-----------------
1 files changed, 5 insertions(+), 17 deletions(-)
---
diff --git a/embed/ephy-download.c b/embed/ephy-download.c
index 21980a3..548f8f2 100644
--- a/embed/ephy-download.c
+++ b/embed/ephy-download.c
@@ -384,10 +384,7 @@ ephy_download_set_widget (EphyDownload *download,
{
g_return_if_fail (EPHY_IS_DOWNLOAD (download));
- if (download->widget != NULL)
- g_object_unref (download->widget);
-
- download->widget = NULL;
+ g_clear_object(&download->widget);
if (widget != NULL)
download->widget = g_object_ref (widget);
@@ -604,21 +601,12 @@ ephy_download_dispose (GObject *object)
release_session_inhibitor (download);
- if (download->download) {
+ if (download->download)
g_signal_handlers_disconnect_matched (download->download, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, download);
- g_object_unref (download->download);
- download->download = NULL;
- }
- if (download->window) {
- g_object_unref (download->window);
- download->window = NULL;
- }
-
- if (download->widget) {
- g_object_unref (download->widget);
- download->widget = NULL;
- }
+ g_clear_object(&download->download);
+ g_clear_object(&download->window);
+ g_clear_object(&download->widget);
G_OBJECT_CLASS (ephy_download_parent_class)->dispose (object);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]