From: <sea...@us...> - 2006-09-01 22:15:38
|
Revision: 17119 http://svn.sourceforge.net/gaim/?rev=17119&view=rev Author: seanegan Date: 2006-09-01 15:15:34 -0700 (Fri, 01 Sep 2006) Log Message: ----------- JEP 153 says icons SHOULD be no larger than 96x96, so let's enforce that on the client Modified Paths: -------------- trunk/libgaim/protocols/jabber/jabber.c Modified: trunk/libgaim/protocols/jabber/jabber.c =================================================================== --- trunk/libgaim/protocols/jabber/jabber.c 2006-09-01 20:19:08 UTC (rev 17118) +++ trunk/libgaim/protocols/jabber/jabber.c 2006-09-01 22:15:34 UTC (rev 17119) @@ -1831,7 +1831,7 @@ OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME, NULL, /* user_splits */ NULL, /* protocol_options */ - {"jpeg,gif,png", 0, 0, 96, 96, GAIM_ICON_SCALE_DISPLAY}, /* icon_spec */ + {"jpeg,gif,png", 0, 0, 96, 96, GAIM_ICON_SCALE_SEND | GAIM_ICON_SCALE_DISPLAY}, /* icon_spec */ jabber_list_icon, /* list_icon */ jabber_list_emblems, /* list_emblems */ jabber_status_text, /* status_text */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sea...@us...> - 2006-09-01 22:45:46
|
Revision: 17120 http://svn.sourceforge.net/gaim/?rev=17120&view=rev Author: seanegan Date: 2006-09-01 15:45:42 -0700 (Fri, 01 Sep 2006) Log Message: ----------- Also, let's scale to PNG to preserve transparency. Modified Paths: -------------- trunk/libgaim/protocols/jabber/jabber.c Modified: trunk/libgaim/protocols/jabber/jabber.c =================================================================== --- trunk/libgaim/protocols/jabber/jabber.c 2006-09-01 22:15:34 UTC (rev 17119) +++ trunk/libgaim/protocols/jabber/jabber.c 2006-09-01 22:45:42 UTC (rev 17120) @@ -1831,7 +1831,7 @@ OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME, NULL, /* user_splits */ NULL, /* protocol_options */ - {"jpeg,gif,png", 0, 0, 96, 96, GAIM_ICON_SCALE_SEND | GAIM_ICON_SCALE_DISPLAY}, /* icon_spec */ + {"png,jpg,gif", 0, 0, 96, 96, GAIM_ICON_SCALE_SEND | GAIM_ICON_SCALE_DISPLAY}, /* icon_spec */ jabber_list_icon, /* list_icon */ jabber_list_emblems, /* list_emblems */ jabber_status_text, /* status_text */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sa...@us...> - 2006-09-17 22:43:17
|
Revision: 17297 http://svn.sourceforge.net/gaim/?rev=17297&view=rev Author: sadrul Date: 2006-09-17 15:43:01 -0700 (Sun, 17 Sep 2006) Log Message: ----------- Use the correct function for send_raw in jabber. Modified Paths: -------------- trunk/libgaim/protocols/jabber/jabber.c Modified: trunk/libgaim/protocols/jabber/jabber.c =================================================================== --- trunk/libgaim/protocols/jabber/jabber.c 2006-09-17 21:29:59 UTC (rev 17296) +++ trunk/libgaim/protocols/jabber/jabber.c 2006-09-17 22:43:01 UTC (rev 17297) @@ -328,7 +328,7 @@ return; } -int jabber_prpl_send_raw(GaimConnection *gc, const char *buf, int len) +static int jabber_prpl_send_raw(GaimConnection *gc, const char *buf, int len) { JabberStream *js = (JabberStream*)gc->proto_data; jabber_send_raw(js, buf, len); @@ -1891,7 +1891,7 @@ jabber_si_new_xfer, /* new_xfer */ jabber_offline_message, /* offline_message */ NULL, /* whiteboard_prpl_ops */ - jabber_send_raw, /* send_raw */ + jabber_prpl_send_raw, /* send_raw */ }; static gboolean load_plugin(GaimPlugin *plugin) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-09-19 23:43:11
|
Revision: 17324 http://svn.sourceforge.net/gaim/?rev=17324&view=rev Author: thekingant Date: 2006-09-19 16:43:09 -0700 (Tue, 19 Sep 2006) Log Message: ----------- This "Require TLS" option isn't used anywhere... Modified Paths: -------------- trunk/libgaim/protocols/jabber/jabber.c Modified: trunk/libgaim/protocols/jabber/jabber.c =================================================================== --- trunk/libgaim/protocols/jabber/jabber.c 2006-09-19 23:27:17 UTC (rev 17323) +++ trunk/libgaim/protocols/jabber/jabber.c 2006-09-19 23:43:09 UTC (rev 17324) @@ -1966,9 +1966,6 @@ prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - option = gaim_account_option_bool_new(_("Require TLS"), "require_tls", TRUE); - prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - option = gaim_account_option_bool_new(_("Force old (port 5223) SSL"), "old_ssl", FALSE); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sea...@us...> - 2006-09-21 21:56:21
|
Revision: 17334 http://svn.sourceforge.net/gaim/?rev=17334&view=rev Author: seanegan Date: 2006-09-21 14:56:19 -0700 (Thu, 21 Sep 2006) Log Message: ----------- There are a bunch of things we don't send as an xmlnode, so here's a sending-text signal for plugins that care about that Modified Paths: -------------- trunk/libgaim/protocols/jabber/jabber.c Modified: trunk/libgaim/protocols/jabber/jabber.c =================================================================== --- trunk/libgaim/protocols/jabber/jabber.c 2006-09-21 12:47:44 UTC (rev 17333) +++ trunk/libgaim/protocols/jabber/jabber.c 2006-09-21 21:56:19 UTC (rev 17334) @@ -255,7 +255,9 @@ /* If we've got a security layer, we need to encode the data, * splitting it on the maximum buffer length negotiated */ - + + gaim_signal_emit(my_protocol, "jabber-sending-text", js->gc, data); + #ifdef HAVE_CYRUS_SASL if (js->sasl_maxbuf>0) { int pos; @@ -1906,6 +1908,12 @@ gaim_value_new(GAIM_TYPE_SUBTYPE, GAIM_SUBTYPE_CONNECTION), gaim_value_new_outgoing(GAIM_TYPE_SUBTYPE, GAIM_SUBTYPE_XMLNODE)); + gaim_signal_register(plugin, "jabber-sending-text", + gaim_marshal_VOID__POINTER_POINTER, NULL, 2, + gaim_value_new(GAIM_TYPE_SUBTYPE, GAIM_SUBTYPE_CONNECTION), + gaim_value_new(GAIM_TYPE_STRING)); + + return TRUE; } @@ -1914,7 +1922,9 @@ gaim_signal_unregister(plugin, "jabber-receiving-xmlnode"); gaim_signal_unregister(plugin, "jabber-sending-xmlnode"); - + + gaim_signal_unregister(plugin, "jabber-sending-text"); + return TRUE; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ev...@us...> - 2006-11-12 18:34:35
|
Revision: 17740 http://svn.sourceforge.net/gaim/?rev=17740&view=rev Author: evands Date: 2006-11-12 10:34:25 -0800 (Sun, 12 Nov 2006) Log Message: ----------- As with jabber_recv_cb_ssl(), jabber_login_callback_ssl() needs to either be cancelled properly or check to ensure its GaimConnection is valid when it is triggered. Since the former is not done yet, I've added the latter, with the same TODO comment as is present in jabber_recv_cb_ssl(). Modified Paths: -------------- trunk/libgaim/protocols/jabber/jabber.c Modified: trunk/libgaim/protocols/jabber/jabber.c =================================================================== --- trunk/libgaim/protocols/jabber/jabber.c 2006-11-11 23:35:07 UTC (rev 17739) +++ trunk/libgaim/protocols/jabber/jabber.c 2006-11-12 18:34:25 UTC (rev 17740) @@ -430,8 +430,16 @@ GaimInputCondition cond) { GaimConnection *gc = data; - JabberStream *js = gc->proto_data; + JabberStream *js; + /* TODO: It should be possible to make this check unnecessary */ + if(!GAIM_CONNECTION_IS_VALID(gc)) { + gaim_ssl_close(gsc); + return; + } + + js = gc->proto_data; + if(js->state == JABBER_STREAM_CONNECTING) jabber_send_raw(js, "<?xml version='1.0' ?>", -1); jabber_stream_set_state(js, JABBER_STREAM_INITIALIZING); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sea...@us...> - 2006-12-08 02:57:50
|
Revision: 17922 http://svn.sourceforge.net/gaim/?rev=17922&view=rev Author: seanegan Date: 2006-12-07 18:57:50 -0800 (Thu, 07 Dec 2006) Log Message: ----------- small leak Modified Paths: -------------- trunk/libgaim/protocols/jabber/jabber.c Modified: trunk/libgaim/protocols/jabber/jabber.c =================================================================== --- trunk/libgaim/protocols/jabber/jabber.c 2006-12-08 02:51:47 UTC (rev 17921) +++ trunk/libgaim/protocols/jabber/jabber.c 2006-12-08 02:57:50 UTC (rev 17922) @@ -997,6 +997,7 @@ if(js->sasl_cb) g_free(js->sasl_cb); #endif + g_free(js->server_name); g_free(js); gc->proto_data = NULL; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-12-11 17:48:44
|
Revision: 17961 http://svn.sourceforge.net/gaim/?rev=17961&view=rev Author: thekingant Date: 2006-12-11 09:48:40 -0800 (Mon, 11 Dec 2006) Log Message: ----------- XEP-0084 and XEP-0153 both say, "the image height and width SHOULD be between thirty-two (32) and ninety-six (96) pixels." I realize this is a "should" and not a "must," but I think it makes sense for us to follow it. Especially if we're already imposing the upper-bound. Hey, we should add a maximum filesize to this icon_spec struct. Modified Paths: -------------- trunk/libgaim/protocols/jabber/jabber.c Modified: trunk/libgaim/protocols/jabber/jabber.c =================================================================== --- trunk/libgaim/protocols/jabber/jabber.c 2006-12-11 13:32:53 UTC (rev 17960) +++ trunk/libgaim/protocols/jabber/jabber.c 2006-12-11 17:48:40 UTC (rev 17961) @@ -1852,7 +1852,7 @@ OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME | OPT_PROTO_MAIL_CHECK, NULL, /* user_splits */ NULL, /* protocol_options */ - {"png,gif,jpeg", 0, 0, 96, 96, GAIM_ICON_SCALE_SEND | GAIM_ICON_SCALE_DISPLAY}, /* icon_spec */ + {"png,gif,jpeg", 32, 32, 96, 96, GAIM_ICON_SCALE_SEND | GAIM_ICON_SCALE_DISPLAY}, /* icon_spec */ jabber_list_icon, /* list_icon */ jabber_list_emblems, /* list_emblems */ jabber_status_text, /* status_text */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dat...@us...> - 2007-03-07 02:36:50
|
Revision: 18200 http://svn.sourceforge.net/gaim/?rev=18200&view=rev Author: datallah Date: 2007-03-06 18:36:48 -0800 (Tue, 06 Mar 2007) Log Message: ----------- Simon Wilkinson noticed that this check was invalid and caused authentications to hang. Modified Paths: -------------- trunk/libgaim/protocols/jabber/jabber.c Modified: trunk/libgaim/protocols/jabber/jabber.c =================================================================== --- trunk/libgaim/protocols/jabber/jabber.c 2007-03-06 18:21:48 UTC (rev 18199) +++ trunk/libgaim/protocols/jabber/jabber.c 2007-03-07 02:36:48 UTC (rev 18200) @@ -283,7 +283,7 @@ sasl_encode(js->sasl, &data[pos], towrite, &out, &olen); pos += towrite; - if (js->writeh > 0) + if (js->writeh == 0) ret = jabber_do_send(js, out, olen); else { ret = -1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |