Commit graph

180 commits

Author SHA1 Message Date
Travis Shirk
1360933ba9 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

........
2006-01-01 20:06:26 +00:00
Travis Shirk
a52596266c Merged trunk 2005-12-30 21:37:36 +00:00
Yann Leboulanger
02fc0a86c3 print more dbus errors in verbose mode only 2005-12-26 16:41:22 +00:00
Nikos Kouremenos
e31d031ea3 use else block in notify for failsafe values 2005-12-12 15:15:56 +00:00
Yann Leboulanger
59561d300e when we click on sign in/out notification window, open a chat window 2005-12-12 09:28:36 +00:00
Nikos Kouremenos
c984ef155c use ft_request image. thanks again Grenshad for all icons 2005-12-11 18:40:25 +00:00
Yann Leboulanger
8cc90d1d73 fix DBus TB 2005-12-11 16:58:20 +00:00
Yann Leboulanger
6ed018c93e notify now uses handle_event 2005-12-11 10:32:11 +00:00
Nikos Kouremenos
990a5895c8 clarify comment 2005-12-10 22:45:46 +00:00
Nikos Kouremenos
4ba60d14bf move some lines back to up 2005-12-10 22:44:47 +00:00
Nikos Kouremenos
c914a0d058 only use nice 48x48 img 2005-12-10 22:41:16 +00:00
Nikos Kouremenos
dfe1d78391 add icons for more events 2005-12-10 22:27:41 +00:00
Nikos Kouremenos
d9def4d2a4 [grenshad] add FT-related icons. thank him as artist 2005-12-10 22:00:06 +00:00
Nikos Kouremenos
6e413e7f5a [lorien420] Notification Daemon Popups are now clickable! CONGRAAAAAAATS Andrew Sayman 2005-12-10 00:56:38 +00:00
Yann Leboulanger
612716e2db change copyright from "Gajim Team" to real people 2005-12-09 23:30:28 +00:00
Yann Leboulanger
cae7ce3bac "Gajim Team" in all hearders become "Contributors for this file" 2005-12-09 17:15:30 +00:00
Yann Leboulanger
34255e5682 Vincent left us a long time ago 2005-12-07 23:09:10 +00:00
Nikos Kouremenos
396c61de14 replace tab with space 2005-11-23 17:48:32 +00:00
Nikos Kouremenos
9772eca1c6 remove a commented out line and add a space after comma 2005-11-23 17:47:22 +00:00
Nikos Kouremenos
64f2ef7d0e [lorien420] try to start notif-daemon if not there 2005-11-23 17:44:32 +00:00
Nikos Kouremenos
880da6fb53 revert a commit until better fix is here; notifaction-daemon popups are back! 2005-11-23 00:17:02 +00:00
Nikos Kouremenos
ce6233814d [lorien420] if dbus is there, but notif-daemon is not running, use old style notifications. (I cannot test this as release of notif-daemon is not being listed even if it running). Lorie said devel is ok 2005-11-21 10:36:56 +00:00
Nikos Kouremenos
0a74f2ee61 fix a tb 2005-11-21 07:58:24 +00:00
Nikos Kouremenos
02d102008d 5 seconds as old-style 2005-11-18 15:06:10 +00:00
Nikos Kouremenos
aa80749cdb fix a tb 2005-11-14 13:27:15 +00:00
Nikos Kouremenos
212ec8b91d remove a print 2005-11-13 19:50:22 +00:00
Nikos Kouremenos
571c512832 fix syntax error 2005-11-13 19:42:42 +00:00
Nikos Kouremenos
021afbf906 fix strings for notification-daemon 2005-11-13 19:31:25 +00:00
Nikos Kouremenos
9024cf474e shorter 2005-11-12 17:59:43 +00:00
Nikos Kouremenos
3084820130 commit missing file 2005-11-11 19:12:02 +00:00