diff options
| author | norrarvid <norrarvid@gmail.com> | 2012-06-18 09:45:42 +0200 |
|---|---|---|
| committer | norrarvid <norrarvid@gmail.com> | 2012-06-18 09:45:42 +0200 |
| commit | e87ec5072169e201c41bfb1ad70f78b549fc2767 (patch) | |
| tree | 3f0accf2afe52678bfdd107db600fd1a86f9511b /xrdp/xrdp_login_wnd.c | |
| parent | d2903cd1fc2f02fd08ea0b55117a3a03e7131504 (diff) | |
| parent | fc49bf6b48878e9514fee3e3c8eb13789aefc71f (diff) | |
| download | xrdp-proprietary-e87ec5072169e201c41bfb1ad70f78b549fc2767.tar.gz xrdp-proprietary-e87ec5072169e201c41bfb1ad70f78b549fc2767.zip | |
fix minor merge conflict
Diffstat (limited to 'xrdp/xrdp_login_wnd.c')
| -rw-r--r-- | xrdp/xrdp_login_wnd.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xrdp/xrdp_login_wnd.c b/xrdp/xrdp_login_wnd.c index 0ea45b0e..d10094a0 100644 --- a/xrdp/xrdp_login_wnd.c +++ b/xrdp/xrdp_login_wnd.c @@ -411,7 +411,9 @@ xrdp_wm_login_fill_in_combo(struct xrdp_wm* self, struct xrdp_bitmap* b) { p = (char*)list_get_item(sections, i); file_read_section(fd, p, section_names, section_values); - if ((g_strncmp(p, "globals", 255) == 0) || (g_strncmp(p,"Logging",255) == 0)) + if ((g_strncmp(p, "globals", 255) == 0) + ||(g_strncmp(p, "channels", 255) == 0) + ||(g_strncmp(p, "Logging", 255) == 0)) { } else |