[gnome-dictionary] Use g_clear_object
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-dictionary] Use g_clear_object
- Date: Tue, 10 Apr 2012 21:09:33 +0000 (UTC)
commit 648c2880d56a469b3980063dca51d70704c8cfd6
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Tue Apr 10 17:05:20 2012 +0200
Use g_clear_object
src/gdict-window.c | 55 +++++++--------------------------------------------
1 files changed, 8 insertions(+), 47 deletions(-)
---
diff --git a/src/gdict-window.c b/src/gdict-window.c
index 8e8c14f..a1ff3a5 100644
--- a/src/gdict-window.c
+++ b/src/gdict-window.c
@@ -121,19 +121,9 @@ gdict_window_dispose (GObject *gobject)
{
GdictWindow *window = GDICT_WINDOW (gobject);
- if (window->desktop_settings != NULL)
- {
- g_object_unref (window->desktop_settings);
- window->desktop_settings = NULL;
- }
-
- if (window->settings != NULL)
- {
- g_object_unref (window->settings);
+ g_clear_object (&window->desktop_settings);
+ g_clear_object (&window->settings);
- window->settings = NULL;
- }
-
if (window->context)
{
if (window->lookup_start_id)
@@ -152,42 +142,13 @@ gdict_window_dispose (GObject *gobject)
g_object_unref (window->context);
window->context = NULL;
}
-
- if (window->loader)
- {
- g_object_unref (window->loader);
- window->loader = NULL;
- }
-
- if (window->ui_manager)
- {
- g_object_unref (window->ui_manager);
- window->ui_manager = NULL;
- }
-
- if (window->action_group)
- {
- g_object_unref (window->action_group);
- window->action_group = NULL;
- }
-
- if (window->completion)
- {
- g_object_unref (window->completion);
- window->completion = NULL;
- }
- if (window->completion_model)
- {
- g_object_unref (window->completion_model);
- window->completion_model = NULL;
- }
-
- if (window->busy_cursor)
- {
- g_object_unref (window->busy_cursor);
- window->busy_cursor = NULL;
- }
+ g_clear_object (&window->loader);
+ g_clear_object (&window->ui_manager);
+ g_clear_object (&window->action_group);
+ g_clear_object (&window->completion);
+ g_clear_object (&window->completion_model);
+ g_clear_object (&window->busy_cursor);
G_OBJECT_CLASS (gdict_window_parent_class)->dispose (gobject);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]