aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2007-11-30 20:58:02 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2007-11-30 20:58:02 +0800
commit253452654a4bc2fdd44f61446890ccf556c82958 (patch)
treeb0ee410cdd6b2a0b53488c6bd19a5d9adfe247e8
parent256dc9fd290522382a31ab107f0709f26e20d9a2 (diff)
downloadgsoc2013-evolution-253452654a4bc2fdd44f61446890ccf556c82958.tar
gsoc2013-evolution-253452654a4bc2fdd44f61446890ccf556c82958.tar.gz
gsoc2013-evolution-253452654a4bc2fdd44f61446890ccf556c82958.tar.bz2
gsoc2013-evolution-253452654a4bc2fdd44f61446890ccf556c82958.tar.lz
gsoc2013-evolution-253452654a4bc2fdd44f61446890ccf556c82958.tar.xz
gsoc2013-evolution-253452654a4bc2fdd44f61446890ccf556c82958.tar.zst
gsoc2013-evolution-253452654a4bc2fdd44f61446890ccf556c82958.zip
** Fixes bug #499920
2007-11-30 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #499920 * shell/es-event.h: Avoid including private header "e-shell.h". Use a forward declaration of EShell instead. * shell/es-event.c: Safe to include "e-shell.h" here. svn path=/trunk/; revision=34618
-rw-r--r--shell/ChangeLog11
-rw-r--r--shell/es-event.c1
-rw-r--r--shell/es-event.h7
3 files changed, 16 insertions, 3 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index dbac9390c0..2e97d88040 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,14 @@
+2007-11-30 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes bug #499920
+
+ * es-event.h:
+ Avoid including private header "e-shell.h".
+ Use a forward declaration of EShell instead.
+
+ * es-event.c:
+ Safe to include "e-shell.h" here.
+
2007-11-30 Milan Crha <mcrha@redhat.com>
** Fix for bug #400213
diff --git a/shell/es-event.c b/shell/es-event.c
index 89ba18f492..5d4c5366d8 100644
--- a/shell/es-event.c
+++ b/shell/es-event.c
@@ -30,6 +30,7 @@
#include <glib.h>
#include "es-event.h"
+#include "e-shell.h"
static GObjectClass *eme_parent;
static ESEvent *es_event;
diff --git a/shell/es-event.h b/shell/es-event.h
index 9612198157..518fd44e52 100644
--- a/shell/es-event.h
+++ b/shell/es-event.h
@@ -26,13 +26,14 @@
#include <glib-object.h>
#include "e-util/e-event.h"
-#include "e-shell.h"
#ifdef __cplusplus
extern "C" {
#pragma }
#endif /* __cplusplus */
+struct _EShell; /* Avoid including "e-shell.h" */
+
typedef struct _ESEvent ESEvent;
typedef struct _ESEventClass ESEventClass;
@@ -56,7 +57,7 @@ typedef struct _ESEventTargetShell ESEventTargetShell;
struct _ESEventTargetShell {
EEventTarget target;
- EShell *shell;
+ struct _EShell *shell;
};
struct _ESEventTargetState {
@@ -91,7 +92,7 @@ GType es_event_get_type(void);
ESEvent *es_event_peek(void);
ESEventTargetState *es_event_target_new_state(ESEvent *emp, int state);
-ESEventTargetShell *es_event_target_new_shell(ESEvent *eme, EShell *shell);
+ESEventTargetShell *es_event_target_new_shell(ESEvent *eme, struct _EShell *shell);
ESEventTargetUpgrade *es_event_target_new_upgrade(ESEvent *emp, int major, int minor, int revision);
/* ********************************************************************** */