Merge back [7466], [7467] and [7472] that were overwritten by ad_hoc merge. Fixes (31c3deb8) · Commits · Weblate / gajim · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

gajim
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

31c3deb8

Commit 31c3deb8 authored 18 years ago by jimpp

Downloads
- Patches
- Plain Diff

Merge back [7466], [7467] and [7472] that were overwritten by ad_hoc merge. Fixes

#2200.

parent a6b38b60

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

data/glade/input_dialog.glade 2 additions, 0 deletions

data/glade/input_dialog.glade
data/glade/roster_window.glade 1 addition, 0 deletions

data/glade/roster_window.glade
src/dialogs.py 13 additions, 4 deletions

src/dialogs.py
src/gajim.py 3 additions, 2 deletions

src/gajim.py
src/gtkgui_helpers.py 3 additions, 5 deletions

src/gtkgui_helpers.py
src/roster_window.py 77 additions, 127 deletions

src/roster_window.py

with 99 additions and 138 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment