summaryrefslogtreecommitdiff
path: root/source4/gtk
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-05-15 20:16:26 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:16:44 -0500
commit5b18cf22680c76abb1262a6b75a30b8a37899467 (patch)
treeb845941a1bac81eceaba11c7f885735e1ace20e2 /source4/gtk
parent51b0f62b8f0d6350b7706c5b7fd52f856c2756de (diff)
downloadsamba-5b18cf22680c76abb1262a6b75a30b8a37899467.tar.gz
samba-5b18cf22680c76abb1262a6b75a30b8a37899467.tar.bz2
samba-5b18cf22680c76abb1262a6b75a30b8a37899467.zip
r6795: Make some functions static and remove some unused ones.
(This used to be commit 46509eb89980bfe6dabd71264d570ea356ee5a22)
Diffstat (limited to 'source4/gtk')
-rw-r--r--source4/gtk/common/select.c4
-rw-r--r--source4/gtk/tools/gepdump.c4
-rw-r--r--source4/gtk/tools/gregedit.c20
-rw-r--r--source4/gtk/tools/gwcrontab.c34
-rw-r--r--source4/gtk/tools/gwsam.c35
5 files changed, 37 insertions, 60 deletions
diff --git a/source4/gtk/common/select.c b/source4/gtk/common/select.c
index 6149182b80..61b9649657 100644
--- a/source4/gtk/common/select.c
+++ b/source4/gtk/common/select.c
@@ -31,7 +31,7 @@ const char *gtk_select_domain_dialog_get_domain(GtkSelectDomainDialog *d)
return gtk_entry_get_text(GTK_ENTRY(d->entry_domain));
}
-void gtk_select_domain_dialog_init (GtkSelectDomainDialog *select_domain_dialog)
+static void gtk_select_domain_dialog_init (GtkSelectDomainDialog *select_domain_dialog)
{
GtkWidget *dialog_vbox1;
GtkWidget *hbox1;
@@ -184,7 +184,7 @@ const char *gtk_select_host_dialog_get_host (GtkSelectHostDialog *d)
return gtk_entry_get_text(GTK_ENTRY(d->entry_host));
}
-void gtk_select_host_dialog_init (GtkSelectHostDialog *select_host_dialog)
+static void gtk_select_host_dialog_init (GtkSelectHostDialog *select_host_dialog)
{
GtkWidget *dialog_vbox2;
GtkWidget *hbox2;
diff --git a/source4/gtk/tools/gepdump.c b/source4/gtk/tools/gepdump.c
index 33e91e1436..c5c1aa1af6 100644
--- a/source4/gtk/tools/gepdump.c
+++ b/source4/gtk/tools/gepdump.c
@@ -45,8 +45,8 @@ static GtkWidget *mnu_refresh;
TALLOC_CTX *eps_ctx = NULL;
TALLOC_CTX *conn_ctx = NULL;
-struct dcerpc_pipe *epmapper_pipe;
-struct dcerpc_pipe *mgmt_pipe;
+static struct dcerpc_pipe *epmapper_pipe;
+static struct dcerpc_pipe *mgmt_pipe;
static void on_quit1_activate (GtkMenuItem *menuitem, gpointer user_data)
{
diff --git a/source4/gtk/tools/gregedit.c b/source4/gtk/tools/gregedit.c
index 5a9994df9c..9e81b0b86f 100644
--- a/source4/gtk/tools/gregedit.c
+++ b/source4/gtk/tools/gregedit.c
@@ -26,16 +26,16 @@
#include "gtk/common/select.h"
#include "gtk/common/gtk-smb.h"
-GtkTreeStore *store_keys;
-GtkListStore *store_vals;
-GtkWidget *tree_keys;
-GtkWidget *tree_vals;
-GtkWidget *mainwin;
-GtkWidget *mnu_add_key, *mnu_set_value, *mnu_del_key, *mnu_del_value, *mnu_find;
-TALLOC_CTX *mem_ctx; /* FIXME: Split up */
-
-GtkWidget *save;
-GtkWidget *save_as;
+static GtkTreeStore *store_keys;
+static GtkListStore *store_vals;
+static GtkWidget *tree_keys;
+static GtkWidget *tree_vals;
+static GtkWidget *mainwin;
+static GtkWidget *mnu_add_key, *mnu_set_value, *mnu_del_key, *mnu_del_value, *mnu_find;
+static TALLOC_CTX *mem_ctx; /* FIXME: Split up */
+
+static GtkWidget *save;
+static GtkWidget *save_as;
static GtkWidget* create_openfilewin (void);
static GtkWidget* create_savefilewin (void);
struct registry_context *registry = NULL;
diff --git a/source4/gtk/tools/gwcrontab.c b/source4/gtk/tools/gwcrontab.c
index 2a8ee5049e..8cae7279a4 100644
--- a/source4/gtk/tools/gwcrontab.c
+++ b/source4/gtk/tools/gwcrontab.c
@@ -25,14 +25,14 @@
#include "gtk/common/select.h"
#include "gtk/common/gtk-smb.h"
-struct dcerpc_pipe *at_pipe = NULL;
-GtkWidget *mainwin;
-GtkListStore *store_jobs;
-GtkWidget *tasks;
-GtkWidget *entry_cmd;
-GtkWidget *entry_repeat_weekly;
-GtkWidget *entry_repeat_monthly;
-GtkWidget *delete;
+static struct dcerpc_pipe *at_pipe = NULL;
+static GtkWidget *mainwin;
+static GtkListStore *store_jobs;
+static GtkWidget *tasks;
+static GtkWidget *entry_cmd;
+static GtkWidget *entry_repeat_weekly;
+static GtkWidget *entry_repeat_monthly;
+static GtkWidget *delete;
void update_joblist(void)
{
@@ -74,16 +74,13 @@ void update_joblist(void)
gtk_widget_set_sensitive(tasks, TRUE);
}
-static void on_job_select(GtkTreeSelection *sel,
- gpointer data)
+static void on_job_select(GtkTreeSelection *sel, gpointer data)
{
gtk_widget_set_sensitive(delete, gtk_tree_selection_get_selected(sel, NULL, NULL));
}
-static void
-on_connect_activate (GtkMenuItem *menuitem,
- gpointer user_data)
+static void on_connect_activate(GtkMenuItem *menuitem, gpointer user_data)
{
GtkRpcBindingDialog *d;
NTSTATUS status;
@@ -128,9 +125,7 @@ on_connect_activate (GtkMenuItem *menuitem,
update_joblist();
}
-void
-on_quit_activate (GtkMenuItem *menuitem,
- gpointer user_data)
+static void on_quit_activate(GtkMenuItem *menuitem, gpointer user_data)
{
talloc_free(at_pipe);
gtk_main_quit();
@@ -215,17 +210,14 @@ on_delete_activate (GtkMenuItem *menuitem,
}
-void
-on_about_activate (GtkMenuItem *menuitem,
- gpointer user_data)
+static void on_about_activate(GtkMenuItem *menuitem, gpointer user_data)
{
GtkDialog *aboutwin = GTK_DIALOG(create_gtk_samba_about_dialog("gwcrontab"));
gtk_dialog_run(aboutwin);
gtk_widget_destroy(GTK_WIDGET(aboutwin));
}
-GtkWidget*
-create_mainwindow (void)
+static GtkWidget* create_mainwindow (void)
{
GtkWidget *mainwindow;
GtkWidget *vbox;
diff --git a/source4/gtk/tools/gwsam.c b/source4/gtk/tools/gwsam.c
index f712d43ba1..d64f786ef8 100644
--- a/source4/gtk/tools/gwsam.c
+++ b/source4/gtk/tools/gwsam.c
@@ -27,10 +27,10 @@
struct policy_handle sam_handle;
struct dcerpc_pipe *sam_pipe = NULL;
-struct policy_handle domain_handle;
+static struct policy_handle domain_handle;
GtkWidget *mainwin;
GtkWidget *seldomain;
-GtkWidget *mnu_disconnect;
+static GtkWidget *mnu_disconnect;
void update_grouplist(void)
{
@@ -78,16 +78,12 @@ void update_userlist(void)
talloc_free(mem_ctx);
}
-void
-on_new1_activate (GtkMenuItem *menuitem,
- gpointer user_data)
+static void on_new1_activate(GtkMenuItem *menuitem, gpointer user_data)
{
}
-void
-on_select_domain_activate (GtkMenuItem *menuitem,
- gpointer user_data)
+static void on_select_domain_activate(GtkMenuItem *menuitem, gpointer user_data)
{
GtkSelectDomainDialog *d;
gint result;
@@ -192,50 +188,39 @@ static void on_account_activate(GtkMenuItem *menuitem, gpointer user_data)
}
-void
-on_user_rights_activate (GtkMenuItem *menuitem,
- gpointer user_data)
+static void on_user_rights_activate(GtkMenuItem *menuitem, gpointer user_data)
{
//FIXME
}
-void
-on_audit_activate (GtkMenuItem *menuitem,
- gpointer user_data)
+static void on_audit_activate(GtkMenuItem *menuitem, gpointer user_data)
{
//FIXME
}
-void
-on_trust_relations_activate (GtkMenuItem *menuitem,
- gpointer user_data)
+static void on_trust_relations_activate(GtkMenuItem *menuitem, gpointer user_data)
{
//FIXME
}
-void
-on_refresh_activate (GtkMenuItem *menuitem,
- gpointer user_data)
+static void on_refresh_activate(GtkMenuItem *menuitem, gpointer user_data)
{
update_userlist();
update_grouplist();
}
-void
-on_about_activate (GtkMenuItem *menuitem,
- gpointer user_data)
+static void on_about_activate(GtkMenuItem *menuitem, gpointer user_data)
{
GtkDialog *aboutwin = GTK_DIALOG(create_gtk_samba_about_dialog("gwsam"));
gtk_dialog_run(aboutwin);
gtk_widget_destroy(GTK_WIDGET(aboutwin));
}
-GtkWidget*
-create_mainwindow (void)
+static GtkWidget* create_mainwindow (void)
{
GtkWidget *vbox1;
GtkWidget *mnu_connect;