2 files changed, 33 insertions, 47 deletions

diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c
index a7ea43d9e9..715313c072 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.c
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.c
@@ -810,24 +810,6 @@ timezone_combo_set_active_text (GtkComboBox *combo, const gchar *zone_name)
 	return (id != NULL);
 }
 
-/**
- * e_timezone_dialog_reparent:
- * @etd: #ETimezoneDialog.
- * @new_parent: The new parent widget.
- *
- * Takes the internal widgets out of the dialog and put them into @new_parent
- */
-void
-e_timezone_dialog_reparent (ETimezoneDialog *etd,
-			    GtkWidget *new_parent)
-{
-	ETimezoneDialogPrivate *priv;
-
-	priv = etd->priv;
-
-	gtk_widget_reparent (priv->table, new_parent);
-}
-
 static void
 map_destroy_cb(gpointer data, GObject *where_object_was)
 {
diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.h b/widgets/e-timezone-dialog/e-timezone-dialog.h
index fb4ae52375..fa10098675 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.h
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.h
@@ -22,29 +22,37 @@
  *
  */
 
-#ifndef __E_TIMEZONE_DIALOG_H__
-#define __E_TIMEZONE_DIALOG_H__
+#ifndef E_TIMEZONE_DIALOG_H
+#define E_TIMEZONE_DIALOG_H
 
 #include <gtk/gtk.h>
 #include <libical/ical.h>
 
-
+/* Standard GObject macros */
+#define E_TYPE_TIMEZONE_DIALOG \
+	(e_timezone_dialog_get_type ())
+#define E_TIMEZONE_DIALOG(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TIMEZONE_DIALOG, ETimezoneDialog))
+#define E_TIMEZONE_DIALOG_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TIMEZONE_DIALOG, ETimezoneDialogClass))
+#define E_IS_TIMEZONE_DIALOG(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TIMEZONE_DIALOG))
+#define E_IS_TIMEZONE_DIALOG_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TIMEZONE_DIALOG))
+#define E_TIMEZONE_DIALOG_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TIMEZONE_DIALOG, ETimezoneDialogClass))
 
-#define E_TYPE_TIMEZONE_DIALOG       (e_timezone_dialog_get_type ())
-#define E_TIMEZONE_DIALOG(obj)       (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_TIMEZONE_DIALOG, ETimezoneDialog))
-#define E_TIMEZONE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_TIMEZONE_DIALOG,	\
-				      ETimezoneDialogClass))
-#define E_IS_TIMEZONE_DIALOG(obj)    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_TIMEZONE_DIALOG))
-#define E_IS_TIMEZONE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_TIMEZONE_DIALOG))
-
-typedef struct _ETimezoneDialog		ETimezoneDialog;
-typedef struct _ETimezoneDialogClass	ETimezoneDialogClass;
-typedef struct _ETimezoneDialogPrivate	ETimezoneDialogPrivate;
+typedef struct _ETimezoneDialog ETimezoneDialog;
+typedef struct _ETimezoneDialogClass ETimezoneDialogClass;
+typedef struct _ETimezoneDialogPrivate ETimezoneDialogPrivate;
 
 struct _ETimezoneDialog {
 	GObject object;
-
-	/* Private data */
 	ETimezoneDialogPrivate *priv;
 };
 
@@ -52,18 +60,14 @@ struct _ETimezoneDialogClass {
 	GObjectClass parent_class;
 };
 
-GType            e_timezone_dialog_get_type     (void);
-ETimezoneDialog *e_timezone_dialog_construct    (ETimezoneDialog  *etd);
-
-ETimezoneDialog *e_timezone_dialog_new          (void);
-
-icaltimezone    *e_timezone_dialog_get_timezone (ETimezoneDialog  *etd);
-void             e_timezone_dialog_set_timezone (ETimezoneDialog  *etd,
-						 icaltimezone     *zone);
-
-GtkWidget       *e_timezone_dialog_get_toplevel (ETimezoneDialog  *etd);
-
-void             e_timezone_dialog_reparent     (ETimezoneDialog  *etd,
-						 GtkWidget        *new_parent);
+GType		e_timezone_dialog_get_type	(void);
+ETimezoneDialog *
+		e_timezone_dialog_construct	(ETimezoneDialog  *etd);
+ETimezoneDialog *
+		e_timezone_dialog_new		(void);
+icaltimezone *	e_timezone_dialog_get_timezone	(ETimezoneDialog *etd);
+void		e_timezone_dialog_set_timezone	(ETimezoneDialog *etd,
+						 icaltimezone *zone);
+GtkWidget *	e_timezone_dialog_get_toplevel	(ETimezoneDialog *etd);
 
-#endif /* __E_TIMEZONE_DIALOG_H__ */
+#endif /* E_TIMEZONE_DIALOG_H */