Coding style and whitespace cleanup.

1 files changed, 72 insertions, 48 deletions

diff --git a/mail/e-mail-view.h b/mail/e-mail-view.h
index d5b3ded6a7..5c6e6a42b2 100644
--- a/mail/e-mail-view.h
+++ b/mail/e-mail-view.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -23,63 +23,87 @@
 #ifndef _E_MAIL_VIEW_H_
 #define _E_MAIL_VIEW_H_
 
-#include <gtk/gtk.h>
 #include <shell/e-shell-content.h>
 #include <shell/e-shell-searchbar.h>
 #include "widgets/menus/gal-view-instance.h"
 
-#define E_MAIL_VIEW_TYPE        (e_mail_view_get_type ())
-#define E_MAIL_VIEW(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_MAIL_VIEW_TYPE, EMailView))
-#define E_MAIL_VIEW_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_MAIL_VIEW_TYPE, EMailViewClass))
-#define IS_E_MAIL_VIEW(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_MAIL_VIEW_TYPE))
-#define IS_E_MAIL_VIEW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_MAIL_VIEW_TYPE))
-#define E_MAIL_VIEW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_MAIL_VIEW_TYPE, EMailViewClass))
-
-
+/* Standard GObject macros */
+#define E_TYPE_MAIL_VIEW \
+	(e_mail_view_get_type ())
+#define E_MAIL_VIEW(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_MAIL_VIEW, EMailView))
+#define E_MAIL_VIEW_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_MAIL_VIEW, EMailViewClass))
+#define E_IS_MAIL_VIEW(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_MAIL_VIEW))
+#define E_IS_MAIL_VIEW_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_MAIL_VIEW))
+#define E_MAIL_VIEW_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_MAIL_VIEW, EMailViewClass))
+
+G_BEGIN_DECLS
+
+typedef struct _EMailView EMailView;
+typedef struct _EMailViewClass EMailViewClass;
 typedef struct _EMailViewPrivate EMailViewPrivate;
 
-typedef struct _EMailView {
+struct _EMailView {
 	GtkVBox parent;
 
 	EMailViewPrivate *priv;
         EShellContent *content;
-	struct _EMailView *prev;
-} EMailView;
+	EMailView *prev;
+};
 
-typedef struct _EMailViewClass {
+struct _EMailViewClass {
 	GtkVBoxClass parent_class;
 
-	void (*pane_close) (EMailView *);
-	void (*view_changed) (EMailView *);
-	void (*open_mail) (EMailView *, const char *);
-
-	EShellSearchbar * (*get_searchbar) (EMailView *view);
-	void (*set_search_strings) (EMailView *view, GSList *search_strings);
-	GalViewInstance * (*get_view_instance) (EMailView *view);
-	void (*update_view_instance) (EMailView *view);
-	void (*set_orientation) (EMailView *view, GtkOrientation orientation);
-	GtkOrientation (*get_orientation) (EMailView *);
-	void (*set_preview_visible) (EMailView *view, gboolean visible);
-	gboolean (*get_preview_visible) (EMailView *view);
-	void (*set_show_deleted) (EMailView *view, gboolean show_deleted);
-	gboolean (*get_show_deleted) (EMailView *view);
-
-} EMailViewClass;
-
-GType e_mail_view_get_type (void);
-
-void e_mail_view_update_view_instance (EMailView *view);
-GalViewInstance * e_mail_view_get_view_instance (EMailView *view);
-
-void e_mail_view_set_search_strings (EMailView *view, GSList *search_strings);
-
-void e_mail_view_set_orientation (EMailView *view, GtkOrientation orientation);
-GtkOrientation  e_mail_view_get_orientation (EMailView *);
-void e_mail_view_set_preview_visible (EMailView *view, gboolean visible);
-gboolean e_mail_view_get_preview_visible (EMailView *view);
-void e_mail_view_set_show_deleted (EMailView *view, gboolean show_deleted);
-gboolean e_mail_view_get_show_deleted (EMailView *view);
-
-EShellSearchbar * e_mail_view_get_searchbar (EMailView *view);
-
-#endif
+	void		(*pane_close)		(EMailView *view);
+	void		(*view_changed)		(EMailView *view);
+	void		(*open_mail)		(EMailView *view,
+						 const gchar *);
+
+	EShellSearchbar *
+			(*get_searchbar)	(EMailView *view);
+	void		(*set_search_strings)	(EMailView *view,
+						 GSList *search_strings);
+	GalViewInstance *
+			(*get_view_instance)	(EMailView *view);
+	void		(*update_view_instance)	(EMailView *view);
+	void		(*set_orientation)	(EMailView *view,
+						 GtkOrientation orientation);
+	GtkOrientation	(*get_orientation)	(EMailView *view);
+	void		(*set_preview_visible)	(EMailView *view,
+						 gboolean visible);
+	gboolean	(*get_preview_visible)	(EMailView *view);
+	void		(*set_show_deleted)	(EMailView *view,
+						 gboolean show_deleted);
+	gboolean	(*get_show_deleted)	(EMailView *view);
+};
+
+GType		e_mail_view_get_type		(void);
+void		e_mail_view_update_view_instance(EMailView *view);
+GalViewInstance *
+		e_mail_view_get_view_instance	(EMailView *view);
+void		e_mail_view_set_search_strings	(EMailView *view,
+						 GSList *search_strings);
+void		e_mail_view_set_orientation	(EMailView *view,
+						 GtkOrientation orientation);
+GtkOrientation	e_mail_view_get_orientation	(EMailView *);
+void		e_mail_view_set_preview_visible	(EMailView *view,
+						 gboolean visible);
+gboolean	e_mail_view_get_preview_visible	(EMailView *view);
+void		e_mail_view_set_show_deleted	(EMailView *view,
+						 gboolean show_deleted);
+gboolean	e_mail_view_get_show_deleted	(EMailView *view);
+EShellSearchbar *
+		e_mail_view_get_searchbar	(EMailView *view);
+
+G_END_DECLS
+
+#endif /* E_MAIL_VIEW_H */