Menu
▾
▴
[Gaim-commits] SF.net SVN: gaim: [16396] branches/soc-2006-file-loggers
|
From: <ro...@us...> - 2006-07-02 16:05:50
|
Revision: 16396 Author: roast Date: 2006-07-02 09:02:29 -0700 (Sun, 02 Jul 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16396&view=rev Log Message: ----------- merged with svn trunk. 16338:16395. Modified Paths: -------------- branches/soc-2006-file-loggers/COPYRIGHT branches/soc-2006-file-loggers/ChangeLog branches/soc-2006-file-loggers/configure.ac branches/soc-2006-file-loggers/console/Makefile branches/soc-2006-file-loggers/console/gntblist.c branches/soc-2006-file-loggers/console/gntgaim.c branches/soc-2006-file-loggers/console/gntui.c branches/soc-2006-file-loggers/console/libgnt/gnt.h branches/soc-2006-file-loggers/console/libgnt/gntbox.c branches/soc-2006-file-loggers/console/libgnt/gntbox.h branches/soc-2006-file-loggers/console/libgnt/gntbutton.c branches/soc-2006-file-loggers/console/libgnt/gntcolors.c branches/soc-2006-file-loggers/console/libgnt/gntcolors.h branches/soc-2006-file-loggers/console/libgnt/gntentry.c branches/soc-2006-file-loggers/console/libgnt/gntentry.h branches/soc-2006-file-loggers/console/libgnt/gntkeys.h branches/soc-2006-file-loggers/console/libgnt/gntlabel.c branches/soc-2006-file-loggers/console/libgnt/gntmain.c branches/soc-2006-file-loggers/console/libgnt/gnttree.c branches/soc-2006-file-loggers/console/libgnt/gntwidget.c branches/soc-2006-file-loggers/console/libgnt/gntwidget.h branches/soc-2006-file-loggers/doc/C-HOWTO.dox branches/soc-2006-file-loggers/pixmaps/smileys/default/Makefile.am branches/soc-2006-file-loggers/pixmaps/smileys/default/theme branches/soc-2006-file-loggers/pixmaps/status/default/Makefile.am branches/soc-2006-file-loggers/src/blist.c branches/soc-2006-file-loggers/src/blist.h branches/soc-2006-file-loggers/src/buddyicon.c branches/soc-2006-file-loggers/src/dnssrv.c branches/soc-2006-file-loggers/src/gtkblist.c branches/soc-2006-file-loggers/src/protocols/Makefile.am branches/soc-2006-file-loggers/src/protocols/bonjour/jabber.c branches/soc-2006-file-loggers/src/protocols/bonjour/jabber.h branches/soc-2006-file-loggers/src/protocols/irc/cmds.c branches/soc-2006-file-loggers/src/protocols/irc/irc.h branches/soc-2006-file-loggers/src/protocols/irc/msgs.c branches/soc-2006-file-loggers/src/protocols/irc/parse.c branches/soc-2006-file-loggers/src/protocols/jabber/jabber.c branches/soc-2006-file-loggers/src/protocols/jabber/presence.c branches/soc-2006-file-loggers/src/protocols/msn/dialog.c branches/soc-2006-file-loggers/src/protocols/msn/session.c branches/soc-2006-file-loggers/src/protocols/oscar/family_feedbag.c branches/soc-2006-file-loggers/src/protocols/oscar/family_oservice.c branches/soc-2006-file-loggers/src/protocols/oscar/oscar.c branches/soc-2006-file-loggers/src/protocols/oscar/oscar.h branches/soc-2006-file-loggers/src/protocols/silc/silc.c branches/soc-2006-file-loggers/src/protocols/yahoo/yahoo.c Added Paths: ----------- branches/soc-2006-file-loggers/console/gntconv.c branches/soc-2006-file-loggers/console/gntconv.h branches/soc-2006-file-loggers/console/libgnt/AUTHORS branches/soc-2006-file-loggers/console/libgnt/COPYING branches/soc-2006-file-loggers/console/libgnt/ChangeLog branches/soc-2006-file-loggers/console/libgnt/INSTALL branches/soc-2006-file-loggers/console/libgnt/Makefile.am branches/soc-2006-file-loggers/console/libgnt/NEWS branches/soc-2006-file-loggers/console/libgnt/README branches/soc-2006-file-loggers/console/libgnt/autogen.sh branches/soc-2006-file-loggers/console/libgnt/configure.ac branches/soc-2006-file-loggers/console/libgnt/gnt.pc.in branches/soc-2006-file-loggers/console/libgnt/gnttextview.c branches/soc-2006-file-loggers/console/libgnt/gnttextview.h branches/soc-2006-file-loggers/console/libgnt/test/ branches/soc-2006-file-loggers/console/libgnt/test/Makefile branches/soc-2006-file-loggers/console/libgnt/test/focus.c branches/soc-2006-file-loggers/console/libgnt/test/multiwin.c branches/soc-2006-file-loggers/console/libgnt/test/tv.c branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_0.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_1.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_10.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_11.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_12.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_13.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_14.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_15.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_16.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_17.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_18.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_19.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_2.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_20.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_21.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_22.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_23.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_24.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_25.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_26.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_27.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_28.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_29.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_3.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_30.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_31.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_32.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_33.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_34.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_35.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_36.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_37.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_38.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_39.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_4.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_40.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_41.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_42.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_43.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_44.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_45.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_46.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_47.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_48.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_49.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_5.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_50.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_51.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_52.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_53.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_54.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_55.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_56.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_57.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_58.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_59.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_6.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_60.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_61.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_62.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_63.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_64.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_65.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_66.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_67.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_68.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_69.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_7.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_70.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_71.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_72.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_73.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_74.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_75.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_76.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_77.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_78.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_79.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_8.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_80.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_81.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_82.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_83.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_84.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_85.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_86.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_87.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_88.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_89.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_9.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_90.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_91.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_92.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_93.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_94.gif branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_95.gif branches/soc-2006-file-loggers/pixmaps/status/default/qq.png branches/soc-2006-file-loggers/src/protocols/qq/ branches/soc-2006-file-loggers/src/protocols/qq/Makefile.am branches/soc-2006-file-loggers/src/protocols/qq/Makefile.mingw branches/soc-2006-file-loggers/src/protocols/qq/TODO branches/soc-2006-file-loggers/src/protocols/qq/buddy_info.c branches/soc-2006-file-loggers/src/protocols/qq/buddy_info.h branches/soc-2006-file-loggers/src/protocols/qq/buddy_list.c branches/soc-2006-file-loggers/src/protocols/qq/buddy_list.h branches/soc-2006-file-loggers/src/protocols/qq/buddy_opt.c branches/soc-2006-file-loggers/src/protocols/qq/buddy_opt.h branches/soc-2006-file-loggers/src/protocols/qq/buddy_status.c branches/soc-2006-file-loggers/src/protocols/qq/buddy_status.h branches/soc-2006-file-loggers/src/protocols/qq/char_conv.c branches/soc-2006-file-loggers/src/protocols/qq/char_conv.h branches/soc-2006-file-loggers/src/protocols/qq/crypt.c branches/soc-2006-file-loggers/src/protocols/qq/crypt.h branches/soc-2006-file-loggers/src/protocols/qq/file_trans.c branches/soc-2006-file-loggers/src/protocols/qq/file_trans.h branches/soc-2006-file-loggers/src/protocols/qq/group.c branches/soc-2006-file-loggers/src/protocols/qq/group.h branches/soc-2006-file-loggers/src/protocols/qq/group_admindlg.c branches/soc-2006-file-loggers/src/protocols/qq/group_admindlg.h branches/soc-2006-file-loggers/src/protocols/qq/group_conv.c branches/soc-2006-file-loggers/src/protocols/qq/group_conv.h branches/soc-2006-file-loggers/src/protocols/qq/group_find.c branches/soc-2006-file-loggers/src/protocols/qq/group_find.h branches/soc-2006-file-loggers/src/protocols/qq/group_free.c branches/soc-2006-file-loggers/src/protocols/qq/group_free.h branches/soc-2006-file-loggers/src/protocols/qq/group_hash.c branches/soc-2006-file-loggers/src/protocols/qq/group_hash.h branches/soc-2006-file-loggers/src/protocols/qq/group_im.c branches/soc-2006-file-loggers/src/protocols/qq/group_im.h branches/soc-2006-file-loggers/src/protocols/qq/group_info.c branches/soc-2006-file-loggers/src/protocols/qq/group_info.h branches/soc-2006-file-loggers/src/protocols/qq/group_join.c branches/soc-2006-file-loggers/src/protocols/qq/group_join.h branches/soc-2006-file-loggers/src/protocols/qq/group_misc.c branches/soc-2006-file-loggers/src/protocols/qq/group_misc.h branches/soc-2006-file-loggers/src/protocols/qq/group_network.c branches/soc-2006-file-loggers/src/protocols/qq/group_network.h branches/soc-2006-file-loggers/src/protocols/qq/group_opt.c branches/soc-2006-file-loggers/src/protocols/qq/group_opt.h branches/soc-2006-file-loggers/src/protocols/qq/group_search.c branches/soc-2006-file-loggers/src/protocols/qq/group_search.h branches/soc-2006-file-loggers/src/protocols/qq/header_info.c branches/soc-2006-file-loggers/src/protocols/qq/header_info.h branches/soc-2006-file-loggers/src/protocols/qq/im.c branches/soc-2006-file-loggers/src/protocols/qq/im.h branches/soc-2006-file-loggers/src/protocols/qq/infodlg.c branches/soc-2006-file-loggers/src/protocols/qq/infodlg.h branches/soc-2006-file-loggers/src/protocols/qq/ip_location.c branches/soc-2006-file-loggers/src/protocols/qq/ip_location.h branches/soc-2006-file-loggers/src/protocols/qq/keep_alive.c branches/soc-2006-file-loggers/src/protocols/qq/keep_alive.h branches/soc-2006-file-loggers/src/protocols/qq/login_logout.c branches/soc-2006-file-loggers/src/protocols/qq/login_logout.h branches/soc-2006-file-loggers/src/protocols/qq/packet_parse.c branches/soc-2006-file-loggers/src/protocols/qq/packet_parse.h branches/soc-2006-file-loggers/src/protocols/qq/qq.c branches/soc-2006-file-loggers/src/protocols/qq/qq.h branches/soc-2006-file-loggers/src/protocols/qq/qq_proxy.c branches/soc-2006-file-loggers/src/protocols/qq/qq_proxy.h branches/soc-2006-file-loggers/src/protocols/qq/recv_core.c branches/soc-2006-file-loggers/src/protocols/qq/recv_core.h branches/soc-2006-file-loggers/src/protocols/qq/send_core.c branches/soc-2006-file-loggers/src/protocols/qq/send_core.h branches/soc-2006-file-loggers/src/protocols/qq/send_file.c branches/soc-2006-file-loggers/src/protocols/qq/send_file.h branches/soc-2006-file-loggers/src/protocols/qq/sendqueue.c branches/soc-2006-file-loggers/src/protocols/qq/sendqueue.h branches/soc-2006-file-loggers/src/protocols/qq/show.c branches/soc-2006-file-loggers/src/protocols/qq/show.h branches/soc-2006-file-loggers/src/protocols/qq/sys_msg.c branches/soc-2006-file-loggers/src/protocols/qq/sys_msg.h branches/soc-2006-file-loggers/src/protocols/qq/udp_proxy_s5.c branches/soc-2006-file-loggers/src/protocols/qq/udp_proxy_s5.h branches/soc-2006-file-loggers/src/protocols/qq/utils.c branches/soc-2006-file-loggers/src/protocols/qq/utils.h Removed Paths: ------------- branches/soc-2006-file-loggers/console/libgnt/Makefile branches/soc-2006-file-loggers/console/libgnt/test/Makefile branches/soc-2006-file-loggers/console/libgnt/test/focus.c branches/soc-2006-file-loggers/console/libgnt/test/multiwin.c branches/soc-2006-file-loggers/console/libgnt/test/tv.c branches/soc-2006-file-loggers/src/protocols/qq/Makefile.am branches/soc-2006-file-loggers/src/protocols/qq/Makefile.mingw branches/soc-2006-file-loggers/src/protocols/qq/TODO branches/soc-2006-file-loggers/src/protocols/qq/buddy_info.c branches/soc-2006-file-loggers/src/protocols/qq/buddy_info.h branches/soc-2006-file-loggers/src/protocols/qq/buddy_list.c branches/soc-2006-file-loggers/src/protocols/qq/buddy_list.h branches/soc-2006-file-loggers/src/protocols/qq/buddy_opt.c branches/soc-2006-file-loggers/src/protocols/qq/buddy_opt.h branches/soc-2006-file-loggers/src/protocols/qq/buddy_status.c branches/soc-2006-file-loggers/src/protocols/qq/buddy_status.h branches/soc-2006-file-loggers/src/protocols/qq/char_conv.c branches/soc-2006-file-loggers/src/protocols/qq/char_conv.h branches/soc-2006-file-loggers/src/protocols/qq/crypt.c branches/soc-2006-file-loggers/src/protocols/qq/crypt.h branches/soc-2006-file-loggers/src/protocols/qq/file_trans.c branches/soc-2006-file-loggers/src/protocols/qq/file_trans.h branches/soc-2006-file-loggers/src/protocols/qq/group.c branches/soc-2006-file-loggers/src/protocols/qq/group.h branches/soc-2006-file-loggers/src/protocols/qq/group_admindlg.c branches/soc-2006-file-loggers/src/protocols/qq/group_admindlg.h branches/soc-2006-file-loggers/src/protocols/qq/group_conv.c branches/soc-2006-file-loggers/src/protocols/qq/group_conv.h branches/soc-2006-file-loggers/src/protocols/qq/group_find.c branches/soc-2006-file-loggers/src/protocols/qq/group_find.h branches/soc-2006-file-loggers/src/protocols/qq/group_free.c branches/soc-2006-file-loggers/src/protocols/qq/group_free.h branches/soc-2006-file-loggers/src/protocols/qq/group_hash.c branches/soc-2006-file-loggers/src/protocols/qq/group_hash.h branches/soc-2006-file-loggers/src/protocols/qq/group_im.c branches/soc-2006-file-loggers/src/protocols/qq/group_im.h branches/soc-2006-file-loggers/src/protocols/qq/group_info.c branches/soc-2006-file-loggers/src/protocols/qq/group_info.h branches/soc-2006-file-loggers/src/protocols/qq/group_join.c branches/soc-2006-file-loggers/src/protocols/qq/group_join.h branches/soc-2006-file-loggers/src/protocols/qq/group_misc.c branches/soc-2006-file-loggers/src/protocols/qq/group_misc.h branches/soc-2006-file-loggers/src/protocols/qq/group_network.c branches/soc-2006-file-loggers/src/protocols/qq/group_network.h branches/soc-2006-file-loggers/src/protocols/qq/group_opt.c branches/soc-2006-file-loggers/src/protocols/qq/group_opt.h branches/soc-2006-file-loggers/src/protocols/qq/group_search.c branches/soc-2006-file-loggers/src/protocols/qq/group_search.h branches/soc-2006-file-loggers/src/protocols/qq/header_info.c branches/soc-2006-file-loggers/src/protocols/qq/header_info.h branches/soc-2006-file-loggers/src/protocols/qq/im.c branches/soc-2006-file-loggers/src/protocols/qq/im.h branches/soc-2006-file-loggers/src/protocols/qq/infodlg.c branches/soc-2006-file-loggers/src/protocols/qq/infodlg.h branches/soc-2006-file-loggers/src/protocols/qq/ip_location.c branches/soc-2006-file-loggers/src/protocols/qq/ip_location.h branches/soc-2006-file-loggers/src/protocols/qq/keep_alive.c branches/soc-2006-file-loggers/src/protocols/qq/keep_alive.h branches/soc-2006-file-loggers/src/protocols/qq/login_logout.c branches/soc-2006-file-loggers/src/protocols/qq/login_logout.h branches/soc-2006-file-loggers/src/protocols/qq/packet_parse.c branches/soc-2006-file-loggers/src/protocols/qq/packet_parse.h branches/soc-2006-file-loggers/src/protocols/qq/qq.c branches/soc-2006-file-loggers/src/protocols/qq/qq.h branches/soc-2006-file-loggers/src/protocols/qq/qq_proxy.c branches/soc-2006-file-loggers/src/protocols/qq/qq_proxy.h branches/soc-2006-file-loggers/src/protocols/qq/recv_core.c branches/soc-2006-file-loggers/src/protocols/qq/recv_core.h branches/soc-2006-file-loggers/src/protocols/qq/send_core.c branches/soc-2006-file-loggers/src/protocols/qq/send_core.h branches/soc-2006-file-loggers/src/protocols/qq/send_file.c branches/soc-2006-file-loggers/src/protocols/qq/send_file.h branches/soc-2006-file-loggers/src/protocols/qq/sendqueue.c branches/soc-2006-file-loggers/src/protocols/qq/sendqueue.h branches/soc-2006-file-loggers/src/protocols/qq/show.c branches/soc-2006-file-loggers/src/protocols/qq/show.h branches/soc-2006-file-loggers/src/protocols/qq/sys_msg.c branches/soc-2006-file-loggers/src/protocols/qq/sys_msg.h branches/soc-2006-file-loggers/src/protocols/qq/udp_proxy_s5.c branches/soc-2006-file-loggers/src/protocols/qq/udp_proxy_s5.h branches/soc-2006-file-loggers/src/protocols/qq/utils.c branches/soc-2006-file-loggers/src/protocols/qq/utils.h Modified: branches/soc-2006-file-loggers/COPYRIGHT =================================================================== --- branches/soc-2006-file-loggers/COPYRIGHT 2006-07-02 15:49:54 UTC (rev 16395) +++ branches/soc-2006-file-loggers/COPYRIGHT 2006-07-02 16:02:29 UTC (rev 16396) @@ -59,6 +59,7 @@ Eoin Coffey Jason Cohen Todd Cohen +Jono Cole Nathan Conrad Felipe Contreras Alex Converse @@ -302,6 +303,7 @@ Wan Hing Wah Philip Walford Nathan Walp +Jonty Wareing Eric Warmenhoven Adam J. Warrington Andrew Wellington Modified: branches/soc-2006-file-loggers/ChangeLog =================================================================== --- branches/soc-2006-file-loggers/ChangeLog 2006-07-02 15:49:54 UTC (rev 16395) +++ branches/soc-2006-file-loggers/ChangeLog 2006-07-02 16:02:29 UTC (rev 16396) @@ -130,6 +130,7 @@ channel or change your nick * Added /nickserv, /memoserv, /chanserv and /operserv commands (Joao Luís Marques Pinto) + * Added CTCP VERSION via /version (Andrej Krivulčík) Jabber Features: * Support for SRV lookups Modified: branches/soc-2006-file-loggers/configure.ac =================================================================== --- branches/soc-2006-file-loggers/configure.ac 2006-07-02 15:49:54 UTC (rev 16395) +++ branches/soc-2006-file-loggers/configure.ac 2006-07-02 16:02:29 UTC (rev 16396) @@ -401,7 +401,7 @@ fi if test "x$STATIC_PRPLS" = "xall" ; then - STATIC_PRPLS="bonjour gg irc jabber msn novell oscar sametime silc simple yahoo zephyr" + STATIC_PRPLS="bonjour gg irc jabber msn novell oscar qq sametime silc simple yahoo zephyr" fi if test "x$have_meanwhile" != "xyes" ; then STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'` @@ -436,6 +436,7 @@ msn) static_msn=yes ;; novell) static_novell=yes ;; oscar) static_oscar=yes ;; + qq) static_qq=yes ;; sametime) static_sametime=yes ;; silc) static_silc=yes ;; simple) static_simple=yes ;; @@ -452,6 +453,7 @@ AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes") AM_CONDITIONAL(STATIC_NOVELL, test "x$static_novell" = "xyes") AM_CONDITIONAL(STATIC_OSCAR, test "x$static_oscar" = "xyes") +AM_CONDITIONAL(STATIC_QQ, test "x$static_qq" = "xyes") AM_CONDITIONAL(STATIC_SAMETIME, test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes") AM_CONDITIONAL(STATIC_SILC, test "x$static_silc" = "xyes" -a "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes") AM_CONDITIONAL(STATIC_SIMPLE, test "x$static_simple" = "xyes") @@ -464,7 +466,7 @@ AC_ARG_WITH(dynamic_prpls, [AC_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`]) if test "x$DYNAMIC_PRPLS" = "xall" ; then - DYNAMIC_PRPLS="bonjour gg irc jabber msn novell oscar sametime silc simple yahoo zephyr" + DYNAMIC_PRPLS="bonjour gg irc jabber msn novell oscar qq sametime silc simple yahoo zephyr" fi if test "x$have_meanwhile" != "xyes"; then DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'` @@ -488,6 +490,7 @@ msn) dynamic_msn=yes ;; novell) dynamic_novell=yes ;; oscar) dynamic_oscar=yes ;; + qq) dynamic_qq=yes ;; sametime) dynamic_sametime=yes ;; silc) dynamic_silc=yes ;; simple) dynamic_simple=yes ;; @@ -504,6 +507,7 @@ AM_CONDITIONAL(DYNAMIC_MSN, test "x$dynamic_msn" = "xyes") AM_CONDITIONAL(DYNAMIC_NOVELL, test "x$dynamic_novell" = "xyes") AM_CONDITIONAL(DYNAMIC_OSCAR, test "x$dynamic_oscar" = "xyes") +AM_CONDITIONAL(DYNAMIC_QQ, test "x$dynamic_qq" = "xyes") AM_CONDITIONAL(DYNAMIC_SAMETIME, test "x$dynamic_sametime" = "xyes" -a "x$have_meanwhile" = "xyes") AM_CONDITIONAL(DYNAMIC_SILC, test "x$dynamic_silc" = "xyes" -a "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes") AM_CONDITIONAL(DYNAMIC_SIMPLE, test "x$dynamic_simple" = "xyes") @@ -1772,6 +1776,7 @@ src/protocols/napster/Makefile src/protocols/novell/Makefile src/protocols/oscar/Makefile + src/protocols/qq/Makefile src/protocols/sametime/Makefile src/protocols/silc/Makefile src/protocols/simple/Makefile Modified: branches/soc-2006-file-loggers/console/Makefile =================================================================== --- branches/soc-2006-file-loggers/console/Makefile 2006-07-02 15:49:54 UTC (rev 16395) +++ branches/soc-2006-file-loggers/console/Makefile 2006-07-02 16:02:29 UTC (rev 16396) @@ -1,30 +1,32 @@ -CFLAGS=`pkg-config --cflags gaim gobject-2.0` -g -I./libgnt/ -LDFLAGS=`pkg-config --libs gaim gobject-2.0 libxml-2.0` -lncursesw -L./libgnt/ -lgnt -pg +CC=gcc +CFLAGS=`pkg-config --cflags gaim gobject-2.0 gnt` -g -Wall +LDFLAGS=`pkg-config --libs gaim gobject-2.0 libxml-2.0 gnt` -pg GG_SOURCES = \ gntblist.c \ + gntconv.c \ gntui.c GG_HEADERS = \ gntblist.h \ + gntconv.h \ gntui.h GG_OBJECTS = \ gntblist.o \ + gntconv.o \ gntui.o -all: - cd libgnt && make - make gntgaim +all: gntgaim gntgaim: gntgaim.o $(GG_OBJECTS) $(CC) -o gntgaim gntgaim.o $(GG_OBJECTS) $(LDFLAGS) gntblist.o: gntblist.c $(GG_HEADERS) +gntconv.o: gntconv.c $(GG_HEADERS) gntgaim.o: gntgaim.c gntgaim.h $(GG_HEADERS) gntui.o: gntui.c $(GG_HEADERS) clean: - cd libgnt && make clean - rm *.o - rm gntgaim + rm -f *.o + rm -f gntgaim Modified: branches/soc-2006-file-loggers/console/gntblist.c =================================================================== --- branches/soc-2006-file-loggers/console/gntblist.c 2006-07-02 15:49:54 UTC (rev 16395) +++ branches/soc-2006-file-loggers/console/gntblist.c 2006-07-02 16:02:29 UTC (rev 16396) @@ -1,11 +1,12 @@ -#include <gaim/account.h> -#include <gaim/blist.h> +#include <account.h> +#include <blist.h> +#include <server.h> #include <signal.h> -#include <gaim/util.h> -#include <gaim/server.h> +#include <util.h> #include "gntgaim.h" #include "gntbox.h" +#include "gntlabel.h" #include "gnttree.h" #include "gntblist.h" @@ -24,6 +25,7 @@ static void add_buddy(GaimBuddy *buddy, GGBlist *ggblist); static void add_group(GaimGroup *group, GGBlist *ggblist); +static void add_chat(GaimChat *chat, GGBlist *ggblist); static void add_node(GaimBlistNode *node, GGBlist *ggblist); static void draw_tooltip(GGBlist *ggblist); @@ -38,6 +40,8 @@ add_buddy((GaimBuddy*)node, ggblist); else if (GAIM_BLIST_NODE_IS_GROUP(node)) add_group((GaimGroup*)node, ggblist); + else if (GAIM_BLIST_NODE_IS_CHAT(node)) + add_chat((GaimChat *)node, ggblist); draw_tooltip(ggblist); } @@ -81,6 +85,10 @@ else node_remove(gaim_get_blist(), node); } + else if (GAIM_BLIST_NODE_IS_CHAT(node)) + { + add_chat((GaimChat *)node, list->ui_data); + } } static void @@ -121,52 +129,82 @@ } static const char * -get_buddy_display_name(GaimBuddy *buddy) +get_display_name(GaimBlistNode *node) { static char text[2096]; - char status[8]; - GaimStatusPrimitive prim; - GaimPresence *presence; - GaimStatus *now; + char status[8] = " "; + const char *name = NULL; - presence = gaim_buddy_get_presence(buddy); - now = gaim_presence_get_active_status(presence); + if (GAIM_BLIST_NODE_IS_BUDDY(node)) + { + GaimBuddy *buddy = (GaimBuddy *)node; + GaimStatusPrimitive prim; + GaimPresence *presence; + GaimStatus *now; - prim = gaim_status_type_get_primitive(gaim_status_get_type(now)); + + presence = gaim_buddy_get_presence(buddy); + now = gaim_presence_get_active_status(presence); - switch(prim) - { + prim = gaim_status_type_get_primitive(gaim_status_get_type(now)); + + switch(prim) + { #if 1 - case GAIM_STATUS_OFFLINE: - strncpy(status, "x", sizeof(status) - 1); - break; - case GAIM_STATUS_AVAILABLE: - strncpy(status, "o", sizeof(status) - 1); - break; - default: - strncpy(status, ".", sizeof(status) - 1); - break; + case GAIM_STATUS_OFFLINE: + strncpy(status, "x", sizeof(status) - 1); + break; + case GAIM_STATUS_AVAILABLE: + strncpy(status, "o", sizeof(status) - 1); + break; + default: + strncpy(status, ".", sizeof(status) - 1); + break; #else - /* XXX: Let's use these some time */ - case GAIM_STATUS_OFFLINE: - strncpy(status, "⊗", sizeof(status) - 1); - break; - case GAIM_STATUS_AVAILABLE: - /* XXX: Detect idleness */ - strncpy(status, "◯", sizeof(status) - 1); - break; - default: - strncpy(status, "⊖", sizeof(status) - 1); - break; + /* XXX: Let's use these some time */ + case GAIM_STATUS_OFFLINE: + strncpy(status, "⊗", sizeof(status) - 1); + break; + case GAIM_STATUS_AVAILABLE: + /* XXX: Detect idleness */ + strncpy(status, "◯", sizeof(status) - 1); + break; + default: + strncpy(status, "⊖", sizeof(status) - 1); + break; #endif + } + name = gaim_buddy_get_alias(buddy); } + else if (GAIM_BLIST_NODE_IS_CHAT(node)) + { + GaimChat *chat = (GaimChat*)node; + name = gaim_chat_get_name(chat); - snprintf(text, sizeof(text) - 1, "%s %s", status, gaim_buddy_get_alias(buddy)); + strncpy(status, "~", sizeof(status) - 1); + } + snprintf(text, sizeof(text) - 1, "%s %s", status, name); + return text; } static void +add_chat(GaimChat *chat, GGBlist *ggblist) +{ + GaimGroup *group; + GaimBlistNode *node = (GaimBlistNode *)chat; + if (node->ui_data) + return; + + group = gaim_chat_get_group(chat); + add_node((GaimBlistNode*)group, ggblist); + + node->ui_data = gnt_tree_add_row_after(GNT_TREE(ggblist->tree), chat, + get_display_name(node), group, NULL); +} + +static void add_buddy(GaimBuddy *buddy, GGBlist *ggblist) { GaimGroup *group; @@ -178,9 +216,10 @@ add_node((GaimBlistNode*)group, ggblist); node->ui_data = gnt_tree_add_row_after(GNT_TREE(ggblist->tree), buddy, - get_buddy_display_name(buddy), group, NULL); + get_display_name(node), group, NULL); } +#if 0 static void buddy_signed_on(GaimBuddy *buddy, GGBlist *ggblist) { @@ -192,6 +231,7 @@ { node_remove(gaim_get_blist(), (GaimBlistNode*)buddy); } +#endif GaimBlistUiOps *gg_blist_get_ui_ops() { @@ -201,7 +241,21 @@ static void selection_activate(GntWidget *widget, GGBlist *ggblist) { - gnt_widget_set_focus(widget, FALSE); + GntTree *tree = GNT_TREE(ggblist->tree); + GaimBlistNode *node = gnt_tree_get_selection_data(tree); + + if (GAIM_BLIST_NODE_IS_BUDDY(node)) + { + GaimBuddy *buddy = (GaimBuddy *)node; + gaim_conversation_new(GAIM_CONV_TYPE_IM, + gaim_buddy_get_account(buddy), + gaim_buddy_get_name(buddy)); + } + else if (GAIM_BLIST_NODE_IS_CHAT(node)) + { + GaimChat *chat = (GaimChat*)node; + serv_join_chat(chat->account->gc, chat->components); + } } static void @@ -214,12 +268,15 @@ GaimPluginProtocolInfo *prpl_info; GaimAccount *account; GntTree *tree; - GntWidget *widget, *box, *label; + GntWidget *widget, *box; char *title = NULL; widget = ggblist->tree; tree = GNT_TREE(widget); + if (!gnt_widget_has_focus(ggblist->tree)) + return; + if (ggblist->tooltip) { /* XXX: Once we can properly redraw on expose events, this can be removed at the end @@ -268,6 +325,15 @@ title = g_strdup(group->name); } + else if (GAIM_BLIST_NODE_IS_CHAT(node)) + { + GaimChat *chat = (GaimChat *)node; + GaimAccount *account = chat->account; + + g_string_append_printf(str, _("Account: %s"), gaim_account_get_username(account)); + + title = g_strdup(gaim_chat_get_name(chat)); + } else { g_string_free(str, TRUE); @@ -286,7 +352,7 @@ GNT_WIDGET_SET_FLAGS(box, GNT_WIDGET_NO_SHADOW); gnt_box_set_title(GNT_BOX(box), title); - gnt_box_add_widget(GNT_BOX(box), GNT_WIDGET(gnt_label_new(str->str))); + gnt_box_add_widget(GNT_BOX(box), gnt_label_new(str->str)); gnt_widget_set_position(box, x, y); gnt_widget_draw(box); @@ -319,13 +385,14 @@ return TRUE; } } + return FALSE; } static void buddy_status_changed(GaimBuddy *buddy, GaimStatus *old, GaimStatus *now, GGBlist *ggblist) { - gnt_tree_change_text(GNT_TREE(ggblist->tree), buddy, get_buddy_display_name(buddy)); + gnt_tree_change_text(GNT_TREE(ggblist->tree), buddy, get_display_name((GaimBlistNode*)buddy)); if (ggblist->tnode == (GaimBlistNode*)buddy) draw_tooltip(ggblist); } @@ -344,7 +411,7 @@ ggblist->tree = gnt_tree_new(); GNT_WIDGET_SET_FLAGS(ggblist->tree, GNT_WIDGET_NO_BORDER); - gnt_widget_set_size(ggblist->tree, 25, getmaxy(stdscr) - 2); + gnt_widget_set_size(ggblist->tree, 25, getmaxy(stdscr) - 3); gnt_box_add_widget(GNT_BOX(ggblist->window), ggblist->tree); gnt_widget_show(ggblist->window); Copied: branches/soc-2006-file-loggers/console/gntconv.c (from rev 16395, trunk/console/gntconv.c) =================================================================== --- branches/soc-2006-file-loggers/console/gntconv.c (rev 0) +++ branches/soc-2006-file-loggers/console/gntconv.c 2006-07-02 16:02:29 UTC (rev 16396) @@ -0,0 +1,263 @@ +#include <string.h> +#include <util.h> + +#include "gntgaim.h" +#include "gntconv.h" + +#include "gnt.h" +#include "gntbox.h" +#include "gntentry.h" +#include "gnttextview.h" + +GHashTable *ggconvs; + +typedef struct _GGConv GGConv; +typedef struct _GGConvChat GGConvChat; +typedef struct _GGConvIm GGConvIm; + +struct _GGConv +{ + GaimConversation *conv; + + GntWidget *window; /* the container */ + GntWidget *entry; /* entry */ + GntWidget *tv; /* text-view */ + + union + { + GGConvChat *chat; + GGConvIm *im; + } u; +}; + +struct _GGConvChat +{ + GntWidget *userlist; /* the userlist */ +}; + +struct _GGConvIm +{ + void *nothing_for_now; +}; + +static gboolean +entry_key_pressed(GntWidget *w, const char *key, GGConv *ggconv) +{ + if (key[0] == '\r' && key[1] == 0) + { + const char *text = gnt_entry_get_text(GNT_ENTRY(ggconv->entry)); + switch (gaim_conversation_get_type(ggconv->conv)) + { + case GAIM_CONV_TYPE_IM: + gaim_conv_im_send_with_flags(GAIM_CONV_IM(ggconv->conv), text, GAIM_MESSAGE_SEND); + break; + case GAIM_CONV_TYPE_CHAT: + gaim_conv_chat_send(GAIM_CONV_CHAT(ggconv->conv), text); + break; + default: + g_return_val_if_reached(FALSE); + } + gnt_entry_clear(GNT_ENTRY(ggconv->entry)); + return TRUE; + } + else if (key[0] == 27) + { + if (strcmp(key+1, GNT_KEY_DOWN) == 0) + gnt_text_view_scroll(GNT_TEXT_VIEW(ggconv->tv), 1); + else if (strcmp(key+1, GNT_KEY_UP) == 0) + gnt_text_view_scroll(GNT_TEXT_VIEW(ggconv->tv), -1); + else if (strcmp(key+1, GNT_KEY_PGDOWN) == 0) + gnt_text_view_scroll(GNT_TEXT_VIEW(ggconv->tv), ggconv->tv->priv.height - 2); + else if (strcmp(key+1, GNT_KEY_PGUP) == 0) + gnt_text_view_scroll(GNT_TEXT_VIEW(ggconv->tv), -(ggconv->tv->priv.height - 2)); + else + return FALSE; + return TRUE; + } + + return FALSE; +} + +static void +closing_window(GntWidget *window, GGConv *ggconv) +{ + ggconv->window = NULL; + gaim_conversation_destroy(ggconv->conv); +} + +static void +gg_create_conversation(GaimConversation *conv) +{ + GGConv *ggc = g_hash_table_lookup(ggconvs, conv); + char *title; + GaimConversationType type; + + if (ggc) + return; + + ggc = g_new0(GGConv, 1); + g_hash_table_insert(ggconvs, conv, ggc); + + ggc->conv = conv; + + type = gaim_conversation_get_type(conv); + title = g_strdup_printf(_("%s"), gaim_conversation_get_name(conv)); + ggc->window = gnt_box_new(FALSE, TRUE); + gnt_box_set_title(GNT_BOX(ggc->window), title); + gnt_box_set_toplevel(GNT_BOX(ggc->window), TRUE); + gnt_widget_set_name(ggc->window, title); + + ggc->tv = gnt_text_view_new(); + gnt_box_add_widget(GNT_BOX(ggc->window), ggc->tv); + gnt_widget_set_name(ggc->tv, "conversation-window-textview"); + gnt_widget_set_size(ggc->tv, getmaxx(stdscr) - 40, getmaxy(stdscr) - 15); + + ggc->entry = gnt_entry_new(NULL); + gnt_box_add_widget(GNT_BOX(ggc->window), ggc->entry); + gnt_widget_set_name(ggc->entry, "conversation-window-entry"); + gnt_widget_set_size(ggc->entry, getmaxx(stdscr) - 40, 1); + + g_signal_connect(G_OBJECT(ggc->entry), "key_pressed", G_CALLBACK(entry_key_pressed), ggc); + g_signal_connect(G_OBJECT(ggc->window), "destroy", G_CALLBACK(closing_window), ggc); + + gnt_widget_set_position(ggc->window, 32, 0); + gnt_widget_show(ggc->window); + + g_free(title); +} + +static void +gg_destroy_conversation(GaimConversation *conv) +{ + g_hash_table_remove(ggconvs, conv); +} + +static void +gg_write_common(GaimConversation *conv, const char *who, const char *message, + GaimMessageFlags flags, time_t mtime) +{ + GGConv *ggconv = g_hash_table_lookup(ggconvs, conv); + char *strip; + GntTextViewFlags fl = 0; + + g_return_if_fail(ggconv != NULL); + + if (who && *who && (flags & (GAIM_MESSAGE_SEND | GAIM_MESSAGE_RECV))) + { + char * name = g_strdup_printf("%s: ", who); + gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv), + name, GNT_TEXT_FLAG_BOLD); + g_free(name); + } + else + fl = GNT_TEXT_FLAG_DIM; + + if (flags & GAIM_MESSAGE_ERROR) + fl |= GNT_TEXT_FLAG_BOLD; + if (flags & GAIM_MESSAGE_NICK) + fl |= GNT_TEXT_FLAG_UNDERLINE; + + strip = gaim_markup_strip_html(message); + gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv), + strip, fl); + gnt_text_view_next_line(GNT_TEXT_VIEW(ggconv->tv)); + gnt_text_view_scroll(GNT_TEXT_VIEW(ggconv->tv), 0); + + g_free(strip); + + gnt_widget_set_urgent(ggconv->tv); +} + +static void +gg_write_chat(GaimConversation *conv, const char *who, const char *message, + GaimMessageFlags flags, time_t mtime) +{ + gg_write_common(conv, who, message, flags, mtime); +} + +static void +gg_write_im(GaimConversation *conv, const char *who, const char *message, + GaimMessageFlags flags, time_t mtime) +{ + if (flags & GAIM_MESSAGE_SEND) + { + who = gaim_connection_get_display_name(conv->account->gc); + if (!who) + who = gaim_account_get_alias(conv->account); + if (!who) + who = gaim_account_get_username(conv->account); + } + else if (flags & GAIM_MESSAGE_RECV) + who = gaim_conversation_get_name(conv); + + gg_write_common(conv, who, message, flags, mtime); +} + +static void +gg_write_conv(GaimConversation *conv, const char *who, const char *alias, + const char *message, GaimMessageFlags flags, time_t mtime) +{ + const char *name; + if (alias && *alias) + name = alias; + else if (who && *who) + name = who; + else + name = NULL; + + gg_write_common(conv, name, message, flags, mtime); +} + +static void +gg_chat_add_users(GaimConversation *conv, GList *users, GList *flags, GList *aliases, gboolean new_arrivals) +{} + +static void +gg_chat_rename_user(GaimConversation *conv, const char *old, const char *new_n, const char *new_a) +{} + +static void +gg_chat_remove_user(GaimConversation *conv, GList *list) +{} + +static void +gg_chat_update_user(GaimConversation *conv, const char *user) +{} + +static GaimConversationUiOps conv_ui_ops = +{ + .create_conversation = gg_create_conversation, + .destroy_conversation = gg_destroy_conversation, + .write_chat = gg_write_chat, + .write_im = gg_write_im, + .write_conv = gg_write_conv, + .chat_add_users = gg_chat_add_users, + .chat_rename_user = gg_chat_rename_user, + .chat_remove_users = gg_chat_remove_user, + .chat_update_user = gg_chat_update_user, + .present = NULL, + .has_focus = NULL, + .custom_smiley_add = NULL, + .custom_smiley_write = NULL, + .custom_smiley_close = NULL +}; + +static void +destroy_ggconv(gpointer data) +{ + GGConv *conv = data; + gnt_widget_destroy(conv->window); + g_free(conv); +} + +GaimConversationUiOps *gg_conv_get_ui_ops() +{ + return &conv_ui_ops; +} + + +void gg_conversation_init() +{ + ggconvs = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, destroy_ggconv); +} + Copied: branches/soc-2006-file-loggers/console/gntconv.h (from rev 16395, trunk/console/gntconv.h) =================================================================== --- branches/soc-2006-file-loggers/console/gntconv.h (rev 0) +++ branches/soc-2006-file-loggers/console/gntconv.h 2006-07-02 16:02:29 UTC (rev 16396) @@ -0,0 +1,5 @@ +#include "conversation.h" + +GaimConversationUiOps *gg_conv_get_ui_ops(); + +void gg_conversation_init(); Modified: branches/soc-2006-file-loggers/console/gntgaim.c =================================================================== --- branches/soc-2006-file-loggers/console/gntgaim.c 2006-07-02 15:49:54 UTC (rev 16395) +++ branches/soc-2006-file-loggers/console/gntgaim.c 2006-07-02 16:02:29 UTC (rev 16396) @@ -16,6 +16,7 @@ #include "whiteboard.h" #include "gntgaim.h" +#include "gntui.h" /* Anything IO-related is directly copied from gtkgaim's source tree */ Modified: branches/soc-2006-file-loggers/console/gntui.c =================================================================== --- branches/soc-2006-file-loggers/console/gntui.c 2006-07-02 15:49:54 UTC (rev 16395) +++ branches/soc-2006-file-loggers/console/gntui.c 2006-07-02 16:02:29 UTC (rev 16396) @@ -1,4 +1,6 @@ #include "gntui.h" +#include "gntblist.h" +#include "gntconv.h" void init_gnt_ui() { @@ -12,6 +14,10 @@ gg_blist_init(); gaim_blist_set_ui_ops(gg_blist_get_ui_ops()); + /* Now the conversations */ + gg_conversation_init(); + gaim_conversations_set_ui_ops(gg_conv_get_ui_ops()); + gnt_main(); } Copied: branches/soc-2006-file-loggers/console/libgnt/AUTHORS (from rev 16395, trunk/console/libgnt/AUTHORS) =================================================================== Copied: branches/soc-2006-file-loggers/console/libgnt/COPYING (from rev 16395, trunk/console/libgnt/COPYING) =================================================================== --- branches/soc-2006-file-loggers/console/libgnt/COPYING (rev 0) +++ branches/soc-2006-file-loggers/console/libgnt/COPYING 2006-07-02 16:02:29 UTC (rev 16396) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show... [truncated message content] |
