Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
gajim
gajim
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 202
    • Issues 202
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 22
    • Merge Requests 22
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Incidents
    • Environments
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • gajim
  • gajimgajim
  • Merge Requests
  • !677

Open
Opened Aug 11, 2020 by eta@eta
  • Report abuse
Report abuse

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch "https://dev.gajim.org/eta/gajim.git" "eta/gotta-go-fast"
git checkout -b "eta/gajim-eta/gotta-go-fast" FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "master"
git merge --no-ff "eta/gajim-eta/gotta-go-fast"

Step 4. Push the result of the merge to GitLab

git push origin "master"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Run GTK main loop in between incoming stanzas

  • Overview 4
  • Commits 1
  • Pipelines 1
  • Changes 1
  • This prevents 30-60 second lockups when starting gajim while the main thread is processing large numbers of incoming stanzas and not yielding to the GTK main loop at all.
  • This is done by explicitly running the main loop after a stanza is received, if there are events pending.

(Empirically, this makes gajim actually usable on my machine, whereas current master is pretty bad lockup-wise after startup/reconnection...)

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: gajim/gajim!677
Source branch: eta/gotta-go-fast