summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2004-07-12 02:40:38 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:56:58 -0500
commitdfeb4dd36f27e33d5b086648eb9647ddc6631115 (patch)
treecfa18c5436233ec341ca19496b20b4a7433e0032
parent805ebe10848316f357553cac516187475989abae (diff)
downloadsamba-dfeb4dd36f27e33d5b086648eb9647ddc6631115.tar.gz
samba-dfeb4dd36f27e33d5b086648eb9647ddc6631115.tar.bz2
samba-dfeb4dd36f27e33d5b086648eb9647ddc6631115.zip
r1456: Rename this parameter to avoid shadowing a badly-named GTK global.
Andrew Bartlett (This used to be commit 39d8949d25793e2602e0ab5ec37e213f9ccae658)
-rw-r--r--source4/gtk/common/gtk-smb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/gtk/common/gtk-smb.c b/source4/gtk/common/gtk-smb.c
index d1c1eaa806..954f3f55be 100644
--- a/source4/gtk/common/gtk-smb.c
+++ b/source4/gtk/common/gtk-smb.c
@@ -280,7 +280,7 @@ const char *gtk_rpc_binding_dialog_get_password(GtkRpcBindingDialog *d)
return gtk_entry_get_text(GTK_ENTRY(d->entry_password));
}
-const char *gtk_rpc_binding_dialog_get_binding(GtkRpcBindingDialog *d, char *pipe)
+const char *gtk_rpc_binding_dialog_get_binding(GtkRpcBindingDialog *d, char *pipe_name)
{
const char *transport;
const char *host;
@@ -295,8 +295,8 @@ const char *gtk_rpc_binding_dialog_get_binding(GtkRpcBindingDialog *d, char *pip
else
transport = "ncacn_np";
- if(pipe != NULL) {
- options = talloc_asprintf(d->mem_ctx, "\\pipe\\%s", pipe);
+ if(pipe_name != NULL) {
+ options = talloc_asprintf(d->mem_ctx, "\\pipe\\%s", pipe_name);
}
if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(d->chk_seal))) {