1 files changed, 3 insertions, 115 deletions

diff --git a/src/prefs.h b/src/prefs.h
index b81bea68..f062d1eb 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -21,27 +21,15 @@
 #define __PREFS_H__
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkbox.h>
 #include <stdio.h>
 
 typedef struct _PrefParam	PrefParam;
 typedef struct _PrefFile	PrefFile;
-typedef struct _PrefsDialog	PrefsDialog;
 
-#include "account.h"
-
-#define VSPACING		10
-#define VSPACING_NARROW		4
-#define VSPACING_NARROW_2	2
-#define VBOX_BORDER		16
-#define DEFAULT_ENTRY_WIDTH	80
 #define PREFSBUFSIZE		1024
 
+#define P_WID(wid)		((gpointer *)(wid))
+
 typedef enum
 {
 	P_STRING,
@@ -60,7 +48,7 @@ struct _PrefParam {
 	gchar	      *defval;
 	gpointer       data;
 	PrefType       type;
-	GtkWidget    **widget;
+	gpointer      *widget;
 	DataSetFunc    data_set_func;
 	WidgetSetFunc  widget_set_func;
 };
@@ -70,85 +58,6 @@ struct _PrefFile {
 	gchar *path;
 };
 
-struct _PrefsDialog 
-{
-	GtkWidget *window;
-	GtkWidget *notebook;
-
-	GtkWidget *confirm_area;
-	GtkWidget *ok_btn;
-	GtkWidget *cancel_btn;
-	GtkWidget *apply_btn;
-};
-
-#define SET_NOTEBOOK_LABEL(notebook, str, page_num) \
-{ \
-	GtkWidget *label; \
- \
-	label = gtk_label_new (str); \
-	gtk_widget_show (label); \
-	gtk_notebook_set_tab_label \
-		(GTK_NOTEBOOK (notebook), \
-		 gtk_notebook_get_nth_page \
-			(GTK_NOTEBOOK (notebook), page_num), \
-		 label); \
-}
-
-#define PACK_CHECK_BUTTON(box, chkbtn, label) \
-{ \
-	chkbtn = gtk_check_button_new_with_label(label); \
-	gtk_widget_show(chkbtn); \
-	gtk_box_pack_start(GTK_BOX(box), chkbtn, FALSE, TRUE, 0); \
-}
-
-#define PACK_END_CHECK_BUTTON(box, chkbtn, label) \
-{ \
-	chkbtn = gtk_check_button_new_with_label(label); \
-	gtk_widget_show(chkbtn); \
-	gtk_box_pack_end(GTK_BOX(box), chkbtn, FALSE, TRUE, 0); \
-}
-
-#define PACK_FRAME(box, frame, label) \
-{ \
-	frame = gtk_frame_new(label); \
-	gtk_widget_show(frame); \
-	gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0); \
-	gtk_frame_set_label_align(GTK_FRAME(frame), 0.01, 0.5); \
-}
-
-#define PACK_FRAME_WITH_CHECK_BUTTON(box, frame, chkbtn, label) \
-{ \
-	chkbtn = gtk_check_button_new_with_label(label); \
-	gtk_widget_show(chkbtn); \
-	PACK_FRAME(box, frame, NULL); \
-	gtk_frame_set_label_widget(GTK_FRAME(frame), chkbtn); \
-}
-
-#define PACK_SMALL_LABEL(box, label, str) \
-{ \
-	label = gtk_label_new(str); \
-	gtk_widget_show(label); \
-	gtk_box_pack_start(GTK_BOX(box), label, FALSE, TRUE, 0); \
-	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); \
-	gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT); \
-	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); \
-	gtkut_widget_set_small_font_size(label); \
-}
-
-#define PACK_VSPACER(box, vbox, spacing) \
-{ \
-	vbox = gtk_vbox_new(FALSE, 0); \
-	gtk_widget_show(vbox); \
-	gtk_box_pack_start(GTK_BOX(box), vbox, FALSE, TRUE, spacing); \
-}
-
-#define SET_TOGGLE_SENSITIVITY(togglewid, targetwid) \
-{ \
-	gtk_widget_set_sensitive(targetwid, FALSE); \
-	g_signal_connect(G_OBJECT(togglewid), "toggled", \
-			 G_CALLBACK(prefs_button_toggled), targetwid); \
-}
-
 void prefs_read_config		(PrefParam	*param,
 				 const gchar	*label,
 				 const gchar	*rcfile,
@@ -168,25 +77,4 @@ gint prefs_file_close_revert	(PrefFile	*pfile);
 void prefs_set_default		(PrefParam	*param);
 void prefs_free			(PrefParam	*param);
 
-void prefs_dialog_create	(PrefsDialog	*dialog);
-void prefs_dialog_destroy	(PrefsDialog	*dialog);
-
-void prefs_button_toggled	(GtkToggleButton	*toggle_btn,
-				 GtkWidget		*widget);
-
-void prefs_set_dialog		(PrefParam	*param);
-void prefs_set_data_from_dialog	(PrefParam	*param);
-void prefs_set_dialog_to_default(PrefParam	*param);
-
-void prefs_set_data_from_entry	(PrefParam	*pparam);
-void prefs_set_entry		(PrefParam	*pparam);
-void prefs_set_data_from_text	(PrefParam	*pparam);
-void prefs_set_text		(PrefParam	*pparam);
-void prefs_set_data_from_toggle	(PrefParam	*pparam);
-void prefs_set_toggle		(PrefParam	*pparam);
-void prefs_set_data_from_spinbtn(PrefParam	*pparam);
-void prefs_set_spinbtn		(PrefParam	*pparam);
-void prefs_set_data_from_fontbtn(PrefParam	*pparam);
-void prefs_set_fontbtn		(PrefParam	*pparam);
-
 #endif /* __PREFS_H__ */