[epiphany] ephy-combined-stop-reload-action: object orientation is hard, let's go shopping

[Xan Lopez <xan src gnome org>]

commit 6fd9f304d69a75ecd3f64896da62e6658317454d
Author: Xan Lopez <xan igalia com>
Date:   Mon Jan 16 22:29:19 2012 +0100

    ephy-combined-stop-reload-action: object orientation is hard, let's go shopping

 src/ephy-combined-stop-reload-action.c |    1 -
 src/ephy-combined-stop-reload-action.h |    9 +++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/ephy-combined-stop-reload-action.c b/src/ephy-combined-stop-reload-action.c
index 0e85cd1..21db6ba 100644
--- a/src/ephy-combined-stop-reload-action.c
+++ b/src/ephy-combined-stop-reload-action.c
@@ -22,7 +22,6 @@
 #include "config.h"
 #include "ephy-combined-stop-reload-action.h"
 
-#include "ephy-window-action.h"
 #include "window-commands.h"
 
 #include <glib/gi18n.h>
diff --git a/src/ephy-combined-stop-reload-action.h b/src/ephy-combined-stop-reload-action.h
index 680f3fe..f6e722d 100644
--- a/src/ephy-combined-stop-reload-action.h
+++ b/src/ephy-combined-stop-reload-action.h
@@ -22,9 +22,10 @@
 #ifndef _EPHY_COMBINED_STOP_RELOAD_ACTION_H
 #define _EPHY_COMBINED_STOP_RELOAD_ACTION_H
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 
+#include "ephy-window-action.h"
+
 G_BEGIN_DECLS
 
 #define EPHY_TYPE_COMBINED_STOP_RELOAD_ACTION            (ephy_combined_stop_reload_action_get_type())
@@ -40,7 +41,7 @@ typedef struct _EphyCombinedStopReloadActionPrivate EphyCombinedStopReloadAction
 
 struct _EphyCombinedStopReloadAction
 {
-  GtkAction parent;
+  EphyWindowAction parent;
 
   /*< private >*/
   EphyCombinedStopReloadActionPrivate *priv;
@@ -48,13 +49,13 @@ struct _EphyCombinedStopReloadAction
 
 struct _EphyCombinedStopReloadActionClass
 {
-  GtkActionClass parent_class;
+  EphyWindowActionClass parent_class;
 };
 
 GType ephy_combined_stop_reload_action_get_type (void) G_GNUC_CONST;
 
 void ephy_combined_stop_reload_action_set_loading (EphyCombinedStopReloadAction *action,
-				       gboolean loading);
+                                                   gboolean loading);
 
 G_END_DECLS