Index: trunk/scconfig/Rev.h
===================================================================
--- trunk/scconfig/Rev.h	(revision 26715)
+++ trunk/scconfig/Rev.h	(revision 26716)
@@ -1 +1 @@
-static const int myrev = 26299;
+static const int myrev = 26716;
Index: trunk/scconfig/Rev.tab
===================================================================
--- trunk/scconfig/Rev.tab	(revision 26715)
+++ trunk/scconfig/Rev.tab	(revision 26716)
@@ -1,3 +1,4 @@
+26716	configure	gtk: merge lib_gtk_hid into lib_gtk_common
 26299	configuew	hidlib: include the batch HID in hidlib
 26262	configure	order: move wget to lib_wget for reuse, add order plugins
 26253	configure	hidlib: move hidlib-common dialogs from the dialogs plugin to lib_hid_common so other hidlib apps can benefit from them
Index: trunk/scconfig/hooks.c
===================================================================
--- trunk/scconfig/hooks.c	(revision 26715)
+++ trunk/scconfig/hooks.c	(revision 26716)
@@ -630,9 +630,8 @@
 	}
 
 	if (!need_gtklibs) {
-		report("No gtk support available, disabling lib_gtk_*...\n");
+		report("No gtk support available, disabling lib_gtk_common...\n");
 		hook_custom_arg("disable-lib_gtk_common", NULL);
-		hook_custom_arg("disable-lib_gtk_hid", NULL);
 	}
 
 	if (want_xml2) {
Index: trunk/scconfig/plugins.h
===================================================================
--- trunk/scconfig/plugins.h	(revision 26715)
+++ trunk/scconfig/plugins.h	(revision 26716)
@@ -155,7 +155,6 @@
 plugin_dep("hid_gtk2_gl", "lib_gtk_common", 01)
 plugin_dep("hid_gtk2_gl", "lib_hid_gl", 01)
 plugin_dep("hid_gtk3_cairo", "lib_gtk_common", 0)
-plugin_dep("hid_gtk3_cairo", "lib_gtk_hid", 0)
 plugin_dep("hid_lesstif", "lib_hid_common", 0)
 plugin_dep("import_dsn", "lib_compat_help", 0)
 plugin_dep("import_dsn", "lib_gensexpr", 0)
Index: trunk/src_plugins/hid_gtk3_cairo/hid_gtk3_cairo.pup
===================================================================
--- trunk/src_plugins/hid_gtk3_cairo/hid_gtk3_cairo.pup	(revision 26715)
+++ trunk/src_plugins/hid_gtk3_cairo/hid_gtk3_cairo.pup	(revision 26716)
@@ -4,5 +4,4 @@
 $state WIP
 default disable-all
 dep lib_gtk_common
-dep lib_gtk_hid
 autoload 1