diff options
| author | Gerald W. Carter <jerry@samba.org> | 2008-04-17 18:11:22 +0200 |
|---|---|---|
| committer | Gerald W. Carter <jerry@samba.org> | 2008-04-17 18:11:22 +0200 |
| commit | 5c29bc8931d025de4ec91247be04da4388642727 (patch) | |
| tree | 0345ca3ba451dfdbe2f2bb48745299fe306e6d3f /source3/lib/netapi | |
| parent | 20104eef70ea1e2a64acb762ade2b4d64af0ee57 (diff) | |
| parent | d4d706e0fa6ed2c6b8cd1d788257c7bd096a170b (diff) | |
| download | samba-5c29bc8931d025de4ec91247be04da4388642727.tar.gz samba-5c29bc8931d025de4ec91247be04da4388642727.tar.bz2 samba-5c29bc8931d025de4ec91247be04da4388642727.zip | |
Merge commit 'samba/v3-2-test' into wbc-test
(This used to be commit 7c2e735df3d8a4105a4944411d111fc66c13b01f)
Diffstat (limited to 'source3/lib/netapi')
| -rw-r--r-- | source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c | 2 | ||||
| -rw-r--r-- | source3/lib/netapi/netapi.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c b/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c index a7b2079f95..7c84d4d8c6 100644 --- a/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c +++ b/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c @@ -1306,7 +1306,7 @@ static int draw_main_window(struct join_state *state) { /* Label */ label = gtk_label_new("Computer description:"); -/* gtk_misc_set_alignment(GTK_MISC(label), 0, 0); */ + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1); gtk_widget_show(label); diff --git a/source3/lib/netapi/netapi.c b/source3/lib/netapi/netapi.c index 941e323183..944c2c9304 100644 --- a/source3/lib/netapi/netapi.c +++ b/source3/lib/netapi/netapi.c @@ -40,7 +40,7 @@ NET_API_STATUS libnetapi_init(struct libnetapi_ctx **context) return NET_API_STATUS_SUCCESS; } -#ifdef DEVELOPER +#if 0 talloc_enable_leak_report(); #endif frame = talloc_stackframe(); |