1 files changed, 12 insertions, 17 deletions
diff --git a/src/caja-trash-bar.h b/src/caja-trash-bar.h
index 5d20175e..7365d9c9 100644
--- a/src/caja-trash-bar.h
+++ b/src/caja-trash-bar.h
@@ -27,9 +27,7 @@
 
 #include <gtk/gtk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 #define CAJA_TYPE_TRASH_BAR (caja_trash_bar_get_type ())
 #define CAJA_TRASH_BAR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CAJA_TYPE_TRASH_BAR, CajaTrashBar))
@@ -38,27 +36,24 @@ extern "C" {
 #define CAJA_IS_TRASH_BAR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CAJA_TYPE_TRASH_BAR))
 #define CAJA_TRASH_BAR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CAJA_TYPE_TRASH_BAR, CajaTrashBarClass))
 
- typedef struct CajaTrashBarPrivate CajaTrashBarPrivate;
+typedef struct _CajaTrashBarPrivate CajaTrashBarPrivate;
 
- typedef struct
- {
+typedef struct
+{
 GtkBox box;
 CajaTrashBarPrivate *priv;
- } CajaTrashBar;
+} CajaTrashBar;
 
- typedef struct
- {
- GtkBoxClass parent_class;
+typedef struct
+{
+GtkBoxClass parent_class;
 
- } CajaTrashBarClass;
+} CajaTrashBarClass;
 
- GType caja_trash_bar_get_type (void) G_GNUC_CONST;
+GType caja_trash_bar_get_type (void) G_GNUC_CONST;
 
- GtkWidget *caja_trash_bar_new (CajaWindow *window);
+GtkWidget *caja_trash_bar_new (CajaWindow *window);
 
-
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* __GS_TRASH_BAR_H */