Menu
▾
▴
pidgin-commits — DO NOT USE. See https://pidgin.im/cgi-bin/mailman/listinfo/commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(106) |
Oct
(334) |
Nov
(246) |
Dec
(145) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(42) |
Feb
(53) |
Mar
(232) |
Apr
(109) |
May
(137) |
Jun
(63) |
Jul
(26) |
Aug
(263) |
Sep
(193) |
Oct
(507) |
Nov
(440) |
Dec
(241) |
| 2003 |
Jan
(567) |
Feb
(195) |
Mar
(504) |
Apr
(481) |
May
(524) |
Jun
(522) |
Jul
(594) |
Aug
(502) |
Sep
(643) |
Oct
(508) |
Nov
(430) |
Dec
(377) |
| 2004 |
Jan
(361) |
Feb
(251) |
Mar
(219) |
Apr
(499) |
May
(461) |
Jun
(419) |
Jul
(314) |
Aug
(519) |
Sep
(416) |
Oct
(247) |
Nov
(305) |
Dec
(382) |
| 2005 |
Jan
(267) |
Feb
(282) |
Mar
(327) |
Apr
(338) |
May
(189) |
Jun
(400) |
Jul
(462) |
Aug
(530) |
Sep
(316) |
Oct
(523) |
Nov
(481) |
Dec
(650) |
| 2006 |
Jan
(536) |
Feb
(361) |
Mar
(287) |
Apr
(146) |
May
(101) |
Jun
(169) |
Jul
(221) |
Aug
(498) |
Sep
(300) |
Oct
(236) |
Nov
(209) |
Dec
(205) |
| 2007 |
Jan
(30) |
Feb
(23) |
Mar
(26) |
Apr
(15) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <lsc...@us...> - 2006-11-22 15:50:37
|
Revision: 17808
http://svn.sourceforge.net/gaim/?rev=17808&view=rev
Author: lschiere
Date: 2006-11-22 07:50:27 -0800 (Wed, 22 Nov 2006)
Log Message:
-----------
I reference this alot as part of gaim-text support
Added Paths:
-----------
web/htdocs/UTF-8-demo.txt.gz
Added: web/htdocs/UTF-8-demo.txt.gz
===================================================================
(Binary files differ)
Property changes on: web/htdocs/UTF-8-demo.txt.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2006-11-22 15:30:06
|
Revision: 17807
http://svn.sourceforge.net/gaim/?rev=17807&view=rev
Author: markhuetsch
Date: 2006-11-22 07:29:57 -0800 (Wed, 22 Nov 2006)
Log Message:
-----------
Thanks to everyone who worked on OpenQ! Please let me know if I left anything/anyone out.
Modified Paths:
--------------
trunk/AUTHORS
trunk/libgaim/protocols/qq/buddy_info.c
trunk/libgaim/protocols/qq/buddy_info.h
trunk/libgaim/protocols/qq/buddy_list.c
trunk/libgaim/protocols/qq/buddy_list.h
trunk/libgaim/protocols/qq/buddy_opt.c
trunk/libgaim/protocols/qq/buddy_opt.h
trunk/libgaim/protocols/qq/buddy_status.c
trunk/libgaim/protocols/qq/buddy_status.h
trunk/libgaim/protocols/qq/char_conv.c
trunk/libgaim/protocols/qq/char_conv.h
trunk/libgaim/protocols/qq/crypt.c
trunk/libgaim/protocols/qq/crypt.h
trunk/libgaim/protocols/qq/file_trans.c
trunk/libgaim/protocols/qq/file_trans.h
trunk/libgaim/protocols/qq/group.c
trunk/libgaim/protocols/qq/group.h
trunk/libgaim/protocols/qq/group_conv.c
trunk/libgaim/protocols/qq/group_conv.h
trunk/libgaim/protocols/qq/group_find.c
trunk/libgaim/protocols/qq/group_find.h
trunk/libgaim/protocols/qq/group_free.c
trunk/libgaim/protocols/qq/group_free.h
trunk/libgaim/protocols/qq/group_im.c
trunk/libgaim/protocols/qq/group_im.h
trunk/libgaim/protocols/qq/group_info.c
trunk/libgaim/protocols/qq/group_info.h
trunk/libgaim/protocols/qq/group_internal.c
trunk/libgaim/protocols/qq/group_internal.h
trunk/libgaim/protocols/qq/group_join.c
trunk/libgaim/protocols/qq/group_join.h
trunk/libgaim/protocols/qq/group_misc.c
trunk/libgaim/protocols/qq/group_misc.h
trunk/libgaim/protocols/qq/group_network.c
trunk/libgaim/protocols/qq/group_network.h
trunk/libgaim/protocols/qq/group_opt.c
trunk/libgaim/protocols/qq/group_opt.h
trunk/libgaim/protocols/qq/group_search.c
trunk/libgaim/protocols/qq/group_search.h
trunk/libgaim/protocols/qq/header_info.c
trunk/libgaim/protocols/qq/header_info.h
trunk/libgaim/protocols/qq/im.c
trunk/libgaim/protocols/qq/im.h
trunk/libgaim/protocols/qq/keep_alive.c
trunk/libgaim/protocols/qq/keep_alive.h
trunk/libgaim/protocols/qq/login_logout.c
trunk/libgaim/protocols/qq/login_logout.h
trunk/libgaim/protocols/qq/packet_parse.c
trunk/libgaim/protocols/qq/packet_parse.h
trunk/libgaim/protocols/qq/qq.c
trunk/libgaim/protocols/qq/qq.h
trunk/libgaim/protocols/qq/qq_proxy.c
trunk/libgaim/protocols/qq/qq_proxy.h
trunk/libgaim/protocols/qq/recv_core.c
trunk/libgaim/protocols/qq/recv_core.h
trunk/libgaim/protocols/qq/send_core.c
trunk/libgaim/protocols/qq/send_core.h
trunk/libgaim/protocols/qq/send_file.c
trunk/libgaim/protocols/qq/send_file.h
trunk/libgaim/protocols/qq/sendqueue.c
trunk/libgaim/protocols/qq/sendqueue.h
trunk/libgaim/protocols/qq/sys_msg.c
trunk/libgaim/protocols/qq/sys_msg.h
trunk/libgaim/protocols/qq/udp_proxy_s5.c
trunk/libgaim/protocols/qq/udp_proxy_s5.h
trunk/libgaim/protocols/qq/utils.c
trunk/libgaim/protocols/qq/utils.h
Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/AUTHORS 2006-11-22 15:29:57 UTC (rev 17807)
@@ -122,3 +122,17 @@
Elliot Tobin <el...@bh...>
Thanks to Jeroen van der Vegt for the initial smiley plugin and images.
+
+Puzzlebird
+Henry Ou <he...@li...>
+David ZH.R. Huang
+joymarquis
+gfhuang
+arfankai
+rakescar
+yyw
+lvxiang
+Shufeng Tan <http://sf.net/projects/perl-oicq>
+Jeff Ye <http://www.sinomac.com>
+Hu Zheng <http://forlinux.yeah.net>
+ Wrote OpenQ, which became the QQ plugin
Modified: trunk/libgaim/protocols/qq/buddy_info.c
===================================================================
--- trunk/libgaim/protocols/qq/buddy_info.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/buddy_info.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
- * The QQ2003C protocol plugin
+ * @file buddy_info.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/buddy_info.h
===================================================================
--- trunk/libgaim/protocols/qq/buddy_info.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/buddy_info.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
- * The QQ2003C protocol plugin
+ * @file buddy_info.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/buddy_list.c
===================================================================
--- trunk/libgaim/protocols/qq/buddy_list.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/buddy_list.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file buddy_list.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/buddy_list.h
===================================================================
--- trunk/libgaim/protocols/qq/buddy_list.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/buddy_list.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file buddy_list.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/buddy_opt.c
===================================================================
--- trunk/libgaim/protocols/qq/buddy_opt.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/buddy_opt.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file buddy_opt.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/buddy_opt.h
===================================================================
--- trunk/libgaim/protocols/qq/buddy_opt.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/buddy_opt.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file buddy_opt.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/buddy_status.c
===================================================================
--- trunk/libgaim/protocols/qq/buddy_status.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/buddy_status.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
- * The QQ2003C protocol plugin
+ * @file buddy_status.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/buddy_status.h
===================================================================
--- trunk/libgaim/protocols/qq/buddy_status.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/buddy_status.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file buddy_status.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/char_conv.c
===================================================================
--- trunk/libgaim/protocols/qq/char_conv.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/char_conv.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
- * The QQ2003C protocol plugin
+ * @file char_conv.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/char_conv.h
===================================================================
--- trunk/libgaim/protocols/qq/char_conv.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/char_conv.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
- * The QQ2003C protocol plugin
+ * @file char_conv.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/crypt.c
===================================================================
--- trunk/libgaim/protocols/qq/crypt.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/crypt.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
- * The QQ2003C protocol plugin
+ * @file crypt.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/crypt.h
===================================================================
--- trunk/libgaim/protocols/qq/crypt.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/crypt.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
- * The QQ2003C protocol plugin
+ * @file crypt.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/file_trans.c
===================================================================
--- trunk/libgaim/protocols/qq/file_trans.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/file_trans.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,12 +1,12 @@
/**
- * The QQ2003C protocol plugin
+ * @file file_trans.c
*
- * for gaim
+ * gaim
*
- * Author: Henry Ou <he...@li...>
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
- * Copyright (C) 2004 Puzzlebird
- *
* 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
Modified: trunk/libgaim/protocols/qq/file_trans.h
===================================================================
--- trunk/libgaim/protocols/qq/file_trans.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/file_trans.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,12 +1,12 @@
/**
- * The QQ2003C protocol plugin
+ * @file file_trans.h
*
- * for gaim
+ * gaim
*
- * Author: Henry Ou <he...@li...>
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
- * Copyright (C) 2004 Puzzlebird
- *
* 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
Modified: trunk/libgaim/protocols/qq/group.c
===================================================================
--- trunk/libgaim/protocols/qq/group.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/group.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file group.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/group.h
===================================================================
--- trunk/libgaim/protocols/qq/group.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/group.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file group.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/group_conv.c
===================================================================
--- trunk/libgaim/protocols/qq/group_conv.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/group_conv.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file group_conv.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/group_conv.h
===================================================================
--- trunk/libgaim/protocols/qq/group_conv.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/group_conv.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file group_conv.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/group_find.c
===================================================================
--- trunk/libgaim/protocols/qq/group_find.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/group_find.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
- * The QQ2003C protocol plugin
+ * @file group_find.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/group_find.h
===================================================================
--- trunk/libgaim/protocols/qq/group_find.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/group_find.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
- * The QQ2003C protocol plugin
+ * @file group_find.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/group_free.c
===================================================================
--- trunk/libgaim/protocols/qq/group_free.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/group_free.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file group_free.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/group_free.h
===================================================================
--- trunk/libgaim/protocols/qq/group_free.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/group_free.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file group_free.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/group_im.c
===================================================================
--- trunk/libgaim/protocols/qq/group_im.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/group_im.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file group_im.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/group_im.h
===================================================================
--- trunk/libgaim/protocols/qq/group_im.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/group_im.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file group_im.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/group_info.c
===================================================================
--- trunk/libgaim/protocols/qq/group_info.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/group_info.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file group_info.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/group_info.h
===================================================================
--- trunk/libgaim/protocols/qq/group_info.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/group_info.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file group_info.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/group_internal.c
===================================================================
--- trunk/libgaim/protocols/qq/group_internal.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/group_internal.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file group_internal.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/group_internal.h
===================================================================
--- trunk/libgaim/protocols/qq/group_internal.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/group_internal.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file group_internal.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/group_join.c
===================================================================
--- trunk/libgaim/protocols/qq/group_join.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/group_join.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file group_join.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/group_join.h
===================================================================
--- trunk/libgaim/protocols/qq/group_join.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/group_join.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file group_join.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/group_misc.c
===================================================================
--- trunk/libgaim/protocols/qq/group_misc.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/group_misc.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file group_misc.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/group_misc.h
===================================================================
--- trunk/libgaim/protocols/qq/group_misc.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/group_misc.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file group_misc.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/group_network.c
===================================================================
--- trunk/libgaim/protocols/qq/group_network.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/group_network.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file group_network.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/group_network.h
===================================================================
--- trunk/libgaim/protocols/qq/group_network.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/group_network.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file group_network.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/group_opt.c
===================================================================
--- trunk/libgaim/protocols/qq/group_opt.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/group_opt.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file group_opt.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/group_opt.h
===================================================================
--- trunk/libgaim/protocols/qq/group_opt.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/group_opt.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file group_opt.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/group_search.c
===================================================================
--- trunk/libgaim/protocols/qq/group_search.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/group_search.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
- * The QQ2003C protocol plugin
+ * @file group_search.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/group_search.h
===================================================================
--- trunk/libgaim/protocols/qq/group_search.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/group_search.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file group_search.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/header_info.c
===================================================================
--- trunk/libgaim/protocols/qq/header_info.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/header_info.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file header_info.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/header_info.h
===================================================================
--- trunk/libgaim/protocols/qq/header_info.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/header_info.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file header_info.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/im.c
===================================================================
--- trunk/libgaim/protocols/qq/im.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/im.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
- * The QQ2003C protocol plugin
+ * @file im.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/im.h
===================================================================
--- trunk/libgaim/protocols/qq/im.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/im.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file im.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/keep_alive.c
===================================================================
--- trunk/libgaim/protocols/qq/keep_alive.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/keep_alive.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file keep_alive.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/keep_alive.h
===================================================================
--- trunk/libgaim/protocols/qq/keep_alive.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/keep_alive.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file keep_alive.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/login_logout.c
===================================================================
--- trunk/libgaim/protocols/qq/login_logout.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/login_logout.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
- * The QQ2003C protocol plugin
+ * @file login_logout.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/login_logout.h
===================================================================
--- trunk/libgaim/protocols/qq/login_logout.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/login_logout.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
- * The QQ2003C protocol plugin
+ * file login_logout.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/packet_parse.c
===================================================================
--- trunk/libgaim/protocols/qq/packet_parse.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/packet_parse.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
- * The QQ2003C protocol plugin
+ * @file packet_parse.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/packet_parse.h
===================================================================
--- trunk/libgaim/protocols/qq/packet_parse.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/packet_parse.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
- * The QQ2003C protocol plugin
+ * @file packet_parse.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/qq.c
===================================================================
--- trunk/libgaim/protocols/qq/qq.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/qq.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
- * @file qq.c The QQ2003C protocol plugin
+ * @file qq.c
*
* gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/qq.h
===================================================================
--- trunk/libgaim/protocols/qq/qq.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/qq.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
- * The QQ2003C protocol plugin
+ * @file qq.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/qq_proxy.c
===================================================================
--- trunk/libgaim/protocols/qq/qq_proxy.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/qq_proxy.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,10 +1,11 @@
/**
- * The QQ2003C protocol plugin
+ * @file qq_proxy.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
- * Henry Ou <he...@li...>
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/qq_proxy.h
===================================================================
--- trunk/libgaim/protocols/qq/qq_proxy.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/qq_proxy.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,10 +1,11 @@
/**
- * The QQ2003C protocol plugin
+ * @file qq_proxy.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
- * Henry Ou <he...@li...>
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/recv_core.c
===================================================================
--- trunk/libgaim/protocols/qq/recv_core.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/recv_core.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file recv_core.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/recv_core.h
===================================================================
--- trunk/libgaim/protocols/qq/recv_core.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/recv_core.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file recv_core.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/send_core.c
===================================================================
--- trunk/libgaim/protocols/qq/send_core.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/send_core.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file send_core.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/send_core.h
===================================================================
--- trunk/libgaim/protocols/qq/send_core.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/send_core.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file send_core.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/send_file.c
===================================================================
--- trunk/libgaim/protocols/qq/send_file.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/send_file.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,12 +1,12 @@
/**
- * The QQ2003C protocol plugin
+ * @file send_file.c
*
- * for gaim
+ * gaim
*
- * Author: Henry Ou <he...@li...>
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
- * Copyright (C) 2004 Puzzlebird
- *
* 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
Modified: trunk/libgaim/protocols/qq/send_file.h
===================================================================
--- trunk/libgaim/protocols/qq/send_file.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/send_file.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,3 +1,27 @@
+/**
+ * @file send_file.h
+ *
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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
+ */
+
#ifndef _QQ_QQ_SEND_FILE_H_
#define _QQ_QQ_SEND_FILE_H_
Modified: trunk/libgaim/protocols/qq/sendqueue.c
===================================================================
--- trunk/libgaim/protocols/qq/sendqueue.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/sendqueue.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
- * The QQ2003C protocol plugin
+ * @file sendqueue.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/sendqueue.h
===================================================================
--- trunk/libgaim/protocols/qq/sendqueue.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/sendqueue.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
- * The QQ2003C protocol plugin
+ * @file sendqueue.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/sys_msg.c
===================================================================
--- trunk/libgaim/protocols/qq/sys_msg.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/sys_msg.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file sys_msg.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/sys_msg.h
===================================================================
--- trunk/libgaim/protocols/qq/sys_msg.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/sys_msg.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
-* The QQ2003C protocol plugin
+ * @file sys_msg.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/udp_proxy_s5.c
===================================================================
--- trunk/libgaim/protocols/qq/udp_proxy_s5.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/udp_proxy_s5.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,10 +1,11 @@
/**
- * The QQ2003C protocol plugin
+ * @file udp_proxy_s5.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
- * Henry Ou <he...@li...>
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/udp_proxy_s5.h
===================================================================
--- trunk/libgaim/protocols/qq/udp_proxy_s5.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/udp_proxy_s5.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,10 +1,11 @@
/**
- * The QQ2003C protocol plugin
+ * @file udp_proxy_s5.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
- * Henry Ou <he...@li...>
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/utils.c
===================================================================
--- trunk/libgaim/protocols/qq/utils.c 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/utils.c 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
- * The QQ2003C protocol plugin
+ * @file utils.c
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
Modified: trunk/libgaim/protocols/qq/utils.h
===================================================================
--- trunk/libgaim/protocols/qq/utils.h 2006-11-22 08:00:42 UTC (rev 17806)
+++ trunk/libgaim/protocols/qq/utils.h 2006-11-22 15:29:57 UTC (rev 17807)
@@ -1,9 +1,11 @@
/**
- * The QQ2003C protocol plugin
+ * @file utils.h
*
- * for gaim
+ * gaim
*
- * Copyright (C) 2004 Puzzlebird
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
*
* 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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sea...@us...> - 2006-11-22 08:00:49
|
Revision: 17806
http://svn.sourceforge.net/gaim/?rev=17806&view=rev
Author: seanegan
Date: 2006-11-22 00:00:42 -0800 (Wed, 22 Nov 2006)
Log Message:
-----------
Helpful message in the blank buddy list as suggested by Mark. This is definitely filler text right now. I also wrote a 'kiosk mode' page which maybe I'll play with later, but now it's #if 0'ed out
Modified Paths:
--------------
trunk/gtk/gtkaccount.c
trunk/gtk/gtkblist.c
trunk/gtk/gtkblist.h
Modified: trunk/gtk/gtkaccount.c
===================================================================
--- trunk/gtk/gtkaccount.c 2006-11-22 00:43:42 UTC (rev 17805)
+++ trunk/gtk/gtkaccount.c 2006-11-22 08:00:42 UTC (rev 17806)
@@ -2060,6 +2060,7 @@
GtkWidget *treeview;
GtkTreeSelection *sel;
GtkTargetEntry gte[] = {{"GAIM_ACCOUNT", GTK_TARGET_SAME_APP, 0}};
+ char *pretty;
frame = gtk_frame_new(NULL);
gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
@@ -2073,7 +2074,7 @@
/* Create a helpful first-time-use label */
label = gtk_label_new(NULL);
/* Translators: Please maintain the use of -> or <- to represent the menu heirarchy */
- gtk_label_set_markup(GTK_LABEL(label), gaim_gtk_make_pretty_arrows(_(
+ pretty = gaim_gtk_make_pretty_arrows(_(
"<span size='larger' weight='bold'>Welcome to Gaim!</span>\n\n"
"You have no IM accounts configured. To start connecting with Gaim "
@@ -2083,7 +2084,10 @@
"You can come back to this window to add, edit, or remove "
"accounts from <b>Accounts->Add/Edit</b> in the Buddy "
- "List window")));
+ "List window"));
+ gtk_label_set_markup(GTK_LABEL(label), pretty);
+ g_free(pretty);
+
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gtk_widget_show(label);
Modified: trunk/gtk/gtkblist.c
===================================================================
--- trunk/gtk/gtkblist.c 2006-11-22 00:43:42 UTC (rev 17805)
+++ trunk/gtk/gtkblist.c 2006-11-22 08:00:42 UTC (rev 17806)
@@ -3730,6 +3730,11 @@
if (!gtkblist)
return;
+ if (gaim_accounts_get_all_active())
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(gtkblist->notebook), 1);
+ else
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(gtkblist->notebook), 0);
+
update_menu_bar(gtkblist);
}
@@ -3877,10 +3882,58 @@
create_connection_error_buttons, NULL);
}
+
/******************************************/
/* End of connection error handling stuff */
/******************************************/
+#if 0
+static GtkWidget *
+kiosk_page()
+{
+ GtkWidget *ret = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE);
+ GtkWidget *label;
+ GtkWidget *entry;
+ GtkWidget *bbox;
+ GtkWidget *button;
+
+ label = gtk_label_new(NULL);
+ gtk_box_pack_start(GTK_BOX(ret), label, TRUE, TRUE, 0);
+
+ label = gtk_label_new(NULL);
+ gtk_label_set_markup(GTK_LABEL(label), _("<b>Username:</b>"));
+ gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+ gtk_box_pack_start(GTK_BOX(ret), label, FALSE, FALSE, 0);
+ entry = gtk_entry_new();
+ gtk_box_pack_start(GTK_BOX(ret), entry, FALSE, FALSE, 0);
+
+ label = gtk_label_new(NULL);
+ gtk_label_set_markup(GTK_LABEL(label), _("<b>Password:</b>"));
+ gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+ gtk_box_pack_start(GTK_BOX(ret), label, FALSE, FALSE, 0);
+ entry = gtk_entry_new();
+ gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
+ gtk_box_pack_start(GTK_BOX(ret), entry, FALSE, FALSE, 0);
+
+ label = gtk_label_new(" ");
+ gtk_box_pack_start(GTK_BOX(ret), label, FALSE, FALSE, 0);
+
+ bbox = gtk_hbutton_box_new();
+ button = gtk_button_new_with_mnemonic(_("_Login"));
+ gtk_box_pack_start(GTK_BOX(ret), bbox, FALSE, FALSE, 0);
+ gtk_container_add(GTK_CONTAINER(bbox), button);
+
+
+ label = gtk_label_new(NULL);
+ gtk_box_pack_start(GTK_BOX(ret), label, TRUE, TRUE, 0);
+
+ gtk_container_set_border_width(GTK_CONTAINER(ret), GAIM_HIG_BORDER);
+
+ gtk_widget_show_all(ret);
+ return ret;
+}
+#endif
+
static void gaim_gtk_blist_show(GaimBuddyList *list)
{
void *handle;
@@ -3889,6 +3942,8 @@
GtkWidget *menu;
GtkWidget *sw;
GtkWidget *sep;
+ GtkWidget *label;
+ char *pretty;
GtkAccelGroup *accel_group;
GtkTreeSelection *selection;
GtkTargetEntry dte[] = {{"GAIM_BLIST_NODE", GTK_TARGET_SAME_APP, DRAG_ROW},
@@ -3911,9 +3966,9 @@
gtk_window_set_title(GTK_WINDOW(gtkblist->window), _("Buddy List"));
GTK_WINDOW(gtkblist->window)->allow_shrink = TRUE;
- gtkblist->vbox = gtk_vbox_new(FALSE, 0);
- gtk_widget_show(gtkblist->vbox);
- gtk_container_add(GTK_CONTAINER(gtkblist->window), gtkblist->vbox);
+ gtkblist->main_vbox = gtk_vbox_new(FALSE, 0);
+ gtk_widget_show(gtkblist->main_vbox);
+ gtk_container_add(GTK_CONTAINER(gtkblist->window), gtkblist->main_vbox);
g_signal_connect(G_OBJECT(gtkblist->window), "delete_event", G_CALLBACK(gtk_blist_delete_cb), NULL);
g_signal_connect(G_OBJECT(gtkblist->window), "configure_event", G_CALLBACK(gtk_blist_configure_cb), NULL);
@@ -3940,11 +3995,40 @@
gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtkblist->menutray);
gtk_widget_show(gtkblist->menutray);
gtk_widget_show(menu);
- gtk_box_pack_start(GTK_BOX(gtkblist->vbox), menu, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(gtkblist->main_vbox), menu, FALSE, FALSE, 0);
accountmenu = gtk_item_factory_get_widget(gtkblist->ift, N_("/Accounts"));
+ /****************************** Notebook *************************************/
+ gtkblist->notebook = gtk_notebook_new();
+ gtk_notebook_set_show_tabs(GTK_NOTEBOOK(gtkblist->notebook), FALSE);
+ gtk_notebook_set_show_border(GTK_NOTEBOOK(gtkblist->notebook), FALSE);
+ gtk_box_pack_start(GTK_BOX(gtkblist->main_vbox), gtkblist->notebook, TRUE, TRUE, 0);
+
+#if 0
+ gtk_notebook_append_page(GTK_NOTEBOOK(gtkblist->notebook), kiosk_page(), NULL);
+#endif
+
+ /* Translators: Please maintain the use of -> and <- to refer to menu heirarchy */
+ pretty = gaim_gtk_make_pretty_arrows(_("<span weight='bold' size='larger'>Welcome to Gaim!</span>\n\n"
+
+ "You have no accounts enabled. Enable your IM accounts from the "
+ "<b>Accounts</b> window at <b>Accounts->Add/Edit</b>. Once you "
+ "enable accounts, you'll be able to sign on, set your status, "
+ "and talk to your friends."));
+ label = gtk_label_new(NULL);
+ gtk_widget_set_size_request(label, gaim_prefs_get_int("/gaim/gtk/blist/width") - 12, -1);
+ gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+ gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.2);
+ gtk_label_set_markup(GTK_LABEL(label), pretty);
+ g_free(pretty);
+ gtk_notebook_append_page(GTK_NOTEBOOK(gtkblist->notebook),label, NULL);
+ gtkblist->vbox = gtk_vbox_new(FALSE, 0);
+ gtk_notebook_append_page(GTK_NOTEBOOK(gtkblist->notebook), gtkblist->vbox, NULL);
+ gtk_widget_show_all(gtkblist->notebook);
+
+
/****************************** GtkTreeView **********************************/
sw = gtk_scrolled_window_new(NULL,NULL);
gtk_widget_show(sw);
@@ -5518,8 +5602,8 @@
gaim_prefs_add_string("/gaim/gtk/blist/sort_type", "alphabetical");
gaim_prefs_add_int("/gaim/gtk/blist/x", 0);
gaim_prefs_add_int("/gaim/gtk/blist/y", 0);
- gaim_prefs_add_int("/gaim/gtk/blist/width", 309); /* Golden ratio, baby */
- gaim_prefs_add_int("/gaim/gtk/blist/height", 500); /* Golden ratio, baby */
+ gaim_prefs_add_int("/gaim/gtk/blist/width", 250); /* Golden ratio, baby */
+ gaim_prefs_add_int("/gaim/gtk/blist/height", 405); /* Golden ratio, baby */
gaim_prefs_add_int("/gaim/gtk/blist/tooltip_delay", 500);
/* Register our signals */
Modified: trunk/gtk/gtkblist.h
===================================================================
--- trunk/gtk/gtkblist.h 2006-11-22 00:43:42 UTC (rev 17805)
+++ trunk/gtk/gtkblist.h 2006-11-22 08:00:42 UTC (rev 17806)
@@ -61,8 +61,11 @@
*/
struct _GaimGtkBuddyList {
GtkWidget *window;
- GtkWidget *vbox; /**< This is the vbox that everything gets packed into. Your plugin might
- want to pack something in it itself. Go, plugins! */
+ GtkWidget *notebook; /**< The notebook that switches between the real buddy list and the helpful
+ instructions page */
+ GtkWidget *main_vbox; /**< This vbox contains the menu and notebook */
+ GtkWidget *vbox; /**< This is the vbox that everything important gets packed into.
+ Your plugin might want to pack something in it itself. Go, plugins! */
GtkWidget *treeview; /**< It's a treeview... d'uh. */
GtkTreeStore *treemodel; /**< This is the treemodel. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-11-22 00:43:49
|
Revision: 17805
http://svn.sourceforge.net/gaim/?rev=17805&view=rev
Author: datallah
Date: 2006-11-21 16:43:42 -0800 (Tue, 21 Nov 2006)
Log Message:
-----------
Don't allow invalid plugin callbacks to registered (and eventually crash).
Fix an unlikely leak.
Modified Paths:
--------------
trunk/libgaim/prefs.c
Modified: trunk/libgaim/prefs.c
===================================================================
--- trunk/libgaim/prefs.c 2006-11-21 21:05:44 UTC (rev 17804)
+++ trunk/libgaim/prefs.c 2006-11-22 00:43:42 UTC (rev 17805)
@@ -617,6 +617,7 @@
remove_pref(struct gaim_pref *pref)
{
char *name;
+ GSList *l;
if(!pref || pref == &prefs)
return;
@@ -643,7 +644,11 @@
free_pref_value(pref);
- g_slist_free(pref->callbacks);
+ while((l = pref->callbacks) != NULL) {
+ pref->callbacks = pref->callbacks->next;
+ g_free(l->data);
+ g_slist_free_1(l);
+ }
g_free(pref->name);
g_free(pref);
}
@@ -1008,6 +1013,9 @@
struct pref_cb *cb;
static guint cb_id = 0;
+ g_return_val_if_fail(name != NULL, 0);
+ g_return_val_if_fail(func != NULL, 0);
+
pref = find_pref(name);
if (pref == NULL)
return 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sea...@us...> - 2006-11-21 21:16:18
|
Revision: 17804
http://svn.sourceforge.net/gaim/?rev=17804&view=rev
Author: seanegan
Date: 2006-11-21 13:05:44 -0800 (Tue, 21 Nov 2006)
Log Message:
-----------
Add a post-processing function to assist translators with the Unicode font
symbol.
If someone can figure out how to find out at runtime if a glyph exists,
let me know
Modified Paths:
--------------
trunk/gtk/gtkaccount.c
trunk/gtk/gtkutils.c
trunk/gtk/gtkutils.h
Modified: trunk/gtk/gtkaccount.c
===================================================================
--- trunk/gtk/gtkaccount.c 2006-11-21 16:35:51 UTC (rev 17803)
+++ trunk/gtk/gtkaccount.c 2006-11-21 21:05:44 UTC (rev 17804)
@@ -2072,7 +2072,8 @@
/* Create a helpful first-time-use label */
label = gtk_label_new(NULL);
- gtk_label_set_markup(GTK_LABEL(label), _(
+ /* Translators: Please maintain the use of -> or <- to represent the menu heirarchy */
+ gtk_label_set_markup(GTK_LABEL(label), gaim_gtk_make_pretty_arrows(_(
"<span size='larger' weight='bold'>Welcome to Gaim!</span>\n\n"
"You have no IM accounts configured. To start connecting with Gaim "
@@ -2081,8 +2082,8 @@
"press <b>Add</b> again to configure them all.\n\n"
"You can come back to this window to add, edit, or remove "
- "accounts from <b>Accounts \342\207\250 Add/Edit</b> in the Buddy "
- "List window"));
+ "accounts from <b>Accounts->Add/Edit</b> in the Buddy "
+ "List window")));
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gtk_widget_show(label);
Modified: trunk/gtk/gtkutils.c
===================================================================
--- trunk/gtk/gtkutils.c 2006-11-21 16:35:51 UTC (rev 17803)
+++ trunk/gtk/gtkutils.c 2006-11-21 21:05:44 UTC (rev 17804)
@@ -2837,4 +2837,17 @@
gaim_blist_update_buddy_icon(buddy);
}
+char *gaim_gtk_make_pretty_arrows(const char *str)
+{
+ char *ret;
+ char **split = g_strsplit(str, "->", -1);
+ ret = g_strjoinv("\342\207\250", split);
+ g_strfreev(split);
+ split = g_strsplit(ret, "<-", -1);
+ g_free(ret);
+ ret = g_strjoinv("\342\207\246", split);
+ g_strfreev(split);
+
+ return ret;
+}
Modified: trunk/gtk/gtkutils.h
===================================================================
--- trunk/gtk/gtkutils.h 2006-11-21 16:35:51 UTC (rev 17803)
+++ trunk/gtk/gtkutils.h 2006-11-21 21:05:44 UTC (rev 17804)
@@ -501,3 +501,12 @@
* previously set custom buddy icon for the user is removed.
*/
void gaim_gtk_set_custom_buddy_icon(GaimAccount *account, const char *who, const char *filename);
+
+/**
+ * Converts "->" and "<-" in strings to Unicode arrow characters, for use in referencing
+ * menu items.
+ *
+ * @param str The text to convert
+ * @return A newly allocated string with unicode arrow characters
+ */
+char *gaim_gtk_make_pretty_arrows(const char *str);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ebl...@us...> - 2006-11-21 16:35:57
|
Revision: 17803
http://svn.sourceforge.net/gaim/?rev=17803&view=rev
Author: eblanton
Date: 2006-11-21 08:35:51 -0800 (Tue, 21 Nov 2006)
Log Message:
-----------
Prevent dropping a buddy on another buddy from crashing. There should
probably be some smarter logic here.
Modified Paths:
--------------
trunk/console/gntblist.c
Modified: trunk/console/gntblist.c
===================================================================
--- trunk/console/gntblist.c 2006-11-21 15:15:20 UTC (rev 17802)
+++ trunk/console/gntblist.c 2006-11-21 16:35:51 UTC (rev 17803)
@@ -1025,10 +1025,18 @@
GaimGroup *tg = NULL;
GaimContact *tc = NULL;
+ /* This target resolution probably needs more clarification; for
+ * example, if I tag a buddy in a contact, then place on
+ * another buddy in the same contact, I probably intend to
+ * place the tagged buddy immediately after (before?) the
+ * target buddy -- this will simply move the tagged buddy
+ * within the same contact without reference to position. */
if (GAIM_BLIST_NODE_IS_GROUP(target))
tg = (GaimGroup*)target;
- else
+ else if (GAIM_BLIST_NODE_IS_CONTACT(target))
tc = (GaimContact*)target;
+ else /* Buddy or Chat */
+ tc = (GaimContact*)target->parent;
if (ggblist->tagged) {
GList *list = ggblist->tagged;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-11-21 15:15:33
|
Revision: 17802
http://svn.sourceforge.net/gaim/?rev=17802&view=rev
Author: datallah
Date: 2006-11-21 07:15:20 -0800 (Tue, 21 Nov 2006)
Log Message:
-----------
Fix clearing buddy icon for per-account statusboxes.
Modified Paths:
--------------
trunk/gtk/gtkstatusbox.c
Modified: trunk/gtk/gtkstatusbox.c
===================================================================
--- trunk/gtk/gtkstatusbox.c 2006-11-21 05:34:42 UTC (rev 17801)
+++ trunk/gtk/gtkstatusbox.c 2006-11-21 15:15:20 UTC (rev 17802)
@@ -82,6 +82,7 @@
static void do_colorshift (GdkPixbuf *dest, GdkPixbuf *src, int shift);
static void icon_choose_cb(const char *filename, gpointer data);
+static void remove_buddy_icon_cb(GtkWidget *w, GtkGaimStatusBox *box);
static void (*combo_box_size_request)(GtkWidget *widget, GtkRequisition *requisition);
static void (*combo_box_size_allocate)(GtkWidget *widget, GtkAllocation *allocation);
@@ -230,16 +231,6 @@
status_menu_refresh_iter(status_box);
}
-static void
-remove_buddy_icon_cb(GtkWidget *w, GtkGaimStatusBox *box)
-{
- /* The pref-connect callback does the actual work */
- gaim_prefs_set_string("/gaim/gtk/accounts/buddyicon", NULL);
-
- gtk_widget_destroy(box->icon_box_menu);
- box->icon_box_menu = NULL;
-}
-
static gboolean
icon_box_press_cb(GtkWidget *widget, GdkEventButton *event, GtkGaimStatusBox *box)
{
@@ -1225,12 +1216,9 @@
}
static void
-buddy_icon_set_cb(const char *filename, gpointer data)
+buddy_icon_set_cb(const char *filename, GtkGaimStatusBox *box)
{
- GtkGaimStatusBox *box;
- box = data;
-
if (box->account) {
GaimPlugin *plug = gaim_find_prpl(gaim_account_get_protocol_id(box->account));
if (plug) {
@@ -1268,6 +1256,19 @@
}
static void
+remove_buddy_icon_cb(GtkWidget *w, GtkGaimStatusBox *box)
+{
+ if (box->account == NULL)
+ /* The pref-connect callback does the actual work */
+ gaim_prefs_set_string("/gaim/gtk/accounts/buddyicon", NULL);
+ else
+ buddy_icon_set_cb(NULL, box);
+
+ gtk_widget_destroy(box->icon_box_menu);
+ box->icon_box_menu = NULL;
+}
+
+static void
icon_choose_cb(const char *filename, gpointer data)
{
GtkGaimStatusBox *box = data;
@@ -1276,7 +1277,7 @@
/* The pref-connect callback does the actual work */
gaim_prefs_set_string("/gaim/gtk/accounts/buddyicon", filename);
else
- buddy_icon_set_cb(filename, data);
+ buddy_icon_set_cb(filename, box);
}
box->buddy_icon_sel = NULL;
@@ -1286,7 +1287,7 @@
update_buddyicon_cb(const char *name, GaimPrefType type,
gconstpointer value, gpointer data)
{
- buddy_icon_set_cb(value, data);
+ buddy_icon_set_cb(value, (GtkGaimStatusBox*) data);
}
static void
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-11-21 05:34:43
|
Revision: 17801
http://svn.sourceforge.net/gaim/?rev=17801&view=rev
Author: datallah
Date: 2006-11-20 21:34:42 -0800 (Mon, 20 Nov 2006)
Log Message:
-----------
This probably doesn't matter too much, but these should be allocated via glib.
Modified Paths:
--------------
trunk/libgaim/protocols/silc/silc.c
Modified: trunk/libgaim/protocols/silc/silc.c
===================================================================
--- trunk/libgaim/protocols/silc/silc.c 2006-11-21 05:32:55 UTC (rev 17800)
+++ trunk/libgaim/protocols/silc/silc.c 2006-11-21 05:34:42 UTC (rev 17801)
@@ -870,12 +870,12 @@
if (f)
c = gaim_request_field_string_get_value(f);
- identifier = silc_pkcs_encode_identifier((char *)un, (char *)hn,
+ identifier = silc_pkcs_encode_identifier((char *)un, (char *)hn,
(char *)rn, (char *)e, (char *)o, (char *)c);
/* Create the key pair */
if (!silc_create_key_pair(SILCGAIM_DEF_PKCS, keylen, pkfile, prfile,
- identifier, pass1, NULL, &public_key, NULL,
+ identifier, pass1, NULL, &public_key, NULL,
FALSE)) {
gaim_notify_error(
gc, _("Create New SILC Key Pair"), _("Key Pair Generation failed"), NULL);
@@ -1086,7 +1086,7 @@
silc_dlist_start(list);
while ((buf = silc_dlist_get(list)) != SILC_LIST_END)
- silc_client_send_private_message(client, conn,
+ silc_client_send_private_message(client, conn,
client_entry, im->flags,
buf->data, buf->len,
TRUE);
@@ -1198,7 +1198,7 @@
silc_dlist_start(list);
while ((buf = silc_dlist_get(list)) != SILC_LIST_END)
ret =
- silc_client_send_private_message(client, conn,
+ silc_client_send_private_message(client, conn,
clients[0], mflags,
buf->data, buf->len,
TRUE);
@@ -1864,9 +1864,9 @@
prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
for (i = 0; silc_default_ciphers[i].name; i++) {
- kvp = silc_calloc(1, sizeof(*kvp));
- kvp->key = strdup(silc_default_ciphers[i].name);
- kvp->value = strdup(silc_default_ciphers[i].name);
+ kvp = g_new0(GaimKeyValuePair, 1);
+ kvp->key = g_strdup(silc_default_ciphers[i].name);
+ kvp->value = g_strdup(silc_default_ciphers[i].name);
list = g_list_append(list, kvp);
}
option = gaim_account_option_list_new(_("Cipher"), "cipher", list);
@@ -1874,9 +1874,9 @@
list = NULL;
for (i = 0; silc_default_hmacs[i].name; i++) {
- kvp = silc_calloc(1, sizeof(*kvp));
- kvp->key = strdup(silc_default_hmacs[i].name);
- kvp->value = strdup(silc_default_hmacs[i].name);
+ kvp = g_new0(GaimKeyValuePair, 1);
+ kvp->key = g_strdup(silc_default_hmacs[i].name);
+ kvp->value = g_strdup(silc_default_hmacs[i].name);
list = g_list_append(list, kvp);
}
option = gaim_account_option_list_new(_("HMAC"), "hmac", list);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-11-21 05:32:59
|
Revision: 17800
http://svn.sourceforge.net/gaim/?rev=17800&view=rev
Author: datallah
Date: 2006-11-20 21:32:55 -0800 (Mon, 20 Nov 2006)
Log Message:
-----------
We shouldn't be freeing kvp->value, which is put in the list store as G_TYPE_POINTER.
This was causing crashes for people editing SILC accounts (nothing else uses GAIM_PREF_STRING_LIST).
Modified Paths:
--------------
trunk/gtk/gtkaccount.c
Modified: trunk/gtk/gtkaccount.c
===================================================================
--- trunk/gtk/gtkaccount.c 2006-11-21 04:34:38 UTC (rev 17799)
+++ trunk/gtk/gtkaccount.c 2006-11-21 05:32:55 UTC (rev 17800)
@@ -810,7 +810,7 @@
if (node->data != NULL) {
kvp = (GaimKeyValuePair *) node->data;
if ((kvp->value != NULL) && (str_value != NULL) &&
- !g_utf8_collate(kvp->value, str_value))
+ !g_utf8_collate(kvp->value, str_value))
idx = i;
gtk_list_store_append(model, &iter);
@@ -1247,7 +1247,6 @@
gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget), &iter);
gtk_tree_model_get(gtk_combo_box_get_model(GTK_COMBO_BOX(widget)), &iter, 1, &value2, -1);
gaim_account_set_string(account, setting, value2);
- g_free(value2);
break;
default:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-11-21 04:34:40
|
Revision: 17799
http://svn.sourceforge.net/gaim/?rev=17799&view=rev
Author: datallah
Date: 2006-11-20 20:34:38 -0800 (Mon, 20 Nov 2006)
Log Message:
-----------
The global buddy icon is now removable (via a right-click popup menu).
Modified Paths:
--------------
trunk/gtk/gtkstatusbox.c
trunk/gtk/gtkstatusbox.h
Modified: trunk/gtk/gtkstatusbox.c
===================================================================
--- trunk/gtk/gtkstatusbox.c 2006-11-21 02:27:31 UTC (rev 17798)
+++ trunk/gtk/gtkstatusbox.c 2006-11-21 04:34:38 UTC (rev 17799)
@@ -230,16 +230,45 @@
status_menu_refresh_iter(status_box);
}
+static void
+remove_buddy_icon_cb(GtkWidget *w, GtkGaimStatusBox *box)
+{
+ /* The pref-connect callback does the actual work */
+ gaim_prefs_set_string("/gaim/gtk/accounts/buddyicon", NULL);
+
+ gtk_widget_destroy(box->icon_box_menu);
+ box->icon_box_menu = NULL;
+}
+
static gboolean
icon_box_press_cb(GtkWidget *widget, GdkEventButton *event, GtkGaimStatusBox *box)
{
- if (box->buddy_icon_sel) {
- gtk_window_present(GTK_WINDOW(box->buddy_icon_sel));
- return FALSE;
+ if (event->button == 3) {
+ GtkWidget *menu_item;
+
+ if (box->icon_box_menu)
+ gtk_widget_destroy(box->icon_box_menu);
+
+ box->icon_box_menu = gtk_menu_new();
+
+ menu_item = gaim_new_item_from_stock(box->icon_box_menu, _("Remove"), GTK_STOCK_REMOVE,
+ G_CALLBACK(remove_buddy_icon_cb),
+ box, 0, 0, NULL);
+ if (gaim_prefs_get_string("/gaim/gtk/accounts/buddyicon") == NULL)
+ gtk_widget_set_sensitive(menu_item, FALSE);
+
+ gtk_menu_popup(GTK_MENU(box->icon_box_menu), NULL, NULL, NULL, NULL,
+ event->button, event->time);
+
+ } else {
+ if (box->buddy_icon_sel) {
+ gtk_window_present(GTK_WINDOW(box->buddy_icon_sel));
+ return FALSE;
+ }
+
+ box->buddy_icon_sel = gaim_gtk_buddy_icon_chooser_new(NULL, icon_choose_cb, box);
+ gtk_widget_show_all(box->buddy_icon_sel);
}
-
- box->buddy_icon_sel = gaim_gtk_buddy_icon_chooser_new(NULL, icon_choose_cb, box);
- gtk_widget_show_all(box->buddy_icon_sel);
return FALSE;
}
@@ -354,10 +383,14 @@
if (statusbox->buddy_icon_sel)
gtk_widget_destroy(statusbox->buddy_icon_sel);
+ if (statusbox->icon_box_menu)
+ gtk_widget_destroy(statusbox->icon_box_menu);
+
g_free(statusbox->buddy_icon_path);
statusbox->icon = NULL;
statusbox->icon_box = NULL;
+ statusbox->icon_box_menu = NULL;
statusbox->buddy_icon_path = NULL;
statusbox->buddy_icon = NULL;
statusbox->buddy_icon_hover = NULL;
@@ -1198,50 +1231,53 @@
box = data;
- if (filename) {
+ if (box->account) {
+ GaimPlugin *plug = gaim_find_prpl(gaim_account_get_protocol_id(box->account));
+ if (plug) {
+ GaimPluginProtocolInfo *prplinfo = GAIM_PLUGIN_PROTOCOL_INFO(plug);
+ if (prplinfo && prplinfo->icon_spec.format) {
+ char *icon = NULL;
+ if (filename)
+ icon = gaim_gtk_convert_buddy_icon(plug, filename);
+ gaim_account_set_ui_bool(box->account, GAIM_GTK_UI, "use-global-buddyicon", (filename != NULL));
+ gaim_account_set_ui_string(box->account, GAIM_GTK_UI, "non-global-buddyicon", icon);
+ gaim_account_set_buddy_icon(box->account, icon);
+ g_free(icon);
+ }
+ }
+ } else {
GList *accounts;
-
- if (box->account) {
- GaimPlugin *plug = gaim_find_prpl(gaim_account_get_protocol_id(box->account));
+ for (accounts = gaim_accounts_get_all(); accounts != NULL; accounts = accounts->next) {
+ GaimAccount *account = accounts->data;
+ GaimPlugin *plug = gaim_find_prpl(gaim_account_get_protocol_id(account));
if (plug) {
GaimPluginProtocolInfo *prplinfo = GAIM_PLUGIN_PROTOCOL_INFO(plug);
- if (prplinfo && prplinfo->icon_spec.format) {
- char *icon = gaim_gtk_convert_buddy_icon(plug, filename);
- gaim_account_set_buddy_icon(box->account, icon);
- gaim_account_set_ui_bool(box->account, GAIM_GTK_UI, "use-global-buddyicon", FALSE);
- gaim_account_set_ui_string(box->account, GAIM_GTK_UI, "non-global-buddyicon", icon);
+ if (prplinfo != NULL &&
+ gaim_account_get_ui_bool(account, GAIM_GTK_UI, "use-global-buddyicon", TRUE) &&
+ prplinfo->icon_spec.format) {
+ char *icon = NULL;
+ if (filename)
+ icon = gaim_gtk_convert_buddy_icon(plug, filename);
+ gaim_account_set_buddy_icon(account, icon);
g_free(icon);
}
}
- } else {
- for (accounts = gaim_accounts_get_all(); accounts != NULL; accounts = accounts->next) {
- GaimAccount *account = accounts->data;
- GaimPlugin *plug = gaim_find_prpl(gaim_account_get_protocol_id(account));
- if (plug) {
- GaimPluginProtocolInfo *prplinfo = GAIM_PLUGIN_PROTOCOL_INFO(plug);
- if (prplinfo != NULL &&
- gaim_account_get_ui_bool(account, GAIM_GTK_UI, "use-global-buddyicon", TRUE) &&
- prplinfo->icon_spec.format) {
- char *icon = gaim_gtk_convert_buddy_icon(plug, filename);
- gaim_account_set_buddy_icon(account, icon);
- g_free(icon);
- }
- }
- }
}
- gtk_gaim_status_box_set_buddy_icon(box, filename);
}
+ gtk_gaim_status_box_set_buddy_icon(box, filename);
}
static void
icon_choose_cb(const char *filename, gpointer data)
{
GtkGaimStatusBox *box = data;
- if (box->account == NULL && filename)
- /* The pref-connect callback does the actual work */
- gaim_prefs_set_string("/gaim/gtk/accounts/buddyicon", filename);
- else
- buddy_icon_set_cb(filename, data);
+ if (filename) {
+ if (box->account == NULL)
+ /* The pref-connect callback does the actual work */
+ gaim_prefs_set_string("/gaim/gtk/accounts/buddyicon", filename);
+ else
+ buddy_icon_set_cb(filename, data);
+ }
box->buddy_icon_sel = NULL;
}
Modified: trunk/gtk/gtkstatusbox.h
===================================================================
--- trunk/gtk/gtkstatusbox.h 2006-11-21 02:27:31 UTC (rev 17798)
+++ trunk/gtk/gtkstatusbox.h 2006-11-21 04:34:38 UTC (rev 17799)
@@ -94,6 +94,7 @@
GtkWidget *buddy_icon_sel;
GtkWidget *icon;
GtkWidget *icon_box;
+ GtkWidget *icon_box_menu;
GdkCursor *hand_cursor;
GdkCursor *arrow_cursor;
int icon_size;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-11-21 02:27:32
|
Revision: 17798
http://svn.sourceforge.net/gaim/?rev=17798&view=rev
Author: sadrul
Date: 2006-11-20 18:27:31 -0800 (Mon, 20 Nov 2006)
Log Message:
-----------
Update the manual.
Modified Paths:
--------------
trunk/doc/gaim-text.1.in
Modified: trunk/doc/gaim-text.1.in
===================================================================
--- trunk/doc/gaim-text.1.in 2006-11-21 02:24:19 UTC (rev 17797)
+++ trunk/doc/gaim-text.1.in 2006-11-21 02:27:31 UTC (rev 17798)
@@ -267,9 +267,16 @@
c-b = context-menu
.br
+.br
+[GntWidget::binding]
+.br
+f11 = context-menu
+
[GntWindow::binding]
.br
c-o = show-menu
+.br
+f10 = show-menu
The \fBc-\fR corresponds to the \fBControl\fR key. You can also use \fBctrl-\fR
or \fBctr-\fR or \fBctl-\fR to indicate a combination. For alt-keys, you can use
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-11-21 02:24:20
|
Revision: 17797
http://svn.sourceforge.net/gaim/?rev=17797&view=rev
Author: datallah
Date: 2006-11-20 18:24:19 -0800 (Mon, 20 Nov 2006)
Log Message:
-----------
Don't allow the buddy list to get lost when switching "Show system tray icon" to "On Unread messages"
Modified Paths:
--------------
trunk/gtk/gtkdocklet.c
Modified: trunk/gtk/gtkdocklet.c
===================================================================
--- trunk/gtk/gtkdocklet.c 2006-11-21 01:25:19 UTC (rev 17796)
+++ trunk/gtk/gtkdocklet.c 2006-11-21 02:24:19 UTC (rev 17797)
@@ -52,6 +52,7 @@
static DockletStatus status = DOCKLET_STATUS_OFFLINE;
static gboolean enable_join_chat = FALSE;
static guint docklet_blinking_timer = 0;
+static gboolean visible = FALSE;
static gboolean visibility_manager = FALSE;
/**************************************************************************
@@ -93,12 +94,12 @@
GList *l_chat = NULL;
l_im = gaim_gtk_conversations_find_unseen_list(GAIM_CONV_TYPE_IM,
- GAIM_UNSEEN_TEXT,
+ GAIM_UNSEEN_TEXT,
FALSE, max);
l_chat = gaim_gtk_conversations_find_unseen_list(GAIM_CONV_TYPE_CHAT,
GAIM_UNSEEN_NICK,
- FALSE, max);
+ FALSE, max);
if (l_im != NULL && l_chat != NULL)
return g_list_concat(l_im, l_chat);
@@ -111,8 +112,7 @@
static gboolean
docklet_update_status()
{
- GList *convs = NULL;
- GList *l;
+ GList *convs, *l;
int count;
DockletStatus newstatus = DOCKLET_STATUS_OFFLINE;
gboolean pending = FALSE;
@@ -121,17 +121,17 @@
convs = get_pending_list(DOCKLET_TOOLTIP_LINE_LIMIT);
if (!strcmp(gaim_prefs_get_string("/gaim/gtk/docklet/show"), "pending")) {
- if (convs && ui_ops->create && !visibility_manager) {
+ if (convs && ui_ops->create && !visible) {
g_list_free(convs);
ui_ops->create();
return FALSE;
- } else if (!convs && ui_ops->destroy && visibility_manager) {
+ } else if (!convs && ui_ops->destroy && visible) {
ui_ops->destroy();
return FALSE;
}
}
- if (!visibility_manager) {
+ if (!visible) {
g_list_free(convs);
return FALSE;
}
@@ -224,11 +224,11 @@
ui_ops->update_icon(status);
/* and schedule the blinker function if messages are pending */
- if (gaim_prefs_get_bool("/gaim/gtk/docklet/blink") &&
- (status == DOCKLET_STATUS_ONLINE_PENDING
- || status == DOCKLET_STATUS_AWAY_PENDING)
- && docklet_blinking_timer == 0) {
- docklet_blinking_timer = g_timeout_add(500, docklet_blink_icon, NULL);
+ if (gaim_prefs_get_bool("/gaim/gtk/docklet/blink") &&
+ (status == DOCKLET_STATUS_ONLINE_PENDING
+ || status == DOCKLET_STATUS_AWAY_PENDING)
+ && docklet_blinking_timer == 0) {
+ docklet_blinking_timer = g_timeout_add(500, docklet_blink_icon, NULL);
}
}
@@ -256,8 +256,8 @@
* callbacks and signal handlers
**************************************************************************/
#if 0
-static void
-gaim_quit_cb()
+static void
+gaim_quit_cb()
{
/* TODO: confirm quit while pending */
}
@@ -302,12 +302,22 @@
{
const char *val = value;
if (!strcmp(val, "always")) {
- if (!visibility_manager && ui_ops->create)
- ui_ops->create();
+ if (ui_ops->create) {
+ if (!visible)
+ ui_ops->create();
+ else if (!visibility_manager) {
+ gaim_gtk_blist_visibility_manager_add();
+ visibility_manager = TRUE;
+ }
+ }
} else if (!strcmp(val, "never")) {
- if (visibility_manager && ui_ops->destroy)
+ if (visible && ui_ops->destroy)
ui_ops->destroy();
} else {
+ if (visibility_manager) {
+ gaim_gtk_blist_visibility_manager_remove();
+ visibility_manager = FALSE;
+ }
docklet_update_status();
}
@@ -338,7 +348,7 @@
/* This is a workaround for a bug in windows GTK+. Clicking outside of the
menu does not get rid of it, so instead we get rid of it as soon as the
pointer leaves the menu. */
-static gboolean
+static gboolean
hide_docklet_menu(gpointer data)
{
if (data != NULL) {
@@ -542,7 +552,7 @@
gtk_widget_set_sensitive(GTK_WIDGET(menuitem), FALSE);
g_signal_connect(G_OBJECT(menuitem), "toggled", G_CALLBACK(docklet_toggle_mute), NULL);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
-
+
menuitem = gtk_check_menu_item_new_with_label(_("Blink on new message"));
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), gaim_prefs_get_bool("/gaim/gtk/docklet/blink"));
g_signal_connect(G_OBJECT(menuitem), "toggled", G_CALLBACK(docklet_toggle_blink), NULL);
@@ -550,7 +560,7 @@
gaim_separator(menu);
- /* TODO: need a submenu to change status, this needs to "link"
+ /* TODO: need a submenu to change status, this needs to "link"
* to the status in the buddy list gtkstatusbox
*/
@@ -562,8 +572,8 @@
#endif
gtk_widget_show_all(menu);
gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
- ui_ops->position_menu,
- NULL, 0, gtk_get_current_event_time());
+ ui_ops->position_menu,
+ NULL, 0, gtk_get_current_event_time());
}
/**************************************************************************
@@ -593,11 +603,12 @@
void
gaim_gtk_docklet_embedded()
{
- if (!visibility_manager) {
- if (strcmp(gaim_prefs_get_string("/gaim/gtk/docklet/show"),"pending"))
- gaim_gtk_blist_visibility_manager_add();
+ if (!visibility_manager
+ && strcmp(gaim_prefs_get_string("/gaim/gtk/docklet/show"), "pending")) {
+ gaim_gtk_blist_visibility_manager_add();
visibility_manager = TRUE;
}
+ visible = TRUE;
docklet_update_status();
if (ui_ops && ui_ops->update_icon)
ui_ops->update_icon(status);
@@ -606,14 +617,16 @@
void
gaim_gtk_docklet_remove()
{
- if (visibility_manager) {
- if (strcmp(gaim_prefs_get_string("/gaim/gtk/docklet/show"),"pending"))
+ if (visible) {
+ if (visibility_manager) {
gaim_gtk_blist_visibility_manager_remove();
+ visibility_manager = FALSE;
+ }
if (docklet_blinking_timer) {
g_source_remove(docklet_blinking_timer);
docklet_blinking_timer = 0;
}
- visibility_manager = FALSE;
+ visible = FALSE;
status = DOCKLET_STATUS_OFFLINE;
}
}
@@ -638,17 +651,17 @@
void *conv_handle = gaim_conversations_get_handle();
void *accounts_handle = gaim_accounts_get_handle();
void *docklet_handle = gaim_gtk_docklet_get_handle();
-
+
gaim_prefs_add_none("/gaim/gtk/docklet");
- gaim_prefs_add_bool("/gaim/gtk/docklet/blink", FALSE);
- gaim_prefs_add_string("/gaim/gtk/docklet/show", "always");
+ gaim_prefs_add_bool("/gaim/gtk/docklet/blink", FALSE);
+ gaim_prefs_add_string("/gaim/gtk/docklet/show", "always");
gaim_prefs_connect_callback(docklet_handle, "/gaim/gtk/docklet/show",
docklet_show_pref_changed_cb, NULL);
docklet_ui_init();
if (!strcmp(gaim_prefs_get_string("/gaim/gtk/docklet/show"), "always") && ui_ops && ui_ops->create)
ui_ops->create();
-
+
gaim_signal_connect(conn_handle, "signed-on",
docklet_handle, GAIM_CALLBACK(docklet_signed_on_cb), NULL);
gaim_signal_connect(conn_handle, "signed-off",
@@ -674,6 +687,6 @@
void
gaim_gtk_docklet_uninit()
{
- if (visibility_manager && ui_ops && ui_ops->destroy)
+ if (visible && ui_ops && ui_ops->destroy)
ui_ops->destroy();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sea...@us...> - 2006-11-21 01:25:19
|
Revision: 17796
http://svn.sourceforge.net/gaim/?rev=17796&view=rev
Author: seanegan
Date: 2006-11-20 17:25:19 -0800 (Mon, 20 Nov 2006)
Log Message:
-----------
blog
Added Paths:
-----------
web/htdocs/sean/images/aimicq.png
web/htdocs/sean/posts/aimicq.txt
Added: web/htdocs/sean/images/aimicq.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/sean/images/aimicq.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: web/htdocs/sean/posts/aimicq.txt
===================================================================
--- web/htdocs/sean/posts/aimicq.txt (rev 0)
+++ web/htdocs/sean/posts/aimicq.txt 2006-11-21 01:25:19 UTC (rev 17796)
@@ -0,0 +1,10 @@
+AIM/ICQ
+Since they use the same protocol, AIM and ICQ have long shared a single spot in Gaim's list of available
+protocols. This spot has been called "AIM/ICQ," and uses the AIM icon. This has caused some confusion,
+especially among ICQ users who expect to see an ICQ icon.
+
+Since beta5, we've made a change to separate AIM and ICQ into two separate entries. Hopefully, this will
+make setting up AIM and ICQ accounts more straightforward.
+<center>
+<img src='http://gaim.sf.net/sean/images/aimicq.png'>
+</center>
Property changes on: web/htdocs/sean/posts/aimicq.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sea...@us...> - 2006-11-21 00:51:27
|
Revision: 17795
http://svn.sourceforge.net/gaim/?rev=17795&view=rev
Author: seanegan
Date: 2006-11-20 16:51:25 -0800 (Mon, 20 Nov 2006)
Log Message:
-----------
make the custom status dialog a bit smaller to fit on 800x600 screens
Modified Paths:
--------------
trunk/gtk/gtksavedstatuses.c
Modified: trunk/gtk/gtksavedstatuses.c
===================================================================
--- trunk/gtk/gtksavedstatuses.c 2006-11-21 00:38:35 UTC (rev 17794)
+++ trunk/gtk/gtksavedstatuses.c 2006-11-21 00:51:25 UTC (rev 17795)
@@ -1153,7 +1153,7 @@
/* Create the treeview */
dialog->treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(dialog->model));
gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(dialog->treeview), TRUE);
- gtk_widget_set_size_request(dialog->treeview, 400, 250);
+ gtk_widget_set_size_request(dialog->treeview, -1, 150);
gtk_container_add(GTK_CONTAINER(sw), dialog->treeview);
/* Add columns */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-11-21 00:38:36
|
Revision: 17794
http://svn.sourceforge.net/gaim/?rev=17794&view=rev
Author: datallah
Date: 2006-11-20 16:38:35 -0800 (Mon, 20 Nov 2006)
Log Message:
-----------
plug some leaks.
Modified Paths:
--------------
trunk/gtk/gtkdocklet.c
Modified: trunk/gtk/gtkdocklet.c
===================================================================
--- trunk/gtk/gtkdocklet.c 2006-11-20 22:39:08 UTC (rev 17793)
+++ trunk/gtk/gtkdocklet.c 2006-11-21 00:38:35 UTC (rev 17794)
@@ -122,16 +122,19 @@
if (!strcmp(gaim_prefs_get_string("/gaim/gtk/docklet/show"), "pending")) {
if (convs && ui_ops->create && !visibility_manager) {
- ui_ops->create();
- return FALSE;
+ g_list_free(convs);
+ ui_ops->create();
+ return FALSE;
} else if (!convs && ui_ops->destroy && visibility_manager) {
- ui_ops->destroy();
- return FALSE;
+ ui_ops->destroy();
+ return FALSE;
}
}
- if (!visibility_manager)
+ if (!visibility_manager) {
+ g_list_free(convs);
return FALSE;
+ }
if (convs != NULL) {
pending = TRUE;
@@ -307,7 +310,7 @@
} else {
docklet_update_status();
}
-
+
}
/**************************************************************************
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sea...@us...> - 2006-11-20 22:39:12
|
Revision: 17793
http://svn.sourceforge.net/gaim/?rev=17793&view=rev
Author: seanegan
Date: 2006-11-20 14:39:08 -0800 (Mon, 20 Nov 2006)
Log Message:
-----------
I think that setting info on connection is an AIM-specific thing. Jabber, at least,
has the server save the vcard and you should only set it when it changes. Setting
it on connection can break things.
If you know another protocol that requires info to be set on connection, please
add it to that prpl.
Modified Paths:
--------------
trunk/libgaim/connection.c
trunk/libgaim/protocols/oscar/oscar.c
Modified: trunk/libgaim/connection.c
===================================================================
--- trunk/libgaim/connection.c 2006-11-20 22:00:31 UTC (rev 17792)
+++ trunk/libgaim/connection.c 2006-11-20 22:39:08 UTC (rev 17793)
@@ -309,9 +309,6 @@
serv_set_permit_deny(gc);
update_keepalive(gc, TRUE);
-
- if (gaim_account_get_user_info(account) != NULL)
- serv_set_info(gc, gaim_account_get_user_info(account));
}
else if (gc->state == GAIM_DISCONNECTED) {
GaimAccount *account = gaim_connection_get_account(gc);
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-11-20 22:00:31 UTC (rev 17792)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-11-20 22:39:08 UTC (rev 17793)
@@ -3533,6 +3533,9 @@
aim_clientready(od, conn);
+ if (gaim_account_get_user_info(account) != NULL)
+ serv_set_info(gc, gaim_account_get_user_info(account));
+
/* Set our available message based on the current status */
status = gaim_account_get_active_status(account);
if (gaim_status_is_available(status))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sea...@us...> - 2006-11-20 22:00:41
|
Revision: 17792
http://svn.sourceforge.net/gaim/?rev=17792&view=rev
Author: seanegan
Date: 2006-11-20 14:00:31 -0800 (Mon, 20 Nov 2006)
Log Message:
-----------
Specify that source strings are UTF-8
Modified Paths:
--------------
trunk/po/POTFILES.in
Modified: trunk/po/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in 2006-11-20 05:56:55 UTC (rev 17791)
+++ trunk/po/POTFILES.in 2006-11-20 22:00:31 UTC (rev 17792)
@@ -1,3 +1,5 @@
+[encoding: UTF-8]
+
gaim.desktop.in
console/gntaccount.c
console/gntblist.c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-11-20 05:56:56
|
Revision: 17791
http://svn.sourceforge.net/gaim/?rev=17791&view=rev
Author: sadrul
Date: 2006-11-19 21:56:55 -0800 (Sun, 19 Nov 2006)
Log Message:
-----------
Fix bug#1580140: "getopt.h missing"
libgaim doesn't use getopt functions at all. So it's not necessary to keep
getopt* files in libgaim/.
Modified Paths:
--------------
trunk/libgaim/Makefile.am
Removed Paths:
-------------
trunk/libgaim/getopt.c
trunk/libgaim/getopt.h
trunk/libgaim/getopt1.c
Modified: trunk/libgaim/Makefile.am
===================================================================
--- trunk/libgaim/Makefile.am 2006-11-20 05:33:32 UTC (rev 17790)
+++ trunk/libgaim/Makefile.am 2006-11-20 05:56:55 UTC (rev 17791)
@@ -181,10 +181,9 @@
gaim_client_example_SOURCES = gaim-client-example.c
-gaim_client_example_DEPENDENCIES = @LIBOBJS@ libgaim-client.la
+gaim_client_example_DEPENDENCIES = libgaim-client.la
gaim_client_example_LDADD = \
- @LIBOBJS@ \
libgaim-client.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
@@ -214,10 +213,9 @@
$(gaim_coreheaders) \
$(dbus_headers)
-libgaim_la_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
+libgaim_la_DEPENDENCIES = $(STATIC_LINK_LIBS)
libgaim_la_LDFLAGS = -export-dynamic
libgaim_la_LIBADD = \
- @LIBOBJS@ \
$(DBUS_LIBS) \
$(GLIB_LIBS) \
$(LIBXML_LIBS) \
Deleted: trunk/libgaim/getopt.c
===================================================================
--- trunk/libgaim/getopt.c 2006-11-20 05:33:32 UTC (rev 17790)
+++ trunk/libgaim/getopt.c 2006-11-20 05:56:55 UTC (rev 17791)
@@ -1,737 +0,0 @@
-/* Getopt for GNU.
- NOTE: getopt is now part of the C library, so if you don't know what
- "Keep this file name-space clean" means, talk to ro...@gn...
- before changing it!
-
- Gaim is the legal property of its developers, whose names are too numerous
- to list here. Please refer to the COPYRIGHT file distributed with this
- source distribution.
-
- 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, 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, 675 Mass Ave, Cambridge, MA 02139, USA. */
-
-/* NOTE!!! AIX requires this to be the first thing in the file.
- Do not put ANYTHING before it! */
-#if !defined (__GNUC__) && defined (_AIX)
- #pragma alloca
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-/* Alver says we need this for IRIX. */
-#if HAVE_STRING_H
-#include "string.h"
-#endif
-
-#ifdef __GNUC__
-#define alloca __builtin_alloca
-#else /* not __GNUC__ */
-#if defined (HAVE_ALLOCA_H) || (defined(sparc) && (defined(sun) || (!defined(USG) && !defined(SVR4) && !defined(__svr4__))))
-#include <alloca.h>
-#else
-#ifndef _AIX
-char *alloca ();
-#endif
-#endif /* alloca.h */
-#endif /* not __GNUC__ */
-
-#if !__STDC__ && !defined(const) && IN_GCC
-#define const
-#endif
-
-/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>. */
-#ifndef _NO_PROTO
-#define _NO_PROTO
-#endif
-
-#include <stdio.h>
-
-/* Comment out all this code if we are using the GNU C Library, and are not
- actually compiling the library itself. This code is part of the GNU C
- Library, but also included in many other GNU distributions. Compiling
- and linking in this code is a waste when using the GNU C library
- (especially if it is a shared library). Rather than having every GNU
- program understand `configure --with-gnu-libc' and omit the object files,
- it is simpler to just do this in the source for each such file. */
-
-#if defined (_LIBC) || !defined (__GNU_LIBRARY__)
-
-
-/* This needs to come after some library #include
- to get __GNU_LIBRARY__ defined. */
-#ifdef __GNU_LIBRARY__
-#undef alloca
-/* Don't include stdlib.h for non-GNU C libraries because some of them
- contain conflicting prototypes for getopt. */
-#include <stdlib.h>
-#else /* Not GNU C library. */
-#define __alloca alloca
-#endif /* GNU C library. */
-
-/* If GETOPT_COMPAT is defined, `+' as well as `--' can introduce a
- long-named option. Because this is not POSIX.2 compliant, it is
- being phased out. */
-/* #define GETOPT_COMPAT */
-
-/* This version of `getopt' appears to the caller like standard Unix `getopt'
- but it behaves differently for the user, since it allows the user
- to intersperse the options with the other arguments.
-
- As `getopt' works, it permutes the elements of ARGV so that,
- when it is done, all the options precede everything else. Thus
- all application programs are extended to handle flexible argument order.
-
- Setting the environment variable POSIXLY_CORRECT disables permutation.
- Then the behavior is completely standard.
-
- GNU application programs can use a third alternative mode in which
- they can distinguish the relative order of options and other arguments. */
-
-#include "getopt.h"
-
-/* For communication from `getopt' to the caller.
- When `getopt' finds an option that takes an argument,
- the argument value is returned here.
- Also, when `ordering' is RETURN_IN_ORDER,
- each non-option ARGV-element is returned here. */
-
-char *optarg = 0;
-
-/* Index in ARGV of the next element to be scanned.
- This is used for communication to and from the caller
- and for communication between successive calls to `getopt'.
-
- On entry to `getopt', zero means this is the first call; initialize.
-
- When `getopt' returns EOF, this is the index of the first of the
- non-option elements that the caller should itself scan.
-
- Otherwise, `optind' communicates from one call to the next
- how much of ARGV has been scanned so far. */
-
-/* XXX 1003.2 says this must be 1 before any call. */
-int optind = 0;
-
-/* The next char to be scanned in the option-element
- in which the last option character we returned was found.
- This allows us to pick up the scan where we left off.
-
- If this is zero, or a null string, it means resume the scan
- by advancing to the next ARGV-element. */
-
-static char *nextchar;
-
-/* Callers store zero here to inhibit the error message
- for unrecognized options. */
-
-int opterr = 1;
-
-/* Set to an option character which was unrecognized.
- This must be initialized on some systems to avoid linking in the
- system's own getopt implementation. */
-
-int optopt = '?';
-
-/* Describe how to deal with options that follow non-option ARGV-elements.
-
- If the caller did not specify anything,
- the default is REQUIRE_ORDER if the environment variable
- POSIXLY_CORRECT is defined, PERMUTE otherwise.
-
- REQUIRE_ORDER means don't recognize them as options;
- stop option processing when the first non-option is seen.
- This is what Unix does.
- This mode of operation is selected by either setting the environment
- variable POSIXLY_CORRECT, or using `+' as the first character
- of the list of option characters.
-
- PERMUTE is the default. We permute the contents of ARGV as we scan,
- so that eventually all the non-options are at the end. This allows options
- to be given in any order, even with programs that were not written to
- expect this.
-
- RETURN_IN_ORDER is an option available to programs that were written
- to expect options and other ARGV-elements in any order and that care about
- the ordering of the two. We describe each non-option ARGV-element
- as if it were the argument of an option with character code 1.
- Using `-' as the first character of the list of option characters
- selects this mode of operation.
-
- The special argument `--' forces an end of option-scanning regardless
- of the value of `ordering'. In the case of RETURN_IN_ORDER, only
- `--' can cause `getopt' to return EOF with `optind' != ARGC. */
-
-static enum
-{
- REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
-} ordering;
-
-#ifdef __GNU_LIBRARY__
-/* We want to avoid inclusion of string.h with non-GNU libraries
- because there are many ways it can cause trouble.
- On some systems, it contains special magic macros that don't work
- in GCC. */
-#include <string.h>
-#define my_index strchr
-#define my_bcopy(src, dst, n) memcpy ((dst), (src), (n))
-#else
-
-/* Avoid depending on library functions or files
- whose names are inconsistent. */
-
-char *getenv ();
-
-static char *
-my_index (str, chr)
- const char *str;
- int chr;
-{
- while (*str)
- {
- if (*str == chr)
- return (char *) str;
- str++;
- }
- return 0;
-}
-
-static void
-my_bcopy (from, to, size)
- const char *from;
- char *to;
- int size;
-{
- int i;
- for (i = 0; i < size; i++)
- to[i] = from[i];
-}
-#endif /* GNU C library. */
-
-/* Handle permutation of arguments. */
-
-/* Describe the part of ARGV that contains non-options that have
- been skipped. `first_nonopt' is the index in ARGV of the first of them;
- `last_nonopt' is the index after the last of them. */
-
-static int first_nonopt;
-static int last_nonopt;
-
-/* Exchange two adjacent subsequences of ARGV.
- One subsequence is elements [first_nonopt,last_nonopt)
- which contains all the non-options that have been skipped so far.
- The other is elements [last_nonopt,optind), which contains all
- the options processed since those non-options were skipped.
-
- `first_nonopt' and `last_nonopt' are relocated so that they describe
- the new indices of the non-options in ARGV after they are moved. */
-
-static void
-exchange (argv)
- char **argv;
-{
- int nonopts_size = (last_nonopt - first_nonopt) * sizeof (char *);
- char **temp = (char **) __alloca (nonopts_size);
-
- /* Interchange the two blocks of data in ARGV. */
-
- my_bcopy ((char *) &argv[first_nonopt], (char *) temp, nonopts_size);
- my_bcopy ((char *) &argv[last_nonopt], (char *) &argv[first_nonopt],
- (optind - last_nonopt) * sizeof (char *));
- my_bcopy ((char *) temp,
- (char *) &argv[first_nonopt + optind - last_nonopt],
- nonopts_size);
-
- /* Update records for the slots the non-options now occupy. */
-
- first_nonopt += (optind - last_nonopt);
- last_nonopt = optind;
-}
-
-/* Scan elements of ARGV (whose length is ARGC) for option characters
- given in OPTSTRING.
-
- If an element of ARGV starts with '-', and is not exactly "-" or "--",
- then it is an option element. The characters of this element
- (aside from the initial '-') are option characters. If `getopt'
- is called repeatedly, it returns successively each of the option characters
- from each of the option elements.
-
- If `getopt' finds another option character, it returns that character,
- updating `optind' and `nextchar' so that the next call to `getopt' can
- resume the scan with the following option character or ARGV-element.
-
- If there are no more option characters, `getopt' returns `EOF'.
- Then `optind' is the index in ARGV of the first ARGV-element
- that is not an option. (The ARGV-elements have been permuted
- so that those that are not options now come last.)
-
- OPTSTRING is a string containing the legitimate option characters.
- If an option character is seen that is not listed in OPTSTRING,
- return '?' after printing an error message. If you set `opterr' to
- zero, the error message is suppressed but we still return '?'.
-
- If a char in OPTSTRING is followed by a colon, that means it wants an arg,
- so the following text in the same ARGV-element, or the text of the following
- ARGV-element, is returned in `optarg'. Two colons mean an option that
- wants an optional arg; if there is text in the current ARGV-element,
- it is returned in `optarg', otherwise `optarg' is set to zero.
-
- If OPTSTRING starts with `-' or `+', it requests different methods of
- handling the non-option ARGV-elements.
- See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
-
- Long-named options begin with `--' instead of `-'.
- Their names may be abbreviated as long as the abbreviation is unique
- or is an exact match for some defined option. If they have an
- argument, it follows the option name in the same ARGV-element, separated
- from the option name by a `=', or else the in next ARGV-element.
- When `getopt' finds a long-named option, it returns 0 if that option's
- `flag' field is nonzero, the value of the option's `val' field
- if the `flag' field is zero.
-
- The elements of ARGV aren't really const, because we permute them.
- But we pretend they're const in the prototype to be compatible
- with other systems.
-
- LONGOPTS is a vector of `struct option' terminated by an
- element containing a name which is zero.
-
- LONGIND returns the index in LONGOPT of the long-named option found.
- It is only valid when a long-named option has been found by the most
- recent call.
-
- If LONG_ONLY is nonzero, '-' as well as '--' can introduce
- long-named options. */
-
-int
-_getopt_internal (argc, argv, optstring, longopts, longind, long_only)
- int argc;
- char *const *argv;
- const char *optstring;
- const struct option *longopts;
- int *longind;
- int long_only;
-{
- int option_index;
-
- optarg = 0;
-
- /* Initialize the internal data when the first call is made.
- Start processing options with ARGV-element 1 (since ARGV-element 0
- is the program name); the sequence of previously skipped
- non-option ARGV-elements is empty. */
-
- if (optind == 0)
- {
- first_nonopt = last_nonopt = optind = 1;
-
- nextchar = NULL;
-
- /* Determine how to handle the ordering of options and nonoptions. */
-
- if (optstring[0] == '-')
- {
- ordering = RETURN_IN_ORDER;
- ++optstring;
- }
- else if (optstring[0] == '+')
- {
- ordering = REQUIRE_ORDER;
- ++optstring;
- }
- else if (getenv ("POSIXLY_CORRECT") != NULL)
- ordering = REQUIRE_ORDER;
- else
- ordering = PERMUTE;
- }
-
- if (nextchar == NULL || *nextchar == '\0')
- {
- if (ordering == PERMUTE)
- {
- /* If we have just processed some options following some non-options,
- exchange them so that the options come first. */
-
- if (first_nonopt != last_nonopt && last_nonopt != optind)
- exchange ((char **) argv);
- else if (last_nonopt != optind)
- first_nonopt = optind;
-
- /* Now skip any additional non-options
- and extend the range of non-options previously skipped. */
-
- while (optind < argc
- && (argv[optind][0] != '-' || argv[optind][1] == '\0')
-#ifdef GETOPT_COMPAT
- && (longopts == NULL
- || argv[optind][0] != '+' || argv[optind][1] == '\0')
-#endif /* GETOPT_COMPAT */
- )
- optind++;
- last_nonopt = optind;
- }
-
- /* Special ARGV-element `--' means premature end of options.
- Skip it like a null option,
- then exchange with previous non-options as if it were an option,
- then skip everything else like a non-option. */
-
- if (optind != argc && !strcmp (argv[optind], "--"))
- {
- optind++;
-
- if (first_nonopt != last_nonopt && last_nonopt != optind)
- exchange ((char **) argv);
- else if (first_nonopt == last_nonopt)
- first_nonopt = optind;
- last_nonopt = argc;
-
- optind = argc;
- }
-
- /* If we have done all the ARGV-elements, stop the scan
- and back over any non-options that we skipped and permuted. */
-
- if (optind == argc)
- {
- /* Set the next-arg-index to point at the non-options
- that we previously skipped, so the caller will digest them. */
- if (first_nonopt != last_nonopt)
- optind = first_nonopt;
- return EOF;
- }
-
- /* If we have come to a non-option and did not permute it,
- either stop the scan or describe it to the caller and pass it by. */
-
- if ((argv[optind][0] != '-' || argv[optind][1] == '\0')
-#ifdef GETOPT_COMPAT
- && (longopts == NULL
- || argv[optind][0] != '+' || argv[optind][1] == '\0')
-#endif /* GETOPT_COMPAT */
- )
- {
- if (ordering == REQUIRE_ORDER)
- return EOF;
- optarg = argv[optind++];
- return 1;
- }
-
- /* We have found another option-ARGV-element.
- Start decoding its characters. */
-
- nextchar = (argv[optind] + 1
- + (longopts != NULL && argv[optind][1] == '-'));
- }
-
- if (longopts != NULL
- && ((argv[optind][0] == '-'
- && (argv[optind][1] == '-' || long_only))
-#ifdef GETOPT_COMPAT
- || argv[optind][0] == '+'
-#endif /* GETOPT_COMPAT */
- ))
- {
- const struct option *p;
- char *s = nextchar;
- int exact = 0;
- int ambig = 0;
- const struct option *pfound = NULL;
- int indfound;
-
- while (*s && *s != '=')
- s++;
-
- /* Test all options for either exact match or abbreviated matches. */
- for (p = longopts, option_index = 0; p->name;
- p++, option_index++)
- if (!strncmp (p->name, nextchar, s - nextchar))
- {
- if (s - nextchar == strlen (p->name))
- {
- /* Exact match found. */
- pfound = p;
- indfound = option_index;
- exact = 1;
- break;
- }
- else if (pfound == NULL)
- {
- /* First nonexact match found. */
- pfound = p;
- indfound = option_index;
- }
- else
- /* Second nonexact match found. */
- ambig = 1;
- }
-
- if (ambig && !exact)
- {
- if (opterr)
- fprintf (stderr, "%s: option `%s' is ambiguous\n",
- argv[0], argv[optind]);
- nextchar += strlen (nextchar);
- optind++;
- return '?';
- }
-
- if (pfound != NULL)
- {
- option_index = indfound;
- optind++;
- if (*s)
- {
- /* Don't test has_arg with >, because some C compilers don't
- allow it to be used on enums. */
- if (pfound->has_arg)
- optarg = s + 1;
- else
- {
- if (opterr)
- {
- if (argv[optind - 1][1] == '-')
- /* --option */
- fprintf (stderr,
- "%s: option `--%s' doesn't allow an argument\n",
- argv[0], pfound->name);
- else
- /* +option or -option */
- fprintf (stderr,
- "%s: option `%c%s' doesn't allow an argument\n",
- argv[0], argv[optind - 1][0], pfound->name);
- }
- nextchar += strlen (nextchar);
- return '?';
- }
- }
- else if (pfound->has_arg == 1)
- {
- if (optind < argc)
- optarg = argv[optind++];
- else
- {
- if (opterr)
- fprintf (stderr, "%s: option `%s' requires an argument\n",
- argv[0], argv[optind - 1]);
- nextchar += strlen (nextchar);
- return optstring[0] == ':' ? ':' : '?';
- }
- }
- nextchar += strlen (nextchar);
- if (longind != NULL)
- *longind = option_index;
- if (pfound->flag)
- {
- *(pfound->flag) = pfound->val;
- return 0;
- }
- return pfound->val;
- }
- /* Can't find it as a long option. If this is not getopt_long_only,
- or the option starts with '--' or is not a valid short
- option, then it's an error.
- Otherwise interpret it as a short option. */
- if (!long_only || argv[optind][1] == '-'
-#ifdef GETOPT_COMPAT
- || argv[optind][0] == '+'
-#endif /* GETOPT_COMPAT */
- || my_index (optstring, *nextchar) == NULL)
- {
- if (opterr)
- {
- if (argv[optind][1] == '-')
- /* --option */
- fprintf (stderr, "%s: unrecognized option `--%s'\n",
- argv[0], nextchar);
- else
- /* +option or -option */
- fprintf (stderr, "%s: unrecognized option `%c%s'\n",
- argv[0], argv[optind][0], nextchar);
- }
- nextchar = (char *) "";
- optind++;
- return '?';
- }
- }
-
- /* Look at and handle the next option-character. */
-
- {
- char c = *nextchar++;
- char *temp = my_index (optstring, c);
-
- /* Increment `optind' when we start to process its last character. */
- if (*nextchar == '\0')
- ++optind;
-
- if (temp == NULL || c == ':')
- {
- if (opterr)
- {
-#if 0
- if (c < 040 || c >= 0177)
- fprintf (stderr, "%s: unrecognized option, character code 0%o\n",
- argv[0], c);
- else
- fprintf (stderr, "%s: unrecognized option `-%c'\n", argv[0], c);
-#else
- /* 1003.2 specifies the format of this message. */
- fprintf (stderr, "%s: illegal option -- %c\n", argv[0], c);
-#endif
- }
- optopt = c;
- return '?';
- }
- if (temp[1] == ':')
- {
- if (temp[2] == ':')
- {
- /* This is an option that accepts an argument optionally. */
- if (*nextchar != '\0')
- {
- optarg = nextchar;
- optind++;
- }
- else
- optarg = 0;
- nextchar = NULL;
- }
- else
- {
- /* This is an option that requires an argument. */
- if (*nextchar != '\0')
- {
- optarg = nextchar;
- /* If we end this ARGV-element by taking the rest as an arg,
- we must advance to the next element now. */
- optind++;
- }
- else if (optind == argc)
- {
- if (opterr)
- {
-#if 0
- fprintf (stderr, "%s: option `-%c' requires an argument\n",
- argv[0], c);
-#else
- /* 1003.2 specifies the format of this message. */
- fprintf (stderr, "%s: option requires an argument -- %c\n",
- argv[0], c);
-#endif
- }
- optopt = c;
- if (optstring[0] == ':')
- c = ':';
- else
- c = '?';
- }
- else
- /* We already incremented `optind' once;
- increment it again when taking next ARGV-elt as argument. */
- optarg = argv[optind++];
- nextchar = NULL;
- }
- }
- return c;
- }
-}
-
-int
-getopt (argc, argv, optstring)
- int argc;
- char *const *argv;
- const char *optstring;
-{
- return _getopt_internal (argc, argv, optstring,
- (const struct option *) 0,
- (int *) 0,
- 0);
-}
-
-#endif /* _LIBC or not __GNU_LIBRARY__. */
-
-#ifdef TEST
-
-/* Compile with -DTEST to make an executable for use in testing
- the above definition of `getopt'. */
-
-int
-main (argc, argv)
- int argc;
- char **argv;
-{
- int c;
- int digit_optind = 0;
-
- while (1)
- {
- int this_option_optind = optind ? optind : 1;
-
- c = getopt (argc, argv, "abc:d:0123456789");
- if (c == EOF)
- break;
-
- switch (c)
- {
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
- if (digit_optind != 0 && digit_optind != this_option_optind)
- printf ("digits occur in two different argv-elements.\n");
- digit_optind = this_option_optind;
- printf ("option %c\n", c);
- break;
-
- case 'a':
- printf ("option a\n");
- break;
-
- case 'b':
- printf ("option b\n");
- break;
-
- case 'c':
- printf ("option c with value `%s'\n", optarg);
- break;
-
- case '?':
- break;
-
- default:
- printf ("?? getopt returned character code 0%o ??\n", c);
- }
- }
-
- if (optind < argc)
- {
- printf ("non-option ARGV-elements: ");
- while (optind < argc)
- printf ("%s ", argv[optind++]);
- printf ("\n");
- }
-
- exit (0);
-}
-
-#endif /* TEST */
Deleted: trunk/libgaim/getopt.h
===================================================================
--- trunk/libgaim/getopt.h 2006-11-20 05:33:32 UTC (rev 17790)
+++ trunk/libgaim/getopt.h 2006-11-20 05:56:55 UTC (rev 17791)
@@ -1,136 +0,0 @@
-/* Declarations for getopt.
-
- NOTE: getopt is now part of the C library, so if you don't know what
- "Keep this file name-space clean" means, talk to ro...@gn...
- before changing it!
-
- Gaim is the legal property of its developers, whose names are too numerous
- to list here. Please refer to the COPYRIGHT file distributed with this
- source distribution.
-
- 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, 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, 675 Mass Ave, Cambridge, MA 02139, USA. */
-
-#ifndef _GETOPT_H
-#define _GETOPT_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* For communication from `getopt' to the caller.
- When `getopt' finds an option that takes an argument,
- the argument value is returned here.
- Also, when `ordering' is RETURN_IN_ORDER,
- each non-option ARGV-element is returned here. */
-
-extern char *optarg;
-
-/* Index in ARGV of the next element to be scanned.
- This is used for communication to and from the caller
- and for communication between successive calls to `getopt'.
-
- On entry to `getopt', zero means this is the first call; initialize.
-
- When `getopt' returns EOF, this is the index of the first of the
- non-option elements that the caller should itself scan.
-
- Otherwise, `optind' communicates from one call to the next
- how much of ARGV has been scanned so far. */
-
-extern int optind;
-
-/* Callers store zero here to inhibit the error message `getopt' prints
- for unrecognized options. */
-
-extern int opterr;
-
-/* Set to an option character which was unrecognized. */
-
-extern int optopt;
-
-/* Describe the long-named options requested by the application.
- The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
- of `struct option' terminated by an element containing a name which is
- zero.
-
- The field `has_arg' is:
- no_argument (or 0) if the option does not take an argument,
- required_argument (or 1) if the option requires an argument,
- optional_argument (or 2) if the option takes an optional argument.
-
- If the field `flag' is not NULL, it points to a variable that is set
- to the value given in the field `val' when the option is found, but
- left unchanged if the option is not found.
-
- To have a long-named option do something other than set an `int' to
- a compiled-in constant, such as set a value from `optarg', set the
- option's `flag' field to zero and its `val' field to a nonzero
- value (the equivalent single-letter option character, if there is
- one). For long options that have a zero `flag' field, `getopt'
- returns the contents of the `val' field. */
-
-struct option
-{
-#if __STDC__
- const char *name;
-#else
- char *name;
-#endif
- /* has_arg can't be an enum because some compilers complain about
- type mismatches in all the code that assumes it is an int. */
- int has_arg;
- int *flag;
- int val;
-};
-
-/* Names for the values of the `has_arg' field of `struct option'. */
-
-#define no_argument 0
-#define required_argument 1
-#define optional_argument 2
-
-#if __STDC__
-#if defined(__GNU_LIBRARY__)
-/* Many other libraries have conflicting prototypes for getopt, with
- differences in the consts, in stdlib.h. To avoid compilation
- errors, only prototype getopt for the GNU C library. */
-extern int getopt (int argc, char *const *argv, const char *shortopts);
-#else /* not __GNU_LIBRARY__ */
-extern int getopt ();
-#endif /* not __GNU_LIBRARY__ */
-extern int getopt_long (int argc, char *const *argv, const char *shortopts,
- const struct option *longopts, int *longind);
-extern int getopt_long_only (int argc, char *const *argv,
- const char *shortopts,
- const struct option *longopts, int *longind);
-
-/* Internal only. Users should not call this directly. */
-extern int _getopt_internal (int argc, char *const *argv,
- const char *shortopts,
- const struct option *longopts, int *longind,
- int long_only);
-#else /* not __STDC__ */
-extern int getopt ();
-extern int getopt_long ();
-extern int getopt_long_only ();
-
-extern int _getopt_internal ();
-#endif /* not __STDC__ */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _GETOPT_H */
Deleted: trunk/libgaim/getopt1.c
===================================================================
--- trunk/libgaim/getopt1.c 2006-11-20 05:33:32 UTC (rev 17790)
+++ trunk/libgaim/getopt1.c 2006-11-20 05:56:55 UTC (rev 17791)
@@ -1,177 +0,0 @@
-/* getopt_long and getopt_long_only entry points for GNU getopt.
- Gaim is the legal property of its developers, whose names are too numerous
- to list here. Please refer to the COPYRIGHT file distributed with this
- source distribution.
-
- 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, 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, 675 Mass Ave, Cambridge, MA 02139, USA. */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "getopt.h"
-
-#if !__STDC__ && !defined(const) && IN_GCC
-#define const
-#endif
-
-#include <stdio.h>
-
-/* Comment out all this code if we are using the GNU C Library, and are not
- actually compiling the library itself. This code is part of the GNU C
- Library, but also included in many other GNU distributions. Compiling
- and linking in this code is a waste when using the GNU C library
- (especially if it is a shared library). Rather than having every GNU
- program understand `configure --with-gnu-libc' and omit the object files,
- it is simpler to just do this in the source for each such file. */
-
-#if defined (_LIBC) || !defined (__GNU_LIBRARY__)
-
-
-/* This needs to come after some library #include
- to get __GNU_LIBRARY__ defined. */
-#ifdef __GNU_LIBRARY__
-#include <stdlib.h>
-#else
-char *getenv ();
-#endif
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-int
-getopt_long (argc, argv, options, long_options, opt_index)
- int argc;
- char *const *argv;
- const char *options;
- const struct option *long_options;
- int *opt_index;
-{
- return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
-}
-
-/* Like getopt_long, but '-' as well as '--' can indicate a long option.
- If an option that starts with '-' (not '--') doesn't match a long option,
- but does match a short option, it is parsed as a short option
- instead. */
-
-int
-getopt_long_only (argc, argv, options, long_options, opt_index)
- int argc;
- char *const *argv;
- const char *options;
- const struct option *long_options;
- int *opt_index;
-{
- return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
-}
-
-
-#endif /* _LIBC or not __GNU_LIBRARY__. */
-
-#ifdef TEST
-
-#include <stdio.h>
-
-int
-main (argc, argv)
- int argc;
- char **argv;
-{
- int c;
- int digit_optind = 0;
-
- while (1)
- {
- int this_option_optind = optind ? optind : 1;
- int option_index = 0;
- static struct option long_options[] =
- {
- {"add", 1, 0, 0},
- {"append", 0, 0, 0},
- {"delete", 1, 0, 0},
- {"verbose", 0, 0, 0},
- {"create", 0, 0, 0},
- {"file", 1, 0, 0},
- {0, 0, 0, 0}
- };
-
- c = getopt_long (argc, argv, "abc:d:0123456789",
- long_options, &option_index);
- if (c == EOF)
- break;
-
- switch (c)
- {
- case 0:
- printf ("option %s", long_options[option_index].name);
- if (optarg)
- printf (" with arg %s", optarg);
- printf ("\n");
- break;
-
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
- if (digit_optind != 0 && digit_optind != this_option_optind)
- printf ("digits occur in two different argv-elements.\n");
- digit_optind = this_option_optind;
- printf ("option %c\n", c);
- break;
-
- case 'a':
- printf ("option a\n");
- break;
-
- case 'b':
- printf ("option b\n");
- break;
-
- case 'c':
- printf ("option c with value `%s'\n", optarg);
- break;
-
- case 'd':
- printf ("option d with value `%s'\n", optarg);
- break;
-
- case '?':
- break;
-
- default:
- printf ("?? getopt returned character code 0%o ??\n", c);
- }
- }
-
- if (optind < argc)
- {
- printf ("non-option ARGV-elements: ");
- while (optind < argc)
- printf ("%s ", argv[optind++]);
- printf ("\n");
- }
-
- exit (0);
-}
-
-#endif /* TEST */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rl...@us...> - 2006-11-20 05:33:35
|
Revision: 17790
http://svn.sourceforge.net/gaim/?rev=17790&view=rev
Author: rlaager
Date: 2006-11-19 21:33:32 -0800 (Sun, 19 Nov 2006)
Log Message:
-----------
Part of SF Patch #1599432 from Leonardo Fernandes
"This patch ... solves a check for NULL that produced an error in the
debug console."
Modified Paths:
--------------
trunk/COPYRIGHT
trunk/libgaim/plugins/log_reader.c
Modified: trunk/COPYRIGHT
===================================================================
--- trunk/COPYRIGHT 2006-11-20 04:05:33 UTC (rev 17789)
+++ trunk/COPYRIGHT 2006-11-20 05:33:32 UTC (rev 17790)
@@ -103,6 +103,7 @@
Gábor Farkas
Jesse Farmer
Gavan Fantom (gavan)
+Leonardo Fernandes
David Fiander
Rob Flynn <ga...@ro...>
Rob Foehl (rwf)
Modified: trunk/libgaim/plugins/log_reader.c
===================================================================
--- trunk/libgaim/plugins/log_reader.c 2006-11-20 04:05:33 UTC (rev 17789)
+++ trunk/libgaim/plugins/log_reader.c 2006-11-20 05:33:32 UTC (rev 17790)
@@ -973,7 +973,8 @@
if (friendly_name != NULL) {
int friendly_name_length = strlen(friendly_name);
- int alias_length = log->account->alias ? strlen(log->account->alias) : 0;
+ const char *alias;
+ int alias_length;
GaimBuddy *buddy = gaim_find_buddy(log->account, log->name);
gboolean from_name_matches;
gboolean to_name_matches;
@@ -981,6 +982,17 @@
if (buddy && buddy->alias)
their_name = buddy->alias;
+ if (log->account->alias)
+ {
+ alias = log->account->alias;
+ alias_length = strlen(alias);
+ }
+ else
+ {
+ alias = "";
+ alias_length = 0;
+ }
+
/* Try to guess which user is me.
* The first step is to determine if either of the names matches either my
* friendly name or alias. For this test, "match" is defined as:
@@ -988,13 +1000,13 @@
*/
from_name_matches = (gaim_str_has_prefix(from_name, friendly_name) &&
!isalnum(*(from_name + friendly_name_length))) ||
- (gaim_str_has_prefix(from_name, log->account->alias) &&
+ (gaim_str_has_prefix(from_name, alias) &&
!isalnum(*(from_name + alias_length)));
to_name_matches = to_name != NULL && (
(gaim_str_has_prefix(to_name, friendly_name) &&
!isalnum(*(to_name + friendly_name_length))) ||
- (gaim_str_has_prefix(to_name, log->account->alias) &&
+ (gaim_str_has_prefix(to_name, alias) &&
!isalnum(*(to_name + alias_length))));
if (from_name_matches) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-11-20 04:05:34
|
Revision: 17789
http://svn.sourceforge.net/gaim/?rev=17789&view=rev
Author: sadrul
Date: 2006-11-19 20:05:33 -0800 (Sun, 19 Nov 2006)
Log Message:
-----------
F10 to show the menu of a window. F11 to show the context-menu. I would've used
shift+F10 if terminfo permitted.
Fix a bug where F10 etc. could not be used for rebinding.
Modified Paths:
--------------
trunk/console/libgnt/gntstyle.c
trunk/console/libgnt/gntwidget.c
trunk/console/libgnt/gntwindow.c
Modified: trunk/console/libgnt/gntstyle.c
===================================================================
--- trunk/console/libgnt/gntstyle.c 2006-11-20 03:57:47 UTC (rev 17788)
+++ trunk/console/libgnt/gntstyle.c 2006-11-20 04:05:33 UTC (rev 17789)
@@ -91,7 +91,7 @@
/* XXX: Need to do something about ctrl/alt+home, end etc. */
#define SPECIAL_KEY(k, code) do { \
- if (strncasecmp(key, k, sizeof(k) - 1) == 0) \
+ if (strcasecmp(key, k) == 0) \
return g_strdup(code); \
} while (0)
Modified: trunk/console/libgnt/gntwidget.c
===================================================================
--- trunk/console/libgnt/gntwidget.c 2006-11-20 03:57:47 UTC (rev 17788)
+++ trunk/console/libgnt/gntwidget.c 2006-11-20 04:05:33 UTC (rev 17789)
@@ -239,6 +239,7 @@
/* This is relevant for all widgets */
gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "context-menu", context_menu,
GNT_KEY_POPUP, NULL);
+ gnt_bindable_register_binding(GNT_BINDABLE_CLASS(klass), "context-menu", GNT_KEY_F11, NULL);
gnt_style_read_actions(G_OBJECT_CLASS_TYPE(klass), GNT_BINDABLE_CLASS(klass));
GNTDEBUG;
Modified: trunk/console/libgnt/gntwindow.c
===================================================================
--- trunk/console/libgnt/gntwindow.c 2006-11-20 03:57:47 UTC (rev 17788)
+++ trunk/console/libgnt/gntwindow.c 2006-11-20 04:05:33 UTC (rev 17789)
@@ -43,6 +43,7 @@
gnt_bindable_class_register_action(bindable, "show-menu", show_menu,
GNT_KEY_CTRL_O, NULL);
+ gnt_bindable_register_binding(bindable, "show-menu", GNT_KEY_F10, NULL);
gnt_style_read_actions(G_OBJECT_CLASS_TYPE(klass), bindable);
GNTDEBUG;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ebl...@us...> - 2006-11-20 03:57:48
|
Revision: 17788
http://svn.sourceforge.net/gaim/?rev=17788&view=rev
Author: eblanton
Date: 2006-11-19 19:57:47 -0800 (Sun, 19 Nov 2006)
Log Message:
-----------
This patch causes jabber to use DNS SRV lookups when registering
jabber accounts. Thanks to George-Cristian B?\195?\174rzan for this. From
Debian Bug #399230.
Modified Paths:
--------------
trunk/COPYRIGHT
trunk/libgaim/protocols/jabber/jabber.c
Modified: trunk/COPYRIGHT
===================================================================
--- trunk/COPYRIGHT 2006-11-20 02:56:35 UTC (rev 17787)
+++ trunk/COPYRIGHT 2006-11-20 03:57:47 UTC (rev 17788)
@@ -26,6 +26,7 @@
Brian Bernas
Paul Betts
Jonas Birmé
+George-Cristian Bîrzan
Eric Blade
Ethan Blanton
Joshua Blanton
Modified: trunk/libgaim/protocols/jabber/jabber.c
===================================================================
--- trunk/libgaim/protocols/jabber/jabber.c 2006-11-20 02:56:35 UTC (rev 17787)
+++ trunk/libgaim/protocols/jabber/jabber.c 2006-11-20 03:57:47 UTC (rev 17788)
@@ -926,10 +926,17 @@
}
if(!js->gsc) {
- if (gaim_proxy_connect(gc, account, server,
- gaim_account_get_int(account, "port", 5222),
- jabber_login_callback, gc) == NULL)
- gaim_connection_error(gc, _("Unable to create socket"));
+ if (connect_server[0]) {
+ jabber_login_connect(js, server,
+ gaim_account_get_int(account,
+ "port", 5222));
+ } else {
+ js->srv_query_data = gaim_srv_resolve("xmpp-client",
+ "tcp",
+ js->user->domain,
+ srv_resolved_cb,
+ js);
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-11-20 02:56:36
|
Revision: 17787
http://svn.sourceforge.net/gaim/?rev=17787&view=rev
Author: sadrul
Date: 2006-11-19 18:56:35 -0800 (Sun, 19 Nov 2006)
Log Message:
-----------
Make the pref-function accessible from dbus.
Modified Paths:
--------------
trunk/libgaim/Makefile.am
Modified: trunk/libgaim/Makefile.am
===================================================================
--- trunk/libgaim/Makefile.am 2006-11-19 22:54:16 UTC (rev 17786)
+++ trunk/libgaim/Makefile.am 2006-11-20 02:56:35 UTC (rev 17787)
@@ -140,7 +140,9 @@
dbus_sources = dbus-server.c dbus-useful.c
dbus_headers = dbus-bindings.h dbus-gaim.h dbus-server.h dbus-useful.h dbus-define-api.h
-dbus_exported = dbus-useful.h dbus-define-api.h account.h blist.h buddyicon.h connection.h conversation.h core.h log.h roomlist.h savedstatuses.h status.h server.h xmlnode.h
+dbus_exported = dbus-useful.h dbus-define-api.h account.h blist.h buddyicon.h \
+ connection.h conversation.h core.h log.h prefs.h roomlist.h \
+ savedstatuses.h status.h server.h xmlnode.h
gaim_build_coreheaders = $(addprefix $(srcdir)/, $(gaim_coreheaders))
dbus_build_exported = $(addprefix $(srcdir)/, $(dbus_exported))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <amc...@us...> - 2006-11-19 22:54:20
|
Revision: 17786
http://svn.sourceforge.net/gaim/?rev=17786&view=rev
Author: amc_grim
Date: 2006-11-19 14:54:16 -0800 (Sun, 19 Nov 2006)
Log Message:
-----------
Guifications moved awhile ago now...
Modified Paths:
--------------
web/htdocs/plugins.php
Modified: web/htdocs/plugins.php
===================================================================
--- web/htdocs/plugins.php 2006-11-19 20:40:34 UTC (rev 17785)
+++ web/htdocs/plugins.php 2006-11-19 22:54:16 UTC (rev 17786)
@@ -18,7 +18,7 @@
),
"guifications" => array(
- "URL" => "http://guifications.sourceforge.net/",
+ "URL" => "http://gaim.guifications.org/trac/wiki/Guifications",
"TEXT" => "Graphical notification when buddies sign on, sign off, go away, etc."
),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rl...@us...> - 2006-11-19 20:40:34
|
Revision: 17785
http://svn.sourceforge.net/gaim/?rev=17785&view=rev
Author: rlaager
Date: 2006-11-19 12:40:34 -0800 (Sun, 19 Nov 2006)
Log Message:
-----------
SF Patch 1571670, Patch 2
"I already have Welker Zsombor in the COPYRIGHTS file,
but that should be Zsombor Welker...
The patch I added is also needed to make the patch work under windows."
Modified Paths:
--------------
trunk/COPYRIGHT
trunk/libgaim/plugins/perl/common/Makefile.mingw
Modified: trunk/COPYRIGHT
===================================================================
--- trunk/COPYRIGHT 2006-11-19 19:58:45 UTC (rev 17784)
+++ trunk/COPYRIGHT 2006-11-19 20:40:34 UTC (rev 17785)
@@ -332,6 +332,7 @@
Jonty Wareing
Eric Warmenhoven
Adam J. Warrington
+Zsombor Welker
Andrew Wellington
Adam Wendt
Dave West
@@ -352,5 +353,4 @@
Nickolai Zeldovich
Marco Ziech
Piotr Zielinski
-Welker Zsombor
Jeroen Zwartepoorte
Modified: trunk/libgaim/plugins/perl/common/Makefile.mingw
===================================================================
--- trunk/libgaim/plugins/perl/common/Makefile.mingw 2006-11-19 19:58:45 UTC (rev 17784)
+++ trunk/libgaim/plugins/perl/common/Makefile.mingw 2006-11-19 20:40:34 UTC (rev 17785)
@@ -41,6 +41,7 @@
Cmds.xs \
Connection.xs \
Conversation.xs \
+ Core.xs \
Debug.xs \
FT.xs \
Gaim.xs \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rl...@us...> - 2006-11-19 19:58:52
|
Revision: 17784
http://svn.sourceforge.net/gaim/?rev=17784&view=rev
Author: rlaager
Date: 2006-11-19 11:58:45 -0800 (Sun, 19 Nov 2006)
Log Message:
-----------
SF Patch #1571670 from zdeqb
"Perl bindings for the functions in core.h and some
bindings for the functions in privacy.h."
I made the following changes:
1. I chose to export gaim_get_core() as Gaim::get_core instead of Gaim::Core::get_core.
2. I don't see any reason to require Perl code to pass bogus values just because C requires them. So, I changed Gaim::Core::quit_cb to NOT take an argument, and to pass NULL to gaim_core_quit_cb().
3. I fixed a typo.
4. I cleaned up some spacing issues.
I noticed that Core.c didn't get created from Core.xs until I re-ran configure. Maybe there's no way to avoid this?
Modified Paths:
--------------
trunk/libgaim/plugins/perl/Makefile.am
trunk/libgaim/plugins/perl/common/Gaim.xs
trunk/libgaim/plugins/perl/common/Privacy.xs
trunk/libgaim/plugins/perl/common/module.h
trunk/libgaim/plugins/perl/common/typemap
Added Paths:
-----------
trunk/libgaim/plugins/perl/common/Core.xs
Modified: trunk/libgaim/plugins/perl/Makefile.am
===================================================================
--- trunk/libgaim/plugins/perl/Makefile.am 2006-11-19 19:14:48 UTC (rev 17783)
+++ trunk/libgaim/plugins/perl/Makefile.am 2006-11-19 19:58:45 UTC (rev 17784)
@@ -50,6 +50,7 @@
common/BuddyList.xs \
common/Cipher.xs \
common/Cmds.xs \
+ common/Core.xs \
common/Connection.xs \
common/Conversation.xs \
common/Debug.xs \
Added: trunk/libgaim/plugins/perl/common/Core.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/Core.xs (rev 0)
+++ trunk/libgaim/plugins/perl/common/Core.xs 2006-11-19 19:58:45 UTC (rev 17784)
@@ -0,0 +1,28 @@
+#include "module.h"
+
+MODULE = Gaim::Core PACKAGE = Gaim::Core PREFIX = gaim_core_
+PROTOTYPES: ENABLE
+
+gboolean
+gaim_core_quit_cb()
+PPCODE:
+ /* The argument to gaim_core_quit_cb is not used,
+ * so there's little point in requiring it on the
+ * Perl side. */
+ RETVAL = gaim_core_quit_cb(NULL);
+ ST(0) = boolSV(RETVAL);
+ sv_2mortal(ST(0));
+
+const char *
+gaim_core_get_version()
+
+const char *
+gaim_core_get_ui()
+
+void
+gaim_core_set_ui_ops(ops)
+ Gaim::Core::UiOps ops
+
+Gaim::Core::UiOps
+gaim_core_get_ui_ops()
+
Property changes on: trunk/libgaim/plugins/perl/common/Core.xs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: trunk/libgaim/plugins/perl/common/Gaim.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/Gaim.xs 2006-11-19 19:14:48 UTC (rev 17783)
+++ trunk/libgaim/plugins/perl/common/Gaim.xs 2006-11-19 19:58:45 UTC (rev 17784)
@@ -11,6 +11,7 @@
GAIM_PERL_BOOT_PROTO(Cmd);
GAIM_PERL_BOOT_PROTO(Connection);
GAIM_PERL_BOOT_PROTO(Conversation);
+GAIM_PERL_BOOT_PROTO(Core);
GAIM_PERL_BOOT_PROTO(Debug);
GAIM_PERL_BOOT_PROTO(Xfer);
GAIM_PERL_BOOT_PROTO(ImgStore);
@@ -50,6 +51,7 @@
GAIM_PERL_BOOT(Cmd);
GAIM_PERL_BOOT(Connection);
GAIM_PERL_BOOT(Conversation);
+ GAIM_PERL_BOOT(Core);
GAIM_PERL_BOOT(Debug);
GAIM_PERL_BOOT(Xfer);
GAIM_PERL_BOOT(ImgStore);
@@ -88,3 +90,10 @@
deinit()
CODE:
gaim_perl_timeout_clear();
+
+
+MODULE = Gaim PACKAGE = Gaim PREFIX = gaim_
+PROTOTYPES: ENABLE
+
+Gaim::Core
+gaim_get_core()
Modified: trunk/libgaim/plugins/perl/common/Privacy.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/Privacy.xs 2006-11-19 19:14:48 UTC (rev 17783)
+++ trunk/libgaim/plugins/perl/common/Privacy.xs 2006-11-19 19:58:45 UTC (rev 17784)
@@ -12,3 +12,32 @@
void
gaim_privacy_set_ui_ops(ops)
Gaim::Privacy::UiOps ops
+
+gboolean
+gaim_privacy_permit_add(account, name, local_only)
+ Gaim::Account account
+ const char * name
+ gboolean local_only
+
+gboolean
+gaim_privacy_permit_remove(account, name, local_only)
+ Gaim::Account account
+ const char * name
+ gboolean local_only
+
+gboolean
+gaim_privacy_deny_add(account, name, local_only)
+ Gaim::Account account
+ const char * name
+ gboolean local_only
+
+gboolean
+gaim_privacy_deny_remove(account, name, local_only)
+ Gaim::Account account
+ const char * name
+ gboolean local_only
+
+gboolean
+gaim_privacy_check(account, who)
+ Gaim::Account account
+ const char * who
Modified: trunk/libgaim/plugins/perl/common/module.h
===================================================================
--- trunk/libgaim/plugins/perl/common/module.h 2006-11-19 19:14:48 UTC (rev 17783)
+++ trunk/libgaim/plugins/perl/common/module.h 2006-11-19 19:58:45 UTC (rev 17784)
@@ -24,6 +24,7 @@
#include "cmds.h"
#include "connection.h"
#include "conversation.h"
+#include "core.h"
#include "debug.h"
#include "desktopitem.h"
#include "eventloop.h"
@@ -108,6 +109,11 @@
typedef GaimConvChat * Gaim__Conversation__Chat;
typedef GaimConvChatBuddy * Gaim__Conversation__ChatBuddy;
+/* core.h */
+
+typedef GaimCore * Gaim__Core;
+typedef GaimCoreUiOps * Gaim__Core__UiOps;
+
/* debug.h */
typedef GaimDebugLevel Gaim__DebugLevel;
Modified: trunk/libgaim/plugins/perl/common/typemap
===================================================================
--- trunk/libgaim/plugins/perl/common/typemap 2006-11-19 19:14:48 UTC (rev 17783)
+++ trunk/libgaim/plugins/perl/common/typemap 2006-11-19 19:58:45 UTC (rev 17784)
@@ -68,6 +68,8 @@
Gaim::Conversation::ChatBuddy T_GaimObj
Gaim::Conversation::IM T_GaimObj
Gaim::Conversation::UiOps T_GaimObj
+Gaim::Core T_GaimObj
+Gaim::Core::UiOps T_GaimObj
Gaim::Desktop::Item T_GaimObj
Gaim::DesktopItemType T_IV
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
6 messages has been excluded from this view by a project administrator.
