Use gtkh header files to clean up dolcon{,f} a bit.

diff --git a/clients/gtk2/dolcon.c b/clients/gtk2/dolcon.c
index 5b286f3..9ea791d 100644 (file)
--- a/clients/gtk2/dolcon.c
+++ b/clients/gtk2/dolcon.c
@@ -110,59 +110,17 @@ struct srchsize *srchsizes = NULL;
 struct knownspeed *knownspeeds = NULL;
 int numsizes = 0, numspeeds = 0, ksqueryseq = -1, ksquerytag = -1, lsrestag = -1;
 
-gboolean initdeath(GtkWidget *, gpointer);
-void cb_main_connmenu_activate(GtkWidget *widget, gpointer data);
-void cb_main_dconnmenu_activate(GtkWidget *widget, gpointer data);
-void cb_main_prefmenu_activate(GtkWidget *widget, gpointer data);
-void cb_main_lsres_activate(GtkWidget *widget, gpointer data);
-void cb_main_sdmenu_activate(GtkWidget *widget, gpointer data);
-void cb_inpdialog_entry_activate(GtkWidget *widget, gpointer data);
-void cb_main_fnaddr_activate(GtkWidget *widget, gpointer data);
-void cb_main_pubhubfilter_activate(GtkWidget *widget, gpointer data);
-void cb_main_dcnctbtn_clicked(GtkWidget *widget, gpointer data);
-void cb_main_phublist_cchange(GtkWidget *widget, gpointer data);
-void cb_main_phublist_activate(GtkWidget *widget, GtkTreePath *path, GtkTreeViewColumn *col, gpointer data);
-void cb_main_chatnodes_activate(GtkWidget *widget, GtkTreePath *path, GtkTreeViewColumn *col, gpointer data);
-void cb_main_srchres_activate(GtkWidget *widget, GtkTreePath *path, GtkTreeViewColumn *col, gpointer data);
-void cb_main_chatstr_activate(GtkWidget *widget, gpointer data);
-void cb_main_simplesrch_changed(GtkWidget *widget, gpointer data);
-void cb_main_realsrch_changed(GtkWidget *widget, gpointer data);
-void cb_main_srchbtn_clicked(GtkWidget *widget, gpointer data);
-void cb_main_srchcanbtn_clicked(GtkWidget *widget, gpointer data);
-gboolean cb_main_trlist_keypress(GtkWidget *widget, GdkEventKey *event, gpointer data);
-void cb_main_filternoslots_toggled(GtkToggleButton *widget, gpointer data);
-void cb_main_srhash_activate(GtkWidget *widget, gpointer data);
-void cb_main_srcopy_activate(GtkWidget *widget, gpointer data);
-void cb_main_trhash_activate(GtkWidget *widget, gpointer data);
-void cb_main_trcopy_activate(GtkWidget *widget, gpointer data);
-void cb_main_trreset_activate(GtkWidget *widget, gpointer data);
-void cb_main_trcancel_activate(GtkWidget *widget, gpointer data);
-gboolean cb_main_srpopup(GtkWidget *widget, GdkEventButton *event, gpointer data);
-gboolean cb_main_trpopup(GtkWidget *widget, GdkEventButton *event, gpointer data);
-void cb_reslist_reload_clicked(GtkWidget *widget, gpointer data);
-void cb_reslist_delete_clicked(GtkWidget *widget, gpointer data);
-void cb_reslist_search_clicked(GtkWidget *widget, gpointer data);
-void cb_reslist_list_cchange(GtkWidget *widget, gpointer data);
-void cb_reslist_list_activate(GtkWidget *widget, GtkTreePath *path, GtkTreeViewColumn *col, gpointer data);
-gboolean cb_reslist_list_keypress(GtkWidget *widget, GdkEventKey *event, gpointer data);
 void dcfdcallback(gpointer data, gint source, GdkInputCondition condition);
 void srchstatupdate(void);
