r3445: made the gtk tooks use minimal includes. This approximately halves the

total include lines in compiling C files in Samba (the .gch file is
now 5M instead of 12M)

This also gets rid of the silly gtk compile warning for non-gtk code
(This used to be commit 8ebd20cf551c8c1fad98ec723d91873fa202b85a)

9 files changed, 34 insertions, 6 deletions

diff --git a/source4/gtk/common/gtk-smb.c b/source4/gtk/common/gtk-smb.c
index 9553827cd0..9806c8903f 100644
--- a/source4/gtk/common/gtk-smb.c
+++ b/source4/gtk/common/gtk-smb.c
@@ -20,7 +20,8 @@
 */
 
 #include "includes.h"
-#include "gtk-smb.h"
+#include "gtk/common/select.h"
+#include "gtk/common/gtk-smb.h"
 
 void gtk_show_werror(GtkWidget *win, WERROR err) 
 {
diff --git a/source4/gtk/common/gtk-smb.h b/source4/gtk/common/gtk-smb.h
index 6e82678c75..90209d671f 100644
--- a/source4/gtk/common/gtk-smb.h
+++ b/source4/gtk/common/gtk-smb.h
@@ -59,4 +59,23 @@ struct _GtkRpcBindingDialogClass
 
 #endif
 
+/* subsystem prototypes */
+GtkWidget *create_gtk_samba_about_dialog (const char *appname);
+void gtk_show_ntstatus(GtkWidget *win, NTSTATUS status);
+GtkWidget *gtk_rpc_binding_dialog_new (BOOL nocredentials, struct sam_pipe *sam_pipe);
+GType gtk_rpc_binding_dialog_get_type (void);
+struct dcerpc_binding *gtk_rpc_binding_dialog_get_binding(GtkRpcBindingDialog *d, TALLOC_CTX *mem_ctx);
+GtkWidget *gtk_select_host_dialog_new (struct sam_pipe *sam_pipe, BOOL nocredentials);
+const char *gtk_select_host_dialog_get_host (GtkSelectHostDialog *d);
+GType gtk_select_host_dialog_get_type (void);
+void gtk_show_werror(GtkWidget *win, WERROR err);
+const char *gtk_rpc_binding_dialog_get_binding_string(GtkRpcBindingDialog *d, TALLOC_CTX *mem_ctx);
+const char *gtk_rpc_binding_dialog_get_username(GtkRpcBindingDialog *d);
+const char *gtk_rpc_binding_dialog_get_password(GtkRpcBindingDialog *d);
+const char *gtk_rpc_binding_dialog_get_host(GtkRpcBindingDialog *d);
+GtkWidget *gtk_select_domain_dialog_new (struct dcerpc_pipe *sam_pipe);
+GType gtk_select_domain_dialog_get_type (void);
+struct policy_handle gtk_select_domain_dialog_get_handle(GtkSelectDomainDialog *d);
+
+
 #endif
diff --git a/source4/gtk/common/select.c b/source4/gtk/common/select.c
index bab21d38fe..d5d0d6cac4 100644
--- a/source4/gtk/common/select.c
+++ b/source4/gtk/common/select.c
@@ -21,7 +21,8 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_samr.h"
-#include "gtk-smb.h"
+#include "gtk/common/select.h"
+#include "gtk/common/gtk-smb.h"
 
 /* GtkSelectDomainDialog */
 
diff --git a/source4/gtk/config.m4 b/source4/gtk/config.m4
index 6be4bf11bc..d4ecd82c42 100644
--- a/source4/gtk/config.m4
+++ b/source4/gtk/config.m4
@@ -16,8 +16,10 @@ if test t$SMB_EXT_LIB_ENABLE_gtk = tYES; then
 	AC_DEFINE(HAVE_GTK, 1, [Whether GTK+ is available])
 fi
 
+SMB_SUBSYSTEM_NOPROTO(GTKSMB)
 SMB_SUBSYSTEM_MK(GTKSMB,gtk/config.mk)
 SMB_BINARY_MK(gregedit,gtk/config.mk)
 SMB_BINARY_MK(gwcrontab,gtk/config.mk)
 SMB_BINARY_MK(gwsam,gtk/config.mk)
 SMB_BINARY_MK(gepdump,gtk/config.mk)
+
diff --git a/source4/gtk/tools/gepdump.c b/source4/gtk/tools/gepdump.c
index c5c378c465..52e6bdad7d 100644
--- a/source4/gtk/tools/gepdump.c
+++ b/source4/gtk/tools/gepdump.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_epmapper.h"
+#include "gtk/common/select.h"
 #include "gtk/common/gtk-smb.h"
 
 /* 
@@ -278,7 +279,7 @@ static GtkWidget* create_mainwindow (void)
 
   gtk_tree_view_append_column(GTK_TREE_VIEW(tree_eps), curcol);
 
-  store_eps = gtk_tree_store_new(2, GTK_TYPE_STRING, GTK_TYPE_STRING);
+  store_eps = gtk_tree_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
   gtk_tree_view_set_model(GTK_TREE_VIEW(tree_eps), GTK_TREE_MODEL(store_eps));
   g_object_unref(store_eps);
   
diff --git a/source4/gtk/tools/gregedit.c b/source4/gtk/tools/gregedit.c
index 0f9689220a..d7a1e44ad1 100644
--- a/source4/gtk/tools/gregedit.c
+++ b/source4/gtk/tools/gregedit.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "gtk/common/select.h"
 #include "gtk/common/gtk-smb.h"
 
 GtkWidget *openfilewin;
diff --git a/source4/gtk/tools/gwcrontab.c b/source4/gtk/tools/gwcrontab.c
index f06b4fcbe8..38e4e11103 100644
--- a/source4/gtk/tools/gwcrontab.c
+++ b/source4/gtk/tools/gwcrontab.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_atsvc.h"
+#include "gtk/common/select.h"
 #include "gtk/common/gtk-smb.h"
 
 struct dcerpc_pipe *at_pipe = NULL;
@@ -79,7 +80,7 @@ static void on_job_select(GtkTreeSelection *sel,
 }
 
 
-void
+static void
 on_connect_activate                    (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
diff --git a/source4/gtk/tools/gwsam.c b/source4/gtk/tools/gwsam.c
index 829d4d50f6..cf8e1d5b5f 100644
--- a/source4/gtk/tools/gwsam.c
+++ b/source4/gtk/tools/gwsam.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_samr.h"
+#include "gtk/common/select.h"
 #include "gtk/common/gtk-smb.h"
 
 struct policy_handle sam_handle;
@@ -157,12 +158,12 @@ static void connect_sam(void)
 
 }
 
-void on_connect_activate (GtkMenuItem *menuitem, gpointer user_data)
+static void on_connect_activate (GtkMenuItem *menuitem, gpointer user_data)
 {
 	connect_sam();
 }
 
-void on_disconnect_activate (GtkMenuItem *menuitem, gpointer user_data)
+static void on_disconnect_activate (GtkMenuItem *menuitem, gpointer user_data)
 {
 	gtk_widget_set_sensitive (mnu_disconnect, FALSE);
 	gtk_window_set_title (GTK_WINDOW (mainwin), "User Manager");
diff --git a/source4/gtk/tools/gwsam_user.c b/source4/gtk/tools/gwsam_user.c
index 0c5c355b10..394324280e 100644
--- a/source4/gtk/tools/gwsam_user.c
+++ b/source4/gtk/tools/gwsam_user.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "gtk/common/select.h"
 #include "gtk/common/gtk-smb.h"