ephy-browse-history: style cleanups

2 files changed, 45 insertions, 115 deletions

diff --git a/embed/ephy-browse-history.c b/embed/ephy-browse-history.c
index 08563da17..5ee25cac4 100644
--- a/embed/ephy-browse-history.c
+++ b/embed/ephy-browse-history.c
@@ -1,8 +1,7 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
 /* vim: set sw=2 ts=2 sts=2 et: */
 /*
- *  Copyright © 2002, 2003 Marco Pesenti Gritti
- *  Copyright © 2011 Igalia S.L.
+ *  Copyright © 2011, 2012 Igalia S.L.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,66 +20,27 @@
  */
 
 #include "config.h"
+#include "ephy-browse-history.h"
 
-#include "ephy-history-service.h"
-#include "ephy-history-types.h"
-#include "ephy-request-about.h"
 #include "ephy-file-helpers.h"
-#include "ephy-browse-history.h"
+#include "ephy-request-about.h"
 
 G_DEFINE_TYPE (EphyBrowseHistory, ephy_browse_history, G_TYPE_OBJECT)
 
-#define EPHY_BROWSE_HISTORY_PRIVATE(o) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), EPHY_TYPE_BROWSE_HISTORY, EphyBrowseHistoryPrivate))
+#define EPHY_BROWSE_HISTORY_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EPHY_TYPE_BROWSE_HISTORY, EphyBrowseHistoryPrivate))
 
-struct _EphyBrowseHistoryPrivate
-{
+struct _EphyBrowseHistoryPrivate {
   EphyHistoryService *history_service;
 };
 
-
-static void
-ephy_browse_history_get_property (GObject    *object,
-                                  guint       property_id,
-                                  GValue     *value,
-                                  GParamSpec *pspec)
-{
-  switch (property_id)
-    {
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    }
-}
-
-static void
-ephy_browse_history_set_property (GObject      *object,
-                                  guint         property_id,
-                                  const GValue *value,
-                                  GParamSpec   *pspec)
-{
-  switch (property_id)
-    {
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    }
-}
-
 static void
 ephy_browse_history_dispose (GObject *object)
 {
-  G_OBJECT_CLASS (ephy_browse_history_parent_class)->dispose (object);
-}
-
-static void
-ephy_browse_history_finalize (GObject *object)
-{
   EphyBrowseHistory *history = EPHY_BROWSE_HISTORY (object);
 
-  if (history->priv->history_service) {
-    g_object_unref (history->priv->history_service);
-  }
+  g_clear_object (&history->priv->history_service);
 
-  G_OBJECT_CLASS (ephy_browse_history_parent_class)->finalize (object);
+  G_OBJECT_CLASS (ephy_browse_history_parent_class)->dispose (object);
 }
 
 static void
@@ -90,10 +50,7 @@ ephy_browse_history_class_init (EphyBrowseHistoryClass *klass)
 
   g_type_class_add_private (klass, sizeof (EphyBrowseHistoryPrivate));
 
-  object_class->get_property = ephy_browse_history_get_property;
-  object_class->set_property = ephy_browse_history_set_property;
   object_class->dispose = ephy_browse_history_dispose;
-  object_class->finalize = ephy_browse_history_finalize;
 }
 
 static void
