Code cleanup, no logic changes.

2008-03-19  Matthew Barnes  <mbarnes@redhat.com>

	* em-folder-view.h:
	* em-message-browser.h:
	* em-message-browser.c:
	Code cleanup, no logic changes.


svn path=/trunk/; revision=35214

1 files changed, 35 insertions, 10 deletions

diff --git a/mail/em-message-browser.h b/mail/em-message-browser.h
index c36a87ee0b..09e34e2cb6 100644
--- a/mail/em-message-browser.h
+++ b/mail/em-message-browser.h
@@ -1,30 +1,55 @@
 
-#ifndef _EM_MESSAGE_BROWSER_H
-#define _EM_MESSAGE_BROWSER_H
+#ifndef EM_MESSAGE_BROWSER_H
+#define EM_MESSAGE_BROWSER_H
 
+#include <gtk/gtkwidget.h>
 #include "em-folder-view.h"
 
+/* Standard GObject macros */
+#define EM_TYPE_MESSAGE_BROWSER \
+	(em_message_browser_get_type ())
+#define EM_MESSAGE_BROWSER(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), EM_TYPE_MESSAGE_BROWSER, EMMessageBrowser))
+#define EM_MESSAGE_BROWSER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), EM_TYPE_MESSAGE_BROWSER, EMMessageBrowserClass))
+#define EM_IS_MESSAGE_BROWSER(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), EM_TYPE_MESSAGE_BROWSER))
+#define EM_IS_MESSAGE_BROWSER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), EM_TYPE_MESSAGE_BROWSER))
+#define EM_MESSAGE_BROWSER_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), EM_TYPE_MESSAGE_BROWSER, EMMessageBrowserClass))
+
+G_BEGIN_DECLS
+
 typedef struct _EMMessageBrowser EMMessageBrowser;
 typedef struct _EMMessageBrowserClass EMMessageBrowserClass;
+typedef struct _EMMessageBrowserPrivate EMMessageBrowserPrivate;
 
 struct _EMMessageBrowser {
-	EMFolderView view;
+	EMFolderView parent;
 
 	/* container, if setup */
-	struct _GtkWidget *window;
+	GtkWidget *window;
 
-	struct _EMMessageBrowserPrivate *priv;
+	EMMessageBrowserPrivate *priv;
 };
 
 struct _EMMessageBrowserClass {
 	EMFolderViewClass parent_class;
 };
 
-GType em_message_browser_get_type(void);
+GType		em_message_browser_get_type	(void);
+
+GtkWidget *     em_message_browser_new		(void);
 
-GtkWidget *em_message_browser_new(void);
+/* Also sets up a bonobo container window w/ docks and so on. */
+GtkWidget *     em_message_browser_window_new	(void);
 
-/* also sets up a bonobo container window w/ docks and so on */
-GtkWidget *em_message_browser_window_new(void);
+G_END_DECLS
 
-#endif /* ! _EM_MESSAGE_BROWSER_H */
+#endif /* EM_MESSAGE_BROWSER_H */