Menu
▾
▴
pidgin-commits
|
From: <the...@us...> - 2006-08-22 01:56:07
|
Revision: 16967 Author: thekingant Date: 2006-08-21 18:55:56 -0700 (Mon, 21 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16967&view=rev Log Message: ----------- Add a comment about something I noticed Modified Paths: -------------- trunk/libgaim/protocols/oscar/oscar.c Modified: trunk/libgaim/protocols/oscar/oscar.c =================================================================== --- trunk/libgaim/protocols/oscar/oscar.c 2006-08-21 22:58:26 UTC (rev 16966) +++ trunk/libgaim/protocols/oscar/oscar.c 2006-08-22 01:55:56 UTC (rev 16967) @@ -4135,6 +4135,13 @@ bi->ico_sent = FALSE; } + /* + * TODO: + * For some reason sending our icon to people only works + * when we're the ones who initiated the conversation. If + * the other person sends the first IM then they never get + * the icon. We should fix that. + */ if (!bi->ico_informed) { gaim_debug_info("oscar", "Claiming to have a buddy icon\n"); 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:46:43
|
Revision: 17121
http://svn.sourceforge.net/gaim/?rev=17121&view=rev
Author: seanegan
Date: 2006-09-01 15:46:39 -0700 (Fri, 01 Sep 2006)
Log Message:
-----------
We should do the same for OSCAR icons
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/oscar.c
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-09-01 22:45:42 UTC (rev 17120)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-09-01 22:46:39 UTC (rev 17121)
@@ -6427,7 +6427,7 @@
OPT_PROTO_MAIL_CHECK | OPT_PROTO_IM_IMAGE,
NULL, /* user_splits */
NULL, /* protocol_options */
- {"jpeg,gif,bmp,ico", 48, 48, 50, 50,
+ {"gif,jpg,bmp,ico", 48, 48, 50, 50,
GAIM_ICON_SCALE_SEND | GAIM_ICON_SCALE_DISPLAY}, /* icon_spec */
oscar_list_icon, /* list_icon */
oscar_list_emblems, /* list_emblems */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nos...@us...> - 2006-09-21 12:47:59
|
Revision: 17333
http://svn.sourceforge.net/gaim/?rev=17333&view=rev
Author: nosnilmot
Date: 2006-09-21 05:47:44 -0700 (Thu, 21 Sep 2006)
Log Message:
-----------
My gdk doesn't support writing gif files (do any of them?) and "jpeg" is the
required identifier for jpeg images, jpg just doesn't cut it.
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/oscar.c
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-09-21 03:07:04 UTC (rev 17332)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-09-21 12:47:44 UTC (rev 17333)
@@ -6426,7 +6426,7 @@
OPT_PROTO_MAIL_CHECK | OPT_PROTO_IM_IMAGE,
NULL, /* user_splits */
NULL, /* protocol_options */
- {"gif,jpg,bmp,ico", 48, 48, 50, 50,
+ {"gif,jpeg,bmp,ico", 48, 48, 50, 50,
GAIM_ICON_SCALE_SEND | GAIM_ICON_SCALE_DISPLAY}, /* icon_spec */
oscar_list_icon, /* list_icon */
oscar_list_emblems, /* list_emblems */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-09-28 06:32:56
|
Revision: 17388
http://svn.sourceforge.net/gaim/?rev=17388&view=rev
Author: thekingant
Date: 2006-09-27 23:32:53 -0700 (Wed, 27 Sep 2006)
Log Message:
-----------
It looks like AOL now differentiates between "invalid screen name"
and "incorrect password" in their authentication failed error code.
Neat.
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/oscar.c
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-09-28 04:02:21 UTC (rev 17387)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-09-28 06:32:53 UTC (rev 17388)
@@ -1276,10 +1276,15 @@
if (info->errorcode || !info->bosip || !info->cookielen || !info->cookie) {
char buf[256];
switch (info->errorcode) {
+ case 0x01:
+ /* Unregistered screen name */
+ gc->wants_to_die = TRUE;
+ gaim_connection_error(gc, _("Incorrect screen name."));
+ break;
case 0x05:
/* Incorrect nick/password */
gc->wants_to_die = TRUE;
- gaim_connection_error(gc, _("Incorrect nickname or password."));
+ gaim_connection_error(gc, _("Incorrect password."));
break;
case 0x11:
/* Suspended account */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-09-28 07:05:38
|
Revision: 17390
http://svn.sourceforge.net/gaim/?rev=17390&view=rev
Author: thekingant
Date: 2006-09-28 00:05:33 -0700 (Thu, 28 Sep 2006)
Log Message:
-----------
This commit message isn't worth the Internet it's printed on
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/oscar.c
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-09-28 07:01:47 UTC (rev 17389)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-09-28 07:05:33 UTC (rev 17390)
@@ -1279,7 +1279,7 @@
case 0x01:
/* Unregistered screen name */
gc->wants_to_die = TRUE;
- gaim_connection_error(gc, _("Incorrect screen name."));
+ gaim_connection_error(gc, _("Invalid screen name."));
break;
case 0x05:
/* Incorrect nick/password */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-11-03 17:38:21
|
Revision: 17662
http://svn.sourceforge.net/gaim/?rev=17662&view=rev
Author: thekingant
Date: 2006-11-03 09:11:43 -0800 (Fri, 03 Nov 2006)
Log Message:
-----------
If an oscar account is unable to connect because the password is wrong,
then set the password to the empty string. This might help address
bug 1414151, "Too many steps to be able to re-enter a password."
How do people feel about this? We could probably do it for MSN, too.
Also, beta 5 on Sunday?
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/oscar.c
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-11-03 04:41:50 UTC (rev 17661)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-11-03 17:11:43 UTC (rev 17662)
@@ -1282,8 +1282,9 @@
gaim_connection_error(gc, _("Invalid screen name."));
break;
case 0x05:
- /* Incorrect nick/password */
+ /* Incorrect password */
gc->wants_to_die = TRUE;
+ gaim_account_set_password(account, NULL);
gaim_connection_error(gc, _("Incorrect password."));
break;
case 0x11:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-11-05 23:30:24
|
Revision: 17674
http://svn.sourceforge.net/gaim/?rev=17674&view=rev
Author: thekingant
Date: 2006-11-05 15:22:41 -0800 (Sun, 05 Nov 2006)
Log Message:
-----------
Only clear out the password when the server tells us it is incorrect if
the user is not saving passwords for this account
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/oscar.c
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-11-05 17:37:09 UTC (rev 17673)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-11-05 23:22:41 UTC (rev 17674)
@@ -1284,7 +1284,8 @@
case 0x05:
/* Incorrect password */
gc->wants_to_die = TRUE;
- gaim_account_set_password(account, NULL);
+ if (!gaim_account_get_remember_password(account))
+ gaim_account_set_password(account, NULL);
gaim_connection_error(gc, _("Incorrect password."));
break;
case 0x11:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-11-28 08:44:13
|
Revision: 17837
http://svn.sourceforge.net/gaim/?rev=17837&view=rev
Author: thekingant
Date: 2006-11-28 00:44:12 -0800 (Tue, 28 Nov 2006)
Log Message:
-----------
Get rid of a silly prompt and skip straight to asking the Gaim user to
enter a message to use when requesting authorization when adding an
ICQ user to your buddylist
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/oscar.c
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-11-28 07:26:00 UTC (rev 17836)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-11-28 08:44:12 UTC (rev 17837)
@@ -2147,16 +2147,6 @@
}
static void
-gaim_auth_request_msgprompt(struct name_data *data)
-{
- gaim_request_input(data->gc, NULL, _("Authorization Request Message:"),
- NULL, _("Please authorize me!"), TRUE, FALSE, NULL,
- _("OK"), G_CALLBACK(gaim_auth_request),
- _("Cancel"), G_CALLBACK(oscar_free_name_data),
- data);
-}
-
-static void
gaim_auth_dontrequest(struct name_data *data)
{
GaimConnection *gc = data->gc;
@@ -2170,31 +2160,19 @@
static void
-gaim_auth_sendrequest(GaimConnection *gc, char *name)
+gaim_auth_sendrequest(GaimConnection *gc, const char *name)
{
- struct name_data *data = g_new0(struct name_data, 1);
- GaimBuddy *buddy;
- gchar *dialog_msg, *nombre;
+ struct name_data *data;
- buddy = gaim_find_buddy(gc->account, name);
- if (buddy && (gaim_buddy_get_alias_only(buddy)))
- nombre = g_strdup_printf("%s (%s)", name, gaim_buddy_get_alias_only(buddy));
- else
- nombre = NULL;
-
- dialog_msg = g_strdup_printf(_("The user %s requires authorization before being added to a buddy list. Do you want to send an authorization request?"), (nombre ? nombre : name));
+ data = g_new0(struct name_data, 1);
data->gc = gc;
data->name = g_strdup(name);
- data->nick = NULL;
- gaim_request_action(gc, NULL, _("Request Authorization"), dialog_msg,
- 0, data, 2,
- _("_Request Authorization"),
- G_CALLBACK(gaim_auth_request_msgprompt),
- _("Cancel"), G_CALLBACK(gaim_auth_dontrequest));
-
- g_free(dialog_msg);
- g_free(nombre);
+ gaim_request_input(data->gc, NULL, _("Authorization Request Message:"),
+ NULL, _("Please authorize me!"), TRUE, FALSE, NULL,
+ _("OK"), G_CALLBACK(gaim_auth_request),
+ _("Cancel"), G_CALLBACK(gaim_auth_dontrequest),
+ data);
}
@@ -5821,7 +5799,8 @@
aim_locate_getinfoshort(gc->proto_data, gaim_buddy_get_name(buddy), 0x00000003);
}
-GList *oscar_buddy_menu(GaimBuddy *buddy) {
+static GList *
+oscar_buddy_menu(GaimBuddy *buddy) {
GaimConnection *gc;
OscarData *od;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-12-01 04:28:28
|
Revision: 17862
http://svn.sourceforge.net/gaim/?rev=17862&view=rev
Author: thekingant
Date: 2006-11-30 20:27:36 -0800 (Thu, 30 Nov 2006)
Log Message:
-----------
Don't attempt to check for new mail for screen names in the form
of email addresses. This fixes sf bug #1595188. It mail
checking currently works for @mac.com screen names then this
will break it (unfortunate side-effect).
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/oscar.c
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-12-01 04:17:15 UTC (rev 17861)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-12-01 04:27:36 UTC (rev 17862)
@@ -3527,7 +3527,17 @@
}
aim_reqservice(od, SNAC_FAMILY_CHATNAV);
- if (od->authinfo->email != NULL)
+
+ /*
+ * The "if" statement here is a pathetic attempt to not attempt to
+ * connect to the alerts servce (aka email notification) if this
+ * screen name does not support it. I think mail notification
+ * works for @mac.com accounts but does not work for the newer
+ * @anythingelse.com accounts. If that's true then this change
+ * breaks mail notification for @mac.com accounts, but it gets rid
+ * of an annoying error at signon for @anythingelse.com accounts.
+ */
+ if ((od->authinfo->email != NULL) && ((strchr(gc->account->username, '@') == NULL)))
aim_reqservice(od, SNAC_FAMILY_ALERT);
return 1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ev...@us...> - 2006-12-07 15:15:31
|
Revision: 17917
http://svn.sourceforge.net/gaim/?rev=17917&view=rev
Author: evands
Date: 2006-12-07 07:15:23 -0800 (Thu, 07 Dec 2006)
Log Message:
-----------
oscar_encoding_extract() is useful for a plugin or UI doing oscar prpl specific things, such as getting a contact's profile directly (rather than the full formatted info text sent to gaim_notify_userinfo()). Removed the static so it can be used elsewhere.
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/oscar.c
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-12-07 14:08:45 UTC (rev 17916)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-12-07 15:15:23 UTC (rev 17917)
@@ -268,7 +268,7 @@
* one of us-ascii, utf-8, iso-8859-1, or unicode-2-0, and
* return a newly allocated string containing bleh.
*/
-static gchar *
+gchar *
oscar_encoding_extract(const char *encoding)
{
gchar *ret = NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ev...@us...> - 2006-12-10 03:44:42
|
Revision: 17934
http://svn.sourceforge.net/gaim/?rev=17934&view=rev
Author: evands
Date: 2006-12-09 19:44:35 -0800 (Sat, 09 Dec 2006)
Log Message:
-----------
I forgot to add section breaks in the appropriate places in oscar in [17929]
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/oscar.c
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-12-10 03:01:42 UTC (rev 17933)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-12-10 03:44:35 UTC (rev 17934)
@@ -2613,6 +2613,7 @@
gaim_notify_user_info_add_pair(user_info, _("UIN"), who);
gaim_notify_user_info_add_pair(user_info, _("Status"), statusmsg);
+ gaim_notify_user_info_add_section_break(user_info);
gaim_notify_user_info_add_pair(user_info, NULL, g_strjoinv("<BR>", splitmsg));
g_free(statusmsg);
@@ -2848,6 +2849,7 @@
g_free(tmp);
if (away_utf8 != NULL) {
tmp = gaim_str_sub_away_formatters(away_utf8, gaim_account_get_username(account));
+ gaim_notify_user_info_add_section_break(user_info);
oscar_user_info_add_pair(user_info, NULL, tmp);
g_free(tmp);
g_free(away_utf8);
@@ -2861,6 +2863,7 @@
g_free(tmp);
if (info_utf8 != NULL) {
tmp = gaim_str_sub_away_formatters(info_utf8, gaim_account_get_username(account));
+ gaim_notify_user_info_add_section_break(user_info);
oscar_user_info_add_pair(user_info, _("Profile"), tmp);
g_free(tmp);
g_free(info_utf8);
@@ -3703,9 +3706,8 @@
}
oscar_user_info_convert_and_add(account, user_info, _("Additional Information"), info->info);
+ gaim_notify_user_info_add_section_break(user_info);
-/* g_string_append_printf(str, "<hr>"); */
-
if ((info->homeaddr && (info->homeaddr[0])) || (info->homecity && info->homecity[0]) || (info->homestate && info->homestate[0]) || (info->homezip && info->homezip[0])) {
tmp = g_string_sized_new(100);
oscar_string_convert_and_append(account, tmp, "\n<br>", _("Address"), info->homeaddr);
@@ -3714,7 +3716,8 @@
oscar_string_convert_and_append(account, tmp, "\n<br>", _("Zip Code"), info->homezip);
gaim_notify_user_info_add_pair(user_info, _("Home Address"), tmp->str);
-
+ gaim_notify_user_info_add_section_break(user_info);
+
g_string_free(tmp, TRUE);
}
if ((info->workaddr && info->workaddr[0]) || (info->workcity && info->workcity[0]) || (info->workstate && info->workstate[0]) || (info->workzip && info->workzip[0])) {
@@ -3726,7 +3729,8 @@
oscar_string_convert_and_append(account, tmp, "\n<br>", _("Zip Code"), info->workzip);
gaim_notify_user_info_add_pair(user_info, _("Work Address"), tmp->str);
-
+ gaim_notify_user_info_add_section_break(user_info);
+
g_string_free(tmp, TRUE);
}
if ((info->workcompany && info->workcompany[0]) || (info->workdivision && info->workdivision[0]) || (info->workposition && info->workposition[0]) || (info->workwebpage && info->workwebpage[0])) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ev...@us...> - 2006-12-10 14:47:26
|
Revision: 17947
http://svn.sourceforge.net/gaim/?rev=17947&view=rev
Author: evands
Date: 2006-12-10 06:45:27 -0800 (Sun, 10 Dec 2006)
Log Message:
-----------
If a message is being received in a group chat at a moment just after it has been left, gaim_conv_chat_incoming_msg() is still triggerred but find_oscar_chat_by_conn() returns NULL. We no longer crash in this situation.
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/oscar.c
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-12-10 11:26:17 UTC (rev 17946)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-12-10 14:45:27 UTC (rev 17947)
@@ -3078,6 +3078,9 @@
GaimConnection *gc = od->gc;
struct chat_connection *ccon = find_oscar_chat_by_conn(gc, conn);
+ if (!ccon)
+ return 1;
+
va_start(ap, fr);
roominfo = va_arg(ap, struct aim_chat_roominfo *);
roomname = va_arg(ap, char *);
@@ -3112,6 +3115,9 @@
char *msg;
char *charset;
+ if (!ccon)
+ return 1;
+
va_start(ap, fr);
info = va_arg(ap, aim_userinfo_t *);
len = va_arg(ap, int);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-12-11 05:35:19
|
Revision: 17956
http://svn.sourceforge.net/gaim/?rev=17956&view=rev
Author: thekingant
Date: 2006-12-10 21:35:19 -0800 (Sun, 10 Dec 2006)
Log Message:
-----------
Apparently when Win AIM 6.0 sees "us-ascii" it parses the incoming
message as Windows CP-1252. We might as well do the same thing,
since there isn't any particular reason for us to parse us-ascii
as UTF-8.
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/oscar.c
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-12-11 05:29:50 UTC (rev 17955)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-12-11 05:35:19 UTC (rev 17956)
@@ -303,18 +303,20 @@
gaim_debug_info("oscar", "Empty encoding, assuming UTF-8\n");
} else if (!strcasecmp(encoding, "iso-8859-1")) {
utf8 = g_convert(text, textlen, "UTF-8", "iso-8859-1", NULL, NULL, NULL);
- } else if (!strcasecmp(encoding, "ISO-8859-1-Windows-3.1-Latin-1")) {
+ } else if (!strcasecmp(encoding, "ISO-8859-1-Windows-3.1-Latin-1") ||
+ !strcasecmp(encoding, "us-ascii"))
+ {
utf8 = g_convert(text, textlen, "UTF-8", "Windows-1252", NULL, NULL, NULL);
} else if (!strcasecmp(encoding, "unicode-2-0")) {
utf8 = g_convert(text, textlen, "UTF-8", "UCS-2BE", NULL, NULL, NULL);
- } else if (strcasecmp(encoding, "us-ascii") && strcmp(encoding, "utf-8")) {
+ } else if (strcasecmp(encoding, "utf-8")) {
gaim_debug_warning("oscar", "Unrecognized character encoding \"%s\", "
"attempting to convert to UTF-8 anyway\n", encoding);
utf8 = g_convert(text, textlen, "UTF-8", encoding, NULL, NULL, NULL);
}
/*
- * If utf8 is still NULL then either the encoding is us-ascii/utf-8 or
+ * If utf8 is still NULL then either the encoding is utf-8 or
* we have been unable to convert the text to utf-8 from the encoding
* that was specified. So we check if the text is valid utf-8 then
* just copy it.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-12-13 08:45:57
|
Revision: 17982
http://svn.sourceforge.net/gaim/?rev=17982&view=rev
Author: thekingant
Date: 2006-12-13 00:45:57 -0800 (Wed, 13 Dec 2006)
Log Message:
-----------
For oscar accounts, make sure our server-stored icon is updated
correctly in the event that the local user set a new icon while
this account was offline.
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/oscar.c
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-12-13 08:44:10 UTC (rev 17981)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-12-13 08:45:57 UTC (rev 17982)
@@ -4697,6 +4697,7 @@
GaimBuddy *b;
struct aim_ssi_item *curitem;
guint32 tmp;
+ const char *icon_path, *cached_icon_path;
va_list ap;
guint16 fmtver, numitems;
guint32 timestamp;
@@ -4924,6 +4925,15 @@
"ssi: activating server-stored buddy list\n");
aim_ssi_enable(od);
+ /*
+ * Make sure our server-stored icon is updated correctly in
+ * the event that the local user set a new icon while this
+ * account was offline.
+ */
+ icon_path = gaim_account_get_buddy_icon(account);
+ cached_icon_path = gaim_buddy_icons_get_full_path(icon_path);
+ oscar_set_icon(gc, cached_icon_path);
+
return 1;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lsc...@us...> - 2006-12-14 01:47:29
|
Revision: 17991
http://svn.sourceforge.net/gaim/?rev=17991&view=rev
Author: lschiere
Date: 2006-12-13 17:47:25 -0800 (Wed, 13 Dec 2006)
Log Message:
-----------
This should reduce the number of questions about encoding errors we get. it also closes rh bug 219524
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/oscar.c
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-12-14 01:06:18 UTC (rev 17990)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-12-14 01:47:25 UTC (rev 17991)
@@ -427,7 +427,7 @@
if (ret == NULL)
ret = gaim_plugin_oscar_convert_to_utf8(data, datalen, charsetstr2, TRUE);
if (ret == NULL)
- ret = g_strdup(_("(There was an error receiving this message. The buddy you are speaking to most likely has a buggy client.)"));
+ ret = g_strdup(_("(There was an error receiving this message. Either you and the buddy you are speaking to have a different encoding selected, or the buddy has a buggy client.)"));
return ret;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ebl...@us...> - 2006-12-14 04:17:04
|
Revision: 17992
http://svn.sourceforge.net/gaim/?rev=17992&view=rev
Author: eblanton
Date: 2006-12-13 20:17:02 -0800 (Wed, 13 Dec 2006)
Log Message:
-----------
Attempt to salvage Oscar strings in an invalid encoding, as well as
print an error message.
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/oscar.c
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-12-14 01:47:25 UTC (rev 17991)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-12-14 04:17:02 UTC (rev 17992)
@@ -426,9 +426,18 @@
ret = gaim_plugin_oscar_convert_to_utf8(data, datalen, charsetstr1, FALSE);
if (ret == NULL)
ret = gaim_plugin_oscar_convert_to_utf8(data, datalen, charsetstr2, TRUE);
- if (ret == NULL)
- ret = g_strdup(_("(There was an error receiving this message. Either you and the buddy you are speaking to have a different encoding selected, or the buddy has a buggy client.)"));
+ if (ret == NULL) {
+ char *str, *salvage;
+ str = g_malloc(datalen + 1);
+ strncpy(str, datalen, data);
+ str[datalen] = '\0';
+ salvage = gaim_utf8_salvage(str);
+ ret = g_strdup_printf(_("%s (There was an error receiving this message. Either you and the buddy you are speaking to have a different encoding selected, or the buddy has a buggy client.)"), salvage);
+ g_free(str);
+ g_free(salvage);
+ }
+
return ret;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ebl...@us...> - 2006-12-14 05:56:58
|
Revision: 17996
http://svn.sourceforge.net/gaim/?rev=17996&view=rev
Author: eblanton
Date: 2006-12-13 21:56:50 -0800 (Wed, 13 Dec 2006)
Log Message:
-----------
This should be friendlier for translators, but doesn't lose meaning
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/oscar.c
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-12-14 05:14:22 UTC (rev 17995)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-12-14 05:56:50 UTC (rev 17996)
@@ -433,7 +433,8 @@
strncpy(str, datalen, data);
str[datalen] = '\0';
salvage = gaim_utf8_salvage(str);
- ret = g_strdup_printf(_("%s (There was an error receiving this message. Either you and the buddy you are speaking to have a different encoding selected, or the buddy has a buggy client.)"), salvage);
+ ret = g_strdup_printf("%s %s", salvage,
+ _("(There was an error receiving this message. Either you and the buddy you are speaking to have a different encoding selected, or the buddy has a buggy client.)"));
g_free(str);
g_free(salvage);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ev...@us...> - 2006-12-20 20:06:50
|
Revision: 18031
http://svn.sourceforge.net/gaim/?rev=18031&view=rev
Author: evands
Date: 2006-12-20 12:06:47 -0800 (Wed, 20 Dec 2006)
Log Message:
-----------
* Improved gaim_plugin_oscar_decode_im_part()'s error message; "the buddy you are talking to" is awkward and wrong, and "the buddy to whom you are talking" is just silly. Use the buddy's screenname instead.
* Pass the screen name to gaim_plugin_oscar_decode_im_part() in incomingim_chan4() as is done elsewhere rather than passing "1" as the name.
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/oscar.c
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-12-20 09:35:24 UTC (rev 18030)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-12-20 20:06:47 UTC (rev 18031)
@@ -427,17 +427,19 @@
if (ret == NULL)
ret = gaim_plugin_oscar_convert_to_utf8(data, datalen, charsetstr2, TRUE);
if (ret == NULL) {
- char *str, *salvage;
+ char *str, *salvage, tmp;
str = g_malloc(datalen + 1);
strncpy(str, data, datalen);
str[datalen] = '\0';
salvage = gaim_utf8_salvage(str);
- ret = g_strdup_printf("%s %s", salvage,
- _("(There was an error receiving this message. Either you and the buddy you are speaking to have a different encoding selected, or the buddy has a buggy client.)"));
+ tmp = g_strdup_printf(_("(There was an error receiving this message. Either you and %s have different encodings selected, or %s has a buggy client.)"),
+ sourcesn, sourcesn);
+ ret = g_strdup_printf("%s %s", salvage, tmp);
+ g_free(tmp);
g_free(str);
g_free(salvage);
- }
+ }
return ret;
}
@@ -2295,9 +2297,12 @@
for (numtoks=0; msg1[numtoks]; numtoks++);
msg2 = (gchar **)g_malloc((numtoks+1)*sizeof(gchar *));
for (i=0; msg1[i]; i++) {
+ gchar *uin = g_strdup_printf("%u", args->uin);
+
gaim_str_strip_char(msg1[i], '\r');
/* TODO: Should use an encoding other than ASCII? */
- msg2[i] = gaim_plugin_oscar_decode_im_part(account, "1", AIM_CHARSET_ASCII, 0x0000, msg1[i], strlen(msg1[i]));
+ msg2[i] = gaim_plugin_oscar_decode_im_part(account, uin, AIM_CHARSET_ASCII, 0x0000, msg1[i], strlen(msg1[i]));
+ g_free(uin);
}
msg2[i] = NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ev...@us...> - 2006-12-20 20:38:30
|
Revision: 18033
http://svn.sourceforge.net/gaim/?rev=18033&view=rev
Author: evands
Date: 2006-12-20 12:38:20 -0800 (Wed, 20 Dec 2006)
Log Message:
-----------
Hunted down a spare * in my garage and put it somewhere appropriate.
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/oscar.c
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-12-20 20:29:11 UTC (rev 18032)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-12-20 20:38:20 UTC (rev 18033)
@@ -427,7 +427,7 @@
if (ret == NULL)
ret = gaim_plugin_oscar_convert_to_utf8(data, datalen, charsetstr2, TRUE);
if (ret == NULL) {
- char *str, *salvage, tmp;
+ char *str, *salvage, *tmp;
str = g_malloc(datalen + 1);
strncpy(str, data, datalen);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-12-21 09:14:56
|
Revision: 18037
http://svn.sourceforge.net/gaim/?rev=18037&view=rev
Author: thekingant
Date: 2006-12-21 01:14:53 -0800 (Thu, 21 Dec 2006)
Log Message:
-----------
Don't try to do stuff with an empty username or ICBM cookie
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/oscar.c
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-12-21 08:58:55 UTC (rev 18036)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-12-21 09:14:53 UTC (rev 18037)
@@ -2732,6 +2732,10 @@
"Message error with data %s and reason %hu\n",
(data != NULL ? data : ""), reason);
+ if ((data == NULL) || (*data == '\0'))
+ /* We can't do anything if data is empty */
+ return 1;
+
#ifdef TODOFT
/* If this was a file transfer request, data is a cookie */
if ((xfer = oscar_find_xfer_by_cookie(od->file_transfers, data))) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ev...@us...> - 2006-12-22 08:29:32
|
Revision: 18045
http://svn.sourceforge.net/gaim/?rev=18045&view=rev
Author: evands
Date: 2006-12-22 00:29:28 -0800 (Fri, 22 Dec 2006)
Log Message:
-----------
We occasionally get to gaim_parse_oncoming() with a user_info indicating a NULL away message for a contact who (1) is away and is still away and (2) does actually have a message. gaim_got_infoblock() will then be called shortly thereafter.
Check to ensure that the call to gaim_prpl_got_user_status() has some benefit other than potentially removing an appropriate away message; do the call if the status actually changes as a result.
This fixes an issue in which away messages would periodically flicker invisible and then visible again in the contact list for certain contacts.
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/oscar.c
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-12-22 06:59:05 UTC (rev 18044)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-12-22 08:29:28 UTC (rev 18045)
@@ -1774,8 +1774,18 @@
g_free(message);
}
else
- gaim_prpl_got_user_status(account, info->sn, status_id, NULL);
-
+ {
+ GaimBuddy *b = gaim_find_buddy(account, info->sn);
+ GaimStatus *status;
+ const char *active_status_id;
+
+ status = gaim_presence_get_active_status(gaim_buddy_get_presence(b));
+ active_status_id = gaim_status_get_id(status);
+
+ if (!active_status_id || strcmp(active_status_id, status_id))
+ gaim_prpl_got_user_status(account, info->sn, status_id, NULL);
+ }
+
/* Login time stuff */
if (info->present & AIM_USERINFO_PRESENT_ONLINESINCE)
signon = info->onlinesince;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2007-04-01 23:59:39
|
Revision: 18228
http://svn.sourceforge.net/gaim/?rev=18228&view=rev
Author: thekingant
Date: 2007-04-01 16:59:40 -0700 (Sun, 01 Apr 2007)
Log Message:
-----------
sf patch #1574238, from Ka-Hing Cheung
"icq away message was only showing in blist and tooltip,
this patch adds it to the info window so it can be copy
and pasted."
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/oscar.c
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2007-04-01 18:59:15 UTC (rev 18227)
+++ trunk/libgaim/protocols/oscar/oscar.c 2007-04-01 23:59:40 UTC (rev 18228)
@@ -3661,6 +3661,8 @@
GaimConnection *gc;
GaimAccount *account;
GaimBuddy *buddy;
+ GaimPresence *presence;
+ GaimStatus *status;
struct buddyinfo *bi;
gchar who[16];
GaimNotifyUserInfo *user_info;
@@ -3754,7 +3756,19 @@
g_free(buf);
g_free(utf8);
}
-
+
+ if (buddy != NULL) {
+ const gchar *message;
+
+ presence = gaim_buddy_get_presence(buddy);
+ status = gaim_presence_get_active_status(presence);
+ message = gaim_status_get_attr_string(status, "message");
+
+ if (message != NULL && *message != '\0')
+ oscar_user_info_convert_and_add(account,
+ user_info, _("Status"), message);
+ }
+
oscar_user_info_convert_and_add(account, user_info, _("Additional Information"), info->info);
gaim_notify_user_info_add_section_break(user_info);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X