diff --git a/embed/ephy-browse-history.h b/embed/ephy-browse-history.h
index 1acc97b7e..bbab28c98 100644
--- a/embed/ephy-browse-history.h
+++ b/embed/ephy-browse-history.h
@@ -1,8 +1,7 @@
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
 /* vim: set sw=2 ts=2 sts=2 et: */
 /*
- *  Copyright © 2000-2003 Marco Pesenti Gritti
- *  Copyright © 2011 Igalia S.L.
+ *  Copyright © 2011, 2012 Igalia S.L.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -27,86 +26,60 @@
 #ifndef _EPHY_BROWSE_HISTORY_H
 #define _EPHY_BROWSE_HISTORY_H
 
-#include <glib-object.h>
-
 #include "ephy-history-service.h"
 
 G_BEGIN_DECLS
 
-#define EPHY_TYPE_BROWSE_HISTORY ephy_browse_history_get_type()
-
-#define EPHY_BROWSE_HISTORY(obj)                                        \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj),                                   \
-                               EPHY_TYPE_BROWSE_HISTORY, EphyBrowseHistory))
-
-#define EPHY_BROWSE_HISTORY_CLASS(klass)                                \
-  (G_TYPE_CHECK_CLASS_CAST ((klass),                                    \
-                            EPHY_TYPE_BROWSE_HISTORY, EphyBrowseHistoryClass))
-
-#define EPHY_IS_BROWSE_HISTORY(obj)                       \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj),                     \
-                               EPHY_TYPE_BROWSE_HISTORY))
-
-#define EPHY_IS_BROWSE_HISTORY_CLASS(klass)             \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass),                    \
-                            EPHY_TYPE_BROWSE_HISTORY))
-
-#define EPHY_BROWSE_HISTORY_GET_CLASS(obj)                              \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj),                                    \
-                              EPHY_TYPE_BROWSE_HISTORY, EphyBrowseHistoryClass))
+#define EPHY_TYPE_BROWSE_HISTORY            (ephy_browse_history_get_type())
+#define EPHY_BROWSE_HISTORY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_BROWSE_HISTORY, EphyBrowseHistory))
+#define EPHY_BROWSE_HISTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  EPHY_TYPE_BROWSE_HISTORY, EphyBrowseHistoryClass))
+#define EPHY_IS_BROWSE_HISTORY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_BROWSE_HISTORY))
+#define EPHY_IS_BROWSE_HISTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  EPHY_TYPE_BROWSE_HISTORY))
+#define EPHY_BROWSE_HISTORY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  EPHY_TYPE_BROWSE_HISTORY, EphyBrowseHistoryClass))
 
 typedef struct _EphyBrowseHistory EphyBrowseHistory;
 typedef struct _EphyBrowseHistoryClass EphyBrowseHistoryClass;
 typedef struct _EphyBrowseHistoryPrivate EphyBrowseHistoryPrivate;
 
-struct _EphyBrowseHistory
-{
+struct _EphyBrowseHistory {
   GObject parent;
 
   EphyBrowseHistoryPrivate *priv;
 };
 
-struct _EphyBrowseHistoryClass
-{
+struct _EphyBrowseHistoryClass {
   GObjectClass parent_class;
 };
 
-GType              ephy_browse_history_get_type (void) G_GNUC_CONST;
-
-EphyBrowseHistory *ephy_browse_history_new      (void);
-
-void               ephy_browse_history_add_page (EphyBrowseHistory *history,
-                                                 const char *orig_url);
-
-void               ephy_browse_history_set_page_title (EphyBrowseHistory *history,
-                                                       const char *url,
-                                                       const char *title);
-
-void              ephy_browse_history_set_page_zoom_level (EphyBrowseHistory *history,
-                                                           const char *url,
-                                                           const double zoom_level);
-
-void              ephy_browse_history_get_url (EphyBrowseHistory *history,
-                                               const char *url,
-                                               EphyHistoryJobCallback callback,
-                                               gpointer user_data);
-
-void             ephy_browse_history_find_urls (EphyBrowseHistory *history,
-                                                gint64 from, gint64 to,
-                                                guint limit,
-                                                GList *substring_list,
-                                                EphyHistoryJobCallback callback,
-                                                gpointer user_data);
-
-void             ephy_browse_history_delete_urls (EphyBrowseHistory *history,
-                                                  GList *urls,
-                                                  EphyHistoryJobCallback callback,
-                                                  gpointer user_data);
-
-void             ephy_browse_history_get_host_for_url (EphyBrowseHistory *history,
-                                                       const char *url,
-                                                       EphyHistoryJobCallback callback,
-                                                       gpointer user_data);
+GType              ephy_browse_history_get_type            (void) G_GNUC_CONST;
+EphyBrowseHistory *ephy_browse_history_new                 (void);
+void               ephy_browse_history_add_page            (EphyBrowseHistory      *history,
+                                                            const char             *orig_url);
+void               ephy_browse_history_set_page_title      (EphyBrowseHistory      *history,
+                                                            const char             *url,
+                                                            const char             *title);
+void               ephy_browse_history_set_page_zoom_level (EphyBrowseHistory      *history,
+                                                            const char             *url,
+                                                            const double            zoom_level);
+void               ephy_browse_history_get_url             (EphyBrowseHistory      *history,
+                                                            const char             *url,
+                                                            EphyHistoryJobCallback  callback,
+                                                            gpointer                user_data);
+void               ephy_browse_history_find_urls           (EphyBrowseHistory      *history,
+                                                            gint64                  from,
+                                                            gint64                  to,
+                                                            guint                   limit,
+                                                            GList                  *substring_list,
+                                                            EphyHistoryJobCallback  callback,
+                                                            gpointer                user_data);
+void               ephy_browse_history_delete_urls         (EphyBrowseHistory      *history,
+                                                            GList                  *urls,
+                                                            EphyHistoryJobCallback  callback,
+                                                            gpointer                user_data);
+void               ephy_browse_history_get_host_for_url    (EphyBrowseHistory      *history,
+                                                            const char             *url,
+                                                            EphyHistoryJobCallback  callback,
+                                                            gpointer                user_data);
 
 G_END_DECLS