Mercurial > pidgin
changeset 17526:35de9a54008e
merge of '5f583403bf6a3522123918b975ce234ffd86f3b4'
and 'a825e87da2ebbdbfb6607c333cbac975d1f8a9d1'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Wed, 06 Jun 2007 20:21:15 +0000 |
| parents | 6d0bc0b23440 (diff) 4e4007a7d92e (current diff) |
| children | 89adae2f1a6e |
| files | |
| diffstat | 10 files changed, 40 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/conversation.c Wed Jun 06 19:28:25 2007 +0000 +++ b/libpurple/conversation.c Wed Jun 06 20:21:15 2007 +0000 @@ -1810,7 +1810,7 @@ if (ops != NULL && ops->chat_remove_users != NULL) { for (l = users; l; l = l->next) { PurpleConvChatBuddy *cb = l->data; - names = g_list_append(names, cb->name); + names = g_list_prepend(names, cb->name); } ops->chat_remove_users(conv, names); g_list_free(names);
--- a/libpurple/dbus-analyze-functions.py Wed Jun 06 19:28:25 2007 +0000 +++ b/libpurple/dbus-analyze-functions.py Wed Jun 06 20:21:15 2007 +0000 @@ -165,9 +165,9 @@ self.returncode = [] def flush(self): - paramslist = ", ".join(self.paramshdr) - if (paramslist == "") : - paramslist = "void" + paramslist = ", ".join(self.paramshdr) + if (paramslist == "") : + paramslist = "void" print "%s %s(%s)" % (self.functiontype, self.function.name, paramslist), @@ -279,7 +279,7 @@ for decl in self.cdecls: print decl - print "\t%s(message_DBUS, error_DBUS, " % self.argfunc, + print "\t%s(message_DBUS, error_DBUS," % self.argfunc, for param in self.cparams: print "DBUS_TYPE_%s, &%s," % param, print "DBUS_TYPE_INVALID);" @@ -289,14 +289,14 @@ for code in self.ccode: print code - print "\treply_DBUS = dbus_message_new_method_return (message_DBUS);" + print "\treply_DBUS = dbus_message_new_method_return (message_DBUS);" - print "\tdbus_message_append_args(reply_DBUS, ", + print "\tdbus_message_append_args(reply_DBUS,", for param in self.cparamsout: if type(param) is str: - print "%s, " % param + print "%s," % param else: - print "DBUS_TYPE_%s, &%s, " % param, + print "DBUS_TYPE_%s, &%s," % param, print "DBUS_TYPE_INVALID);" for code in self.ccodeout:
--- a/libpurple/network.c Wed Jun 06 19:28:25 2007 +0000 +++ b/libpurple/network.c Wed Jun 06 20:21:15 2007 +0000 @@ -598,8 +598,6 @@ void nm_callback_func(libnm_glib_ctx* ctx, gpointer user_data) { - GList *l; - PurpleAccount *account; static libnm_glib_state prev = LIBNM_NO_DBUS; libnm_glib_state current; PurpleConnectionUiOps *ui_ops = purple_connections_get_ui_ops();
--- a/libpurple/plugins/ssl/ssl-nss.c Wed Jun 06 19:28:25 2007 +0000 +++ b/libpurple/plugins/ssl/ssl-nss.c Wed Jun 06 20:21:15 2007 +0000 @@ -311,8 +311,13 @@ if(!nss_data) return; - if (nss_data->in) PR_Close(nss_data->in); - /* if (nss_data->fd) PR_Close(nss_data->fd); */ + if (nss_data->in) { + PR_Close(nss_data->in); + gsc->fd = -1; + } else if (nss_data->fd) { + PR_Close(nss_data->fd); + gsc->fd = -1; + } if (nss_data->handshake_handler) purple_input_remove(nss_data->handshake_handler);
--- a/libpurple/plugins/tcl/tcl.c Wed Jun 06 19:28:25 2007 +0000 +++ b/libpurple/plugins/tcl/tcl.c Wed Jun 06 20:21:15 2007 +0000 @@ -457,11 +457,23 @@ if ((version = wpurple_read_reg_string(HKEY_LOCAL_MACHINE, regkey, "CurrentVersion")) || (version = wpurple_read_reg_string(HKEY_CURRENT_USER, regkey, "CurrentVersion"))) { - char *path; + char *path = NULL; char *regkey2; + char **tokens; + int major = 0, minor = 0, micro = 0; + + tokens = g_strsplit(version, ".", 0); + if (tokens[0] && tokens[1] && tokens[2]) { + major = atoi(tokens[0]); + minor = atoi(tokens[1]); + micro = atoi(tokens[2]); + } + g_strfreev(tokens); regkey2 = g_strdup_printf("%s%s\\", regkey, version); - if ((path = wpurple_read_reg_string(HKEY_LOCAL_MACHINE, regkey2, NULL)) || (path = wpurple_read_reg_string(HKEY_CURRENT_USER, regkey2, NULL))) { + if (!(major == 8 && minor == 4 && micro >= 5)) + purple_debug(PURPLE_DEBUG_INFO, "tcl", "Unsupported ActiveTCL version %s found.\n", version); + else if ((path = wpurple_read_reg_string(HKEY_LOCAL_MACHINE, regkey2, NULL)) || (path = wpurple_read_reg_string(HKEY_CURRENT_USER, regkey2, NULL))) { char *tclpath; char *tkpath;
--- a/libpurple/protocols/jabber/.todo Wed Jun 06 19:28:25 2007 +0000 +++ b/libpurple/protocols/jabber/.todo Wed Jun 06 20:21:15 2007 +0000 @@ -38,7 +38,7 @@ formatted. enhancement-request so that the birthday field in the setinfo form would split up into relevant fields allowing for a strict syntax (like year--month--day or so, perhaps even dropdown menus) </note> <note priority="low" time="1037890968"> - have set info pre-fill values from the server when no local vcard exists. this will help people migrating to gaim + have set info pre-fill values from the server when no local vcard exists. this will help people migrating to libpurple-based clients </note> </note> <note priority="verylow" time="1036044192">
--- a/libpurple/protocols/oscar/.todo Wed Jun 06 19:28:25 2007 +0000 +++ b/libpurple/protocols/oscar/.todo Wed Jun 06 20:21:15 2007 +0000 @@ -15,16 +15,10 @@ <note priority="veryhigh" time="1036040919"> some way to close direct connect w/out closing convo. </note> - <note priority="low" time="1036040970"> - canceled direct im should still allow new attempt - </note> <note priority="low" time="1036041084"> failed direct im attempt should allow new attempt some way to cancel an attempt that isn't happening </note> </note> - <note priority="low" time="1036041105"> - Colors in Chat room are wrong (using Gold too much) - </note> <note priority="verylow" time="1036041121"> Voice Chat </note> @@ -44,7 +38,7 @@ color support </note> <note priority="high" time="1036041251"> - set status message and of course when gaim can set them, it needs to be able to get the ones it sets. (yes this is redundant. its a reflection of my current mood) + set status message and of course when libpurple can set them, it needs to be able to get the ones it sets. (yes this is redundant. its a reflection of my current mood) </note> <note priority="medium" time="1036041165"> Chat (this is different from aim chat) @@ -66,6 +60,6 @@ </note> </note> <note priority="medium" time="1036040870"> - The order of groups and buddies in the server list is not updated when groups and buddies are re-arranged locally in Gaim. + The order of groups and buddies in the server list is not updated when groups and buddies are re-arranged locally in libpurple. </note> </todo>
--- a/libpurple/protocols/oscar/AUTHORS Wed Jun 06 19:28:25 2007 +0000 +++ b/libpurple/protocols/oscar/AUTHORS Wed Jun 06 20:21:15 2007 +0000 @@ -35,7 +35,7 @@ N: Eric Warmenhoven T: 1998-2001 E: warmenhoven a.t linux d.o.t com -D: Some OFT info, author of the faim interface for gaim +D: Some OFT info, initial author of the libpurple-side of the oscar protocol plugin N: Brock Wilcox T: 1998-2001
--- a/libpurple/protocols/qq/AUTHORS Wed Jun 06 19:28:25 2007 +0000 +++ b/libpurple/protocols/qq/AUTHORS Wed Jun 06 20:21:15 2007 +0000 @@ -1,7 +1,7 @@ Code Contributors ===== puzzlebird : original author -gfhuang : patches for gaim 2.0.0beta2, maintainer +gfhuang : patches for libpurple 2.0.0beta2, maintainer henryouly : file transfer, udp sock5 proxy and qq_show, maintainer hzhr : maintainer joymarquis : maintainer @@ -10,7 +10,7 @@ yyw : improved performance on PPC linux lvxiang : provided ip to location original code csyfek : faces -markhuetsch : OpenQ merge into gaim, maintainer 2006-2007 +markhuetsch : OpenQ merge into libpurple, maintainer 2006-2007 Acknowledgement =====
--- a/libpurple/protocols/toc/PROTOCOL Wed Jun 06 19:28:25 2007 +0000 +++ b/libpurple/protocols/toc/PROTOCOL Wed Jun 06 20:21:15 2007 +0000 @@ -14,10 +14,10 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# Note from Jim Duchek, gaim maintainer -- this may not be the latest -# version of this document, I provide it as a service. Download a copy -# of TiK (http://www.aim.aol.com/tik/) for the latest version of this -# doc. +# Note from Jim Duchek, former libpurple maintainer -- this may not be +# the latest version of this document, I provide it as a service. +# Download a copy of TiK (http://www.aim.aol.com/tik/) for the latest +# version of this doc. # Note from Eric Warmenhoven, random guy -- this appears to be the last # published version of the protocol, and AOL has stopped hosting the TiK