-void transnicebytefunc(GtkTreeViewColumn *col, GtkCellRenderer *rend, GtkTreeModel *model, GtkTreeIter *iter, gpointer data);
-void transnicebytefunc2(GtkTreeViewColumn *col, GtkCellRenderer *rend, GtkTreeModel *model, GtkTreeIter *iter, gpointer data);
-void transspeedinfo(GtkTreeViewColumn *col, GtkCellRenderer *rend, GtkTreeModel *model, GtkTreeIter *iter, gpointer data);
-void transerrorinfo(GtkTreeViewColumn *col, GtkCellRenderer *rend, GtkTreeModel *model, GtkTreeIter *iter, gpointer data);
-void percentagefunc(GtkTreeViewColumn *col, GtkCellRenderer *rend, GtkTreeModel *model, GtkTreeIter *iter, gpointer data);
-void hidezerofunc(GtkTreeViewColumn *col, GtkCellRenderer *rend, GtkTreeModel *model, GtkTreeIter *iter, gpointer data);
-void speedtimefunc(GtkTreeViewColumn *col, GtkCellRenderer *rend, GtkTreeModel *model, GtkTreeIter *iter, gpointer data);
 
 #define DCCHARSET "windows-1252"
 
 #define _(text) gettext(text)
 
-#include "mainwnd.gtk"
-#include "inpdialog.gtk"
-#include "pref.gtk"
-#include "reslist.gtk"
+#include "mainwnd.gtkh"
+#include "inpdialog.gtkh"
+#include "pref.gtkh"
+#include "reslist.gtkh"
 
 void updatewrite(void)
 {
@@ -2684,3 +2642,8 @@ int main(int argc, char **argv)
     gtk_main();
     return(0);
 }
+
+#include "mainwnd.gtk"
+#include "inpdialog.gtk"
+#include "pref.gtk"
+#include "reslist.gtk"

diff --git a/config/util/Makefile.am b/config/util/Makefile.am
index d2830e5..732cdc2 100644 (file)
--- a/config/util/Makefile.am
+++ b/config/util/Makefile.am
@@ -23,6 +23,8 @@ dolconf_CPPFLAGS=     @GTK2_CFLAGS@ \
 dolconf_LDADD=         $(top_srcdir)/common/libcommon.a $(top_srcdir)/lib/libdcui.la
 
 .desc.gtk: $(top_srcdir)/common/makegdesc
-       $(top_srcdir)/common/makegdesc $< >$@
+       target="$@"; \
+       basename="$${target%.gtk}"; \
+       $(top_srcdir)/common/makegdesc -h "$${basename}.gtkh" $< >$@
 
 EXTRA_DIST=dolconf-assistant.desc dolconf-wnd.desc

diff --git a/config/util/dolconf.c b/config/util/dolconf.c
index a637909..1d09c33 100644 (file)
--- a/config/util/dolconf.c
+++ b/config/util/dolconf.c
@@ -58,28 +58,10 @@ GtkListStore *shares;
 int state, dirty = 1;
 int ignoreclose = 0;
 
-void astcancel(GtkWidget *widget, gpointer uudata);
-void astupdate(GtkWidget *widget, GtkWidget *page, gpointer uudata);
-void cb_ast_wnd_apply(GtkWidget *widget, gpointer uudata);
-void cb_ast_nick_changed(GtkWidget *widget, gpointer uudata);
-void cb_ast_shareadd_clicked(GtkWidget *widget, gpointer uudata);
-void cb_ast_sharerem_clicked(GtkWidget *widget, gpointer uudata);
-void cb_ast_checkports(GtkWidget *widget, gpointer uudata);
-void cb_ast_mode_nat_toggled(GtkWidget *widget, gpointer uudata);
-void cb_cfw_mode_act_toggled(GtkWidget *widget, gpointer uudata);
-void cb_cfw_orport_toggled(GtkWidget *widget, gpointer uudata);
-void cb_cfw_oraddr_toggled(GtkWidget *widget, gpointer uudata);
-void cb_cfw_uinet_toggled(GtkWidget *widget, gpointer uudata);
-void cb_cfw_save_activate(GtkWidget *widget, gpointer uudata);
-void cb_cfw_hup_activate(GtkWidget *widget, gpointer uudata);
-void cb_cfw_quit_activate(GtkWidget *widget, gpointer uudata);
-void cb_cfw_shareadd_clicked(GtkWidget *widget, gpointer uudata);
-void cb_cfw_sharerem_clicked(GtkWidget *widget, gpointer uudata);
-
 #define _(text) gettext(text)
 
-#include "dolconf-assistant.gtk"
-#include "dolconf-wnd.gtk"
+#include "dolconf-assistant.gtkh"
+#include "dolconf-wnd.gtkh"
 
 int v_nonempty(const char *val)
 {
@@ -865,3 +847,6 @@ int main(int argc, char **argv)
     }
     return(0);
 }
+
+#include "dolconf-assistant.gtk"
+#include "dolconf-wnd.gtk"