[evolution] EPreviewPane cleanups.



commit a8edf2eca6461a668b8cd45386087373b794840e
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Jul 27 17:34:55 2013 -0400

    EPreviewPane cleanups.

 e-util/e-preview-pane.c |   27 +++++----------------------
 e-util/e-preview-pane.h |    3 ---
 2 files changed, 5 insertions(+), 25 deletions(-)
---
diff --git a/e-util/e-preview-pane.c b/e-util/e-preview-pane.c
index 27009ab..ae13a8b 100644
--- a/e-util/e-preview-pane.c
+++ b/e-util/e-preview-pane.c
@@ -14,15 +14,8 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "e-preview-pane.h"
 
 #include <gdk/gdkkeysyms.h>
@@ -123,20 +116,9 @@ preview_pane_dispose (GObject *object)
 
        priv = E_PREVIEW_PANE_GET_PRIVATE (object);
 
-       if (priv->alert_bar != NULL) {
-               g_object_unref (priv->alert_bar);
-               priv->alert_bar = NULL;
-       }
-
-       if (priv->search_bar != NULL) {
-               g_object_unref (priv->search_bar);
-               priv->search_bar = NULL;
-       }
-
-       if (priv->web_view != NULL) {
-               g_object_unref (priv->web_view);
-               priv->web_view = NULL;
-       }
+       g_clear_object (&priv->alert_bar);
+       g_clear_object (&priv->search_bar);
+       g_clear_object (&priv->web_view);
 
        /* Chain up to parent's dispose() method. */
        G_OBJECT_CLASS (e_preview_pane_parent_class)->dispose (object);
@@ -261,7 +243,8 @@ e_preview_pane_class_init (EPreviewPaneClass *class)
        binding_set = gtk_binding_set_by_class (class);
 
        gtk_binding_entry_add_signal (
-               binding_set, GDK_KEY_f, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+               binding_set, GDK_KEY_f,
+               GDK_SHIFT_MASK | GDK_CONTROL_MASK,
                "show-search-bar", 0);
 }
 
diff --git a/e-util/e-preview-pane.h b/e-util/e-preview-pane.h
index 88cd0f3..ef66ec7 100644
--- a/e-util/e-preview-pane.h
+++ b/e-util/e-preview-pane.h
@@ -14,9 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
  */
 
 #if !defined (__E_UTIL_H_INSIDE__) && !defined (LIBEUTIL_COMPILATION)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]