aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorXan Lopez <xan@igalia.com>2012-01-17 05:29:19 +0800
committerXan Lopez <xan@igalia.com>2012-01-17 05:29:19 +0800
commit6fd9f304d69a75ecd3f64896da62e6658317454d (patch)
tree73c0db9434397c12cbf2c213cbe052236094dae8 /src
parent6f203b074c744fe07bfa84e6d679276835ec5049 (diff)
downloadgsoc2013-epiphany-6fd9f304d69a75ecd3f64896da62e6658317454d.tar
gsoc2013-epiphany-6fd9f304d69a75ecd3f64896da62e6658317454d.tar.gz
gsoc2013-epiphany-6fd9f304d69a75ecd3f64896da62e6658317454d.tar.bz2
gsoc2013-epiphany-6fd9f304d69a75ecd3f64896da62e6658317454d.tar.lz
gsoc2013-epiphany-6fd9f304d69a75ecd3f64896da62e6658317454d.tar.xz
gsoc2013-epiphany-6fd9f304d69a75ecd3f64896da62e6658317454d.tar.zst
gsoc2013-epiphany-6fd9f304d69a75ecd3f64896da62e6658317454d.zip
ephy-combined-stop-reload-action: object orientation is hard, let's go shopping
Diffstat (limited to 'src')
-rw-r--r--src/ephy-combined-stop-reload-action.c1
-rw-r--r--src/ephy-combined-stop-reload-action.h9
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 0e85cd106..21db6bae0 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 680f3fec0..f6e722d42 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