projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Migrate ModestMsgEditWindow to inherit from ModestHildon2Window
[modest]
/
src
/
widgets
/
modest-msg-edit-window.h
diff --git
a/src/widgets/modest-msg-edit-window.h
b/src/widgets/modest-msg-edit-window.h
index
c24e30a
..
94a6898
100644
(file)
--- a/
src/widgets/modest-msg-edit-window.h
+++ b/
src/widgets/modest-msg-edit-window.h
@@
-32,6
+32,9
@@
#include <tny-msg.h>
#include <tny-vfs-stream.h>
#include <tny-msg.h>
#include <tny-vfs-stream.h>
+#ifdef MODEST_TOOLKIT_HILDON2
+#include <modest-hildon2-window.h>
+#endif
#include <widgets/modest-window.h>
G_BEGIN_DECLS
#include <widgets/modest-window.h>
G_BEGIN_DECLS
@@
-48,12
+51,20
@@
typedef struct _ModestMsgEditWindow ModestMsgEditWindow;
typedef struct _ModestMsgEditWindowClass ModestMsgEditWindowClass;
struct _ModestMsgEditWindow {
typedef struct _ModestMsgEditWindowClass ModestMsgEditWindowClass;
struct _ModestMsgEditWindow {
+#ifdef MODEST_TOOLKIT_HILDON2
+ ModestHildon2Window parent;
+#else
ModestWindow parent;
ModestWindow parent;
+#endif
/* insert public members, if any */
};
struct _ModestMsgEditWindowClass {
/* insert public members, if any */
};
struct _ModestMsgEditWindowClass {
+#ifdef MODEST_TOOLKIT_HILDON2
+ ModestHildon2WindowClass parent_class;
+#else
ModestWindowClass parent_class;
ModestWindowClass parent_class;
+#endif
/* insert signal callback declarations, eg. */
/* void (* my_event) (ModestMsgEditWindow* obj); */
};
/* insert signal callback declarations, eg. */
/* void (* my_event) (ModestMsgEditWindow* obj); */
};