diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-01-27 07:08:20 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:15 -0500 |
| commit | 759da3b915e2006d4c87b5ace47f399accd9ce91 (patch) | |
| tree | 6bcaf9d4c0e38ef5e975c041d442c4437aa61e5a /source4/gtk/common | |
| parent | 1e42cacf6a8643bd633f631c212d71760852abbc (diff) | |
| download | samba-759da3b915e2006d4c87b5ace47f399accd9ce91.tar.gz samba-759da3b915e2006d4c87b5ace47f399accd9ce91.tar.bz2 samba-759da3b915e2006d4c87b5ace47f399accd9ce91.zip | |
r5037: got rid of all of the TALLOC_DEPRECATED stuff. My apologies for the
large commit. I thought this was worthwhile to get done for
consistency.
(This used to be commit ec32b22ed5ec224f6324f5e069d15e92e38e15c0)
Diffstat (limited to 'source4/gtk/common')
| -rw-r--r-- | source4/gtk/common/gtk-smb.c | 2 | ||||
| -rw-r--r-- | source4/gtk/common/select.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/gtk/common/gtk-smb.c b/source4/gtk/common/gtk-smb.c index 639aa68bac..f42516c854 100644 --- a/source4/gtk/common/gtk-smb.c +++ b/source4/gtk/common/gtk-smb.c @@ -319,7 +319,7 @@ const char *gtk_rpc_binding_dialog_get_host(GtkRpcBindingDialog *d) struct dcerpc_binding *gtk_rpc_binding_dialog_get_binding(GtkRpcBindingDialog *d, TALLOC_CTX *mem_ctx) { - struct dcerpc_binding *binding = talloc_p(mem_ctx, struct dcerpc_binding); + struct dcerpc_binding *binding = talloc(mem_ctx, struct dcerpc_binding); ZERO_STRUCT(binding->object); diff --git a/source4/gtk/common/select.c b/source4/gtk/common/select.c index 1409a625d0..082f449a0c 100644 --- a/source4/gtk/common/select.c +++ b/source4/gtk/common/select.c @@ -142,7 +142,7 @@ GtkWidget *gtk_select_domain_dialog_new (struct dcerpc_pipe *sam_pipe) status = dcerpc_samr_Connect(sam_pipe, mem_ctx, &cr); if (!NT_STATUS_IS_OK(status)) { gtk_show_ntstatus(NULL, status); - talloc_destroy(mem_ctx); + talloc_free(mem_ctx); return GTK_WIDGET(d); } @@ -168,11 +168,11 @@ GtkWidget *gtk_select_domain_dialog_new (struct dcerpc_pipe *sam_pipe) status = dcerpc_samr_Close(sam_pipe, mem_ctx, &dr); if (!NT_STATUS_IS_OK(status)) { gtk_show_ntstatus(NULL, status); - talloc_destroy(mem_ctx); + talloc_free(mem_ctx); return GTK_WIDGET ( d ); } - talloc_destroy(mem_ctx); + talloc_free(mem_ctx); return GTK_WIDGET ( d ); } |