diff options
| author | Travis Shirk <travis@pobox.com> | 2006-01-01 23:06:26 +0300 |
|---|---|---|
| committer | Travis Shirk <travis@pobox.com> | 2006-01-01 23:06:26 +0300 |
| commit | 1360933ba91a461186487341cca1af5410bb613c (patch) | |
| tree | 63ddbe8291df97f1c4e087659a2f6fb587197ee3 /debian/patches | |
| parent | 6036368b6eb904c9c3493ba11c6d5d0dd3f99fcc (diff) | |
Merged in trunk updates, including meta_contacts
Merged revisions 4951,4962-4969 via svnmerge from
svn://svn.gajim.org/gajim/trunk
........
r4951 | nk | 2005-12-30 16:50:36 -0700 (Fri, 30 Dec 2005) | 1 line
fixes in greek transl
........
r4962 | asterix | 2006-01-01 11:41:04 -0700 (Sun, 01 Jan 2006) | 2 lines
merge meta_contacts branch with trunk. Meta contacts are not in gajim yet, but framework is here. We now use gajim.contacts.many_functions() to handle contacts and groupchat_contacts.
........
r4963 | asterix | 2006-01-01 11:43:24 -0700 (Sun, 01 Jan 2006) | 2 lines
correct contacts file
........
r4964 | asterix | 2006-01-01 11:47:26 -0700 (Sun, 01 Jan 2006) | 2 lines
dict.remove() doesn't exists, it's del dict[]
........
r4965 | asterix | 2006-01-01 11:50:15 -0700 (Sun, 01 Jan 2006) | 2 lines
some missing commits from branch
........
r4966 | asterix | 2006-01-01 11:53:30 -0700 (Sun, 01 Jan 2006) | 2 lines
end of gc_contact.nick -> gc_contact.name
........
r4967 | asterix | 2006-01-01 12:05:59 -0700 (Sun, 01 Jan 2006) | 2 lines
new ACE option: send_sha_in_gc_presence that allow to send sha info in groupchat presences
........
r4968 | asterix | 2006-01-01 12:12:36 -0700 (Sun, 01 Jan 2006) | 2 lines
0.9.1-2 in debian that solve the group bug (commit [4924])
........
r4969 | asterix | 2006-01-01 12:31:13 -0700 (Sun, 01 Jan 2006) | 2 lines
typo
........
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/00_debian-group_bugfix.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/debian/patches/00_debian-group_bugfix.patch b/debian/patches/00_debian-group_bugfix.patch new file mode 100644 index 000000000..0a5ab2190 --- /dev/null +++ b/debian/patches/00_debian-group_bugfix.patch @@ -0,0 +1,13 @@ +Index: src/roster_window.py +=================================================================== +--- src/roster_window.py (revision 4923) ++++ src/roster_window.py (working copy) +@@ -87,6 +87,8 @@ + model = self.tree.get_model() + root = self.get_account_iter(account) + group_iter = model.iter_children(root) ++ # C_NAME column contacts the pango escaped group name ++ name = gtkgui_helpers.escape_for_pango_markup(name) + while group_iter: + group_name = model[group_iter][C_NAME].decode('utf-8') + if name == group_name: |