1 files changed, 27 insertions, 15 deletions

diff --git a/e-util/e-url-entry.h b/e-util/e-url-entry.h
index 0925287b63..af1b95d639 100644
--- a/e-util/e-url-entry.h
+++ b/e-util/e-url-entry.h
@@ -24,26 +24,38 @@
 #error "Only <e-util/e-util.h> should be included directly."
 #endif
 
-#ifndef _E_URL_ENTRY_H_
-#define _E_URL_ENTRY_H_
+#ifndef E_URL_ENTRY_H
+#define E_URL_ENTRY_H
 
 #include <gtk/gtk.h>
 
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define E_TYPE_URL_ENTRY \
+	(e_url_entry_get_type ())
+#define E_URL_ENTRY(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_URL_ENTRY, EUrlEntry))
+#define E_URL_ENTRY_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_URL_ENTRY, EUrlEntryClass))
+#define E_IS_URL_ENTRY(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_URL_ENTRY))
+#define E_IS_URL_ENTRY_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_URL_ENTRY))
+#define E_URL_ENTRY_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_URL_ENTRY, EUrlEntryClass))
 
-#define E_TYPE_URL_ENTRY			(e_url_entry_get_type ())
-#define E_URL_ENTRY(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_URL_ENTRY, EUrlEntry))
-#define E_URL_ENTRY_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_URL_ENTRY, EUrlEntryClass))
-#define E_IS_URL_ENTRY(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_URL_ENTRY))
-#define E_IS_URL_ENTRY_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_URL_ENTRY))
+G_BEGIN_DECLS
 
-typedef struct _EUrlEntry        EUrlEntry;
+typedef struct _EUrlEntry EUrlEntry;
+typedef struct _EUrlEntryClass EUrlEntryClass;
 typedef struct _EUrlEntryPrivate EUrlEntryPrivate;
-typedef struct _EUrlEntryClass   EUrlEntryClass;
 
 struct _EUrlEntry {
 	GtkBox parent;
-
 	EUrlEntryPrivate *priv;
 };
 
@@ -51,10 +63,10 @@ struct _EUrlEntryClass {
 	GtkBoxClass parent_class;
 };
 
-GType      e_url_entry_get_type  (void);
-GtkWidget *e_url_entry_new       (void);
-GtkWidget *e_url_entry_get_entry (EUrlEntry *url_entry);
+GType		e_url_entry_get_type		(void) G_GNUC_CONST;
+GtkWidget *	e_url_entry_new			(void);
+GtkWidget *	e_url_entry_get_entry		(EUrlEntry *url_entry);
 
 G_END_DECLS
 
-#endif /* _E_URL_ENTRY_H_ */
+#endif /* E_URL_ENTRY_H */