widelands

Merge lp://staging/~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start into lp://staging/widelands

  1. bug-1797702-spaces-in-names-clean-start
  2. Merge into trunk
Proposed by Toni Förster
Status: Merged
Merged at revision: 9120
Proposed branch: lp://staging/~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start
Merge into: lp://staging/widelands
Prerequisite: lp://staging/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start
Diff against target: 86 lines (+26/-4)
3 files modified
src/network/gamehost.cc (+3/-3)
src/ui_basic/editbox.h (+4/-0)
src/ui_fsmenu/netsetup_lan.cc (+19/-1)
To merge this branch: bzr merge lp://staging/~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start
Reviewer Review Type Date Requested Status
Toni Förster Approve
Review via email: mp+367314@code.staging.launchpad.net

This proposal supersedes a proposal from 2019-05-11.

Commit message

rework netsetup

- allowed characters are limited
- login with empty username not allowed
- if username ist taken append number
- don't join game with empty username

editbox

- added has_warning()

To post a comment you must log in.
Revision history for this message
Toni Förster (stonerl) wrote :

This is the same as this one:

https://code.launchpad.net/~widelands-dev/widelands/bug-1797702-spaces-in-names/+merge/367123

The old one got approved but was merged too early. This is the third patch that needs to go in when the others have been merged

review: Approve
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4948. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/531272166.
Appveyor build 4729. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1797702_spaces_in_names_clean_start-4729.

Revision history for this message
GunChleoc (gunchleoc) wrote :

There is some code duplication that I'd like to see solved.

Revision history for this message
Toni Förster (stonerl) wrote :

Solved :)

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 5034. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/536418869.
Appveyor build 4814. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1797702_spaces_in_names_clean_start-4814.

Revision history for this message
Toni Förster (stonerl) wrote :

Since the parent branch has been merged, this can go in as well.

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: