1 files changed, 54 insertions, 59 deletions

diff --git a/lib/ephy-dialog.h b/lib/ephy-dialog.h
index a440dd625..a1ed97f1f 100644
--- a/lib/ephy-dialog.h
+++ b/lib/ephy-dialog.h
@@ -1,5 +1,6 @@
 /*
  *  Copyright (C) 2000-2003 Marco Pesenti Gritti
+ *  Copyright (C) 2003 Christian Persch
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -27,102 +28,96 @@
 
 G_BEGIN_DECLS
 
-#define EPHY_TYPE_DIALOG	 (ephy_dialog_get_type ())
-#define EPHY_DIALOG(o)		 (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_DIALOG, EphyDialog))
-#define EPHY_DIALOG_CLASS(k)	 (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_DIALOG, EphyDialogClass))
-#define EPHY_IS_DIALOG(o)	 (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_DIALOG))
-#define EPHY_IS_DIALOG_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_DIALOG))
-#define EPHY_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_DIALOG, EphyDialogClass))
+#define EPHY_TYPE_DIALOG		(ephy_dialog_get_type ())
+#define EPHY_DIALOG(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_DIALOG, EphyDialog))
+#define EPHY_DIALOG_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_DIALOG, EphyDialogClass))
+#define EPHY_IS_DIALOG(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_DIALOG))
+#define EPHY_IS_DIALOG_CLASS(k)		(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_DIALOG))
+#define EPHY_DIALOG_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_DIALOG, EphyDialogClass))
 
-typedef struct EphyDialogClass EphyDialogClass;
-typedef struct EphyDialog EphyDialog;
-typedef struct EphyDialogPrivate EphyDialogPrivate;
-
-#define SY_BEGIN_GROUP -20
-#define SY_END_GROUP -21
-#define SY_END -22
-#define SY_BEGIN_GROUP_INVERSE -23
-
-struct EphyDialog
-{
-	GObject parent;
-
-	/*< private >*/
-	EphyDialogPrivate *priv;
-};
+typedef struct EphyDialogClass		EphyDialogClass;
+typedef struct EphyDialog		EphyDialog;
+typedef struct EphyDialogPrivate	EphyDialogPrivate;
 
 typedef enum
 {
 	PT_NORMAL,
 	PT_AUTOAPPLY
-} PropertyType;
+} EphyDialogApplyType;
 
 typedef struct
 {
-	int id;
-	const char *control_name;
-	const char *state_pref;
-	PropertyType type;
-	int *sg;
+	const char *id;
+	const char *pref;
+	EphyDialogApplyType apply_type;
+	GType data_type;
 } EphyDialogProperty;
 
 struct EphyDialogClass
 {
-        GObjectClass parent_class;
+	GObjectClass parent_class;
 
-	void        (* construct)       (EphyDialog *dialog,
+	void		(* construct)	(EphyDialog *dialog,
 					 const EphyDialogProperty *properties,
 					 const char *file,
-			                 const char *name);
-	gint        (* run)		(EphyDialog *dialog);
-	void        (* show)		(EphyDialog *dialog);
-	GtkWidget * (* get_control)     (EphyDialog *dialog,
-				         int property_id);
-	void        (* get_value)       (EphyDialog *dialog,
-					 int property_id,
-					 GValue *value);
+					 const char *name);
+	void		(* show)	(EphyDialog *dialog);
 };
 
-GType         ephy_dialog_get_type		(void);
+struct EphyDialog
+{
+	GObject parent;
 
-EphyDialog   *ephy_dialog_new			(void);
+	/*< private >*/
+	EphyDialogPrivate *priv;
+};
 
-EphyDialog   *ephy_dialog_new_with_parent	(GtkWidget *parent_window);
+GType		ephy_dialog_get_type		(void);
 
-void	      ephy_dialog_construct		(EphyDialog *dialog,
+EphyDialog     *ephy_dialog_new			(void);
+
+EphyDialog     *ephy_dialog_new_with_parent	(GtkWidget *parent_window);
+
+void		ephy_dialog_construct		(EphyDialog *dialog,
 						 const EphyDialogProperty *properties,
 						 const char *file,
 						 const char *name);
 
-void	      ephy_dialog_add_enum		(EphyDialog *dialog,
-						 int id,
+void		ephy_dialog_add_enum		(EphyDialog *dialog,
+						 const char *id,
 						 guint n_items,
 						 const char **items);
 
-void	      ephy_dialog_set_size_group	(EphyDialog *dialog,
-						 int *controls_id,
-						 guint n_controls);
+void		ephy_dialog_set_data_column	(EphyDialog *dialog,
+						 const char *id,
+						 int col);
 
-gint          ephy_dialog_run			(EphyDialog *dialog);
-
-void          ephy_dialog_show			(EphyDialog *dialog);
+void		ephy_dialog_set_size_group	(EphyDialog *dialog,
+						 const char **controls_id,
+						 guint n_controls);
 
-void          ephy_dialog_show_embedded		(EphyDialog *dialog,
-						 GtkWidget *container);
+int		ephy_dialog_run			(EphyDialog *dialog);
 
-void	      ephy_dialog_remove_embedded	(EphyDialog *dialog);
+void		ephy_dialog_show		(EphyDialog *dialog);
 
-void          ephy_dialog_set_modal		(EphyDialog *dialog,
+void		ephy_dialog_set_modal		(EphyDialog *dialog,
 						 gboolean is_modal);
 
-GtkWidget    *ephy_dialog_get_control		(EphyDialog *dialog,
-						 int property_id);
+GtkWidget      *ephy_dialog_get_control		(EphyDialog *dialog,
+						 const char *property_id);
 
-void          ephy_dialog_get_value		(EphyDialog *dialog,
-						 int property_id,
+void		ephy_dialog_get_value		(EphyDialog *dialog,
+						 const char *property_id,
 						 GValue *value);
 
+void		ephy_dialog_set_value		(EphyDialog *dialog,
+						 const char *property_id,
+						 const GValue *value);
+
+void		ephy_dialog_set_pref		(EphyDialog *dialog,
+						 const char *property_id,
+						 const char *pref);
+
 G_END_DECLS
 
 #endif
-