diff options
| author | norrarvid <norrarvid@gmail.com> | 2012-06-18 10:23:09 +0200 |
|---|---|---|
| committer | norrarvid <norrarvid@gmail.com> | 2012-06-18 10:23:09 +0200 |
| commit | 318e09fd470d177dd017e063ce434c9726f28ef7 (patch) | |
| tree | c8c1c4626873a26aed91b32a84edcdc1227f4e76 /xrdp/xrdp_login_wnd.c | |
| parent | e87ec5072169e201c41bfb1ad70f78b549fc2767 (diff) | |
| parent | 42edcbb6c193e5e825e7600a6784bd48fa9bf503 (diff) | |
| download | xrdp-proprietary-318e09fd470d177dd017e063ce434c9726f28ef7.tar.gz xrdp-proprietary-318e09fd470d177dd017e063ce434c9726f28ef7.zip | |
fix merge conflics
Diffstat (limited to 'xrdp/xrdp_login_wnd.c')
| -rw-r--r-- | xrdp/xrdp_login_wnd.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/xrdp/xrdp_login_wnd.c b/xrdp/xrdp_login_wnd.c index d10094a0..69d3721f 100644 --- a/xrdp/xrdp_login_wnd.c +++ b/xrdp/xrdp_login_wnd.c @@ -21,6 +21,7 @@ */ #include "xrdp.h" +#define ACCESS #include "log.h" /*****************************************************************************/ @@ -223,6 +224,10 @@ xrdp_wm_ok_clicked(struct xrdp_bitmap* wnd) xrdp_wm_set_login_mode(wm, 2); } } + else + { + log_message(LOG_LEVEL_ERROR,"Combo is 0 - potential programming error"); + } return 0; } @@ -262,7 +267,7 @@ xrdp_wm_show_edits(struct xrdp_wm* self, struct xrdp_bitmap* combo) if (g_strncmp("ask", value, 3) == 0) { /* label */ - b = xrdp_bitmap_create(70, DEFAULT_EDIT_H, self->screen->bpp, + b = xrdp_bitmap_create(95, DEFAULT_EDIT_H, self->screen->bpp, WND_TYPE_LABEL, self); list_insert_item(self->login_window->child_list, insert_index, (long)b); @@ -303,7 +308,11 @@ xrdp_wm_show_edits(struct xrdp_wm* self, struct xrdp_bitmap* combo) username_set = 1; } } +#ifdef ACCESS + if ((g_strncmp(name, "password", 255) == 0) || (g_strncmp(name, "pampassword", 255) == 0)) +#else if (g_strncmp(name, "password", 255) == 0) +#endif { b->password_char = '*'; if (username_set) |