From: <rl...@us...> - 2006-04-14 19:09:11
|
Revision: 16031 Author: rlaager Date: 2006-04-14 12:08:59 -0700 (Fri, 14 Apr 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16031&view=rev Log Message: ----------- Patch from Bj?\195?\182rn Voigt: "Now the error dialog in the attached patch has everything what we want (a title, a generic message and a detailed message with an error code)." Modified Paths: -------------- trunk/src/protocols/jabber/buddy.c Modified: trunk/src/protocols/jabber/buddy.c =================================================================== --- trunk/src/protocols/jabber/buddy.c 2006-04-12 04:00:19 UTC (rev 16030) +++ trunk/src/protocols/jabber/buddy.c 2006-04-14 19:08:59 UTC (rev 16031) @@ -1376,10 +1376,15 @@ return; if(!(type = xmlnode_get_attrib(packet, "type")) || !strcmp(type, "error")) { + char *msg = jabber_parse_error(js, packet); + + if(!msg) + msg = g_strdup(_("Unknown error")); + gaim_notify_error(js->gc, _("Directory Query Failed"), - _("Could not query the directory server. Either " - "the Jabber user directory specified is invalid or " - "directory server could not be reached."), NULL); + _("Could not query the directory server."), msg); + g_free(msg); + return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rl...@us...> - 2006-04-25 17:19:53
|
Revision: 16094 Author: rlaager Date: 2006-04-25 10:19:45 -0700 (Tue, 25 Apr 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16094&view=rev Log Message: ----------- SF Patch #1462332 from cbanal "When updating an avatar and the accounts vcard / info is empty. The resulting vCard xml that is sent does not contain the proper attributes. This causes the vCard update to be ignored by the jabber server." I'm not 100% positive about this, but it seems right. Modified Paths: -------------- trunk/src/protocols/jabber/buddy.c Modified: trunk/src/protocols/jabber/buddy.c =================================================================== --- trunk/src/protocols/jabber/buddy.c 2006-04-25 17:15:00 UTC (rev 16093) +++ trunk/src/protocols/jabber/buddy.c 2006-04-25 17:19:45 UTC (rev 16094) @@ -362,6 +362,7 @@ JabberStream *js = gc->proto_data; xmlnode *vc_node; char *avatar_file = NULL; + struct tag_attr *tag_attr; if(js->avatar_hash) g_free(js->avatar_hash); @@ -375,6 +376,8 @@ if(!vc_node && avatar_file) { vc_node = xmlnode_new("vCard"); + for(tag_attr = vcard_tag_attr_list; tag_attr->attr != NULL; ++tag_attr) + xmlnode_set_attrib(vc_node, tag_attr->attr, tag_attr->value); } if(vc_node) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rl...@us...> - 2006-05-01 20:47:18
|
Revision: 16117 Author: rlaager Date: 2006-05-01 13:47:11 -0700 (Mon, 01 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16117&view=rev Log Message: ----------- Resolve CID 134 Event deref_ptr_in_call: Dereferences pointer "gc" 491 account = gaim_connection_get_account(gc); Event check_after_deref: Pointer "gc" dereferenced before NULL check 496 if (gc != NULL) Modified Paths: -------------- trunk/src/protocols/jabber/buddy.c Modified: trunk/src/protocols/jabber/buddy.c =================================================================== --- trunk/src/protocols/jabber/buddy.c 2006-05-01 20:43:46 UTC (rev 16116) +++ trunk/src/protocols/jabber/buddy.c 2006-05-01 20:47:11 UTC (rev 16117) @@ -450,7 +450,6 @@ static void jabber_format_info(GaimConnection *gc, GaimRequestFields *fields) { - GaimAccount *account; xmlnode *vc_node; GaimRequestField *field; const char *text; @@ -488,13 +487,13 @@ p = xmlnode_to_str(vc_node, NULL); xmlnode_free(vc_node); - account = gaim_connection_get_account(gc); + if (gc != NULL) { + GaimAccount *account = gaim_connection_get_account(gc); - if (account != NULL) { - gaim_account_set_user_info(account, p); - - if (gc != NULL) + if (account != NULL) { + gaim_account_set_user_info(account, p); serv_set_info(gc, p); + } } g_free(p); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-08-12 11:15:25
|
Revision: 16719 Author: thekingant Date: 2006-08-12 04:15:23 -0700 (Sat, 12 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16719&view=rev Log Message: ----------- Get rid of two assertion failures and an accidentally double colon. I found all three of these when getting the jabber info of quser.alpha.qunu.com while trying to figure out http://trac.adiumx.com/ticket/4686 Modified Paths: -------------- trunk/src/protocols/jabber/buddy.c Modified: trunk/src/protocols/jabber/buddy.c =================================================================== --- trunk/src/protocols/jabber/buddy.c 2006-08-12 11:00:39 UTC (rev 16718) +++ trunk/src/protocols/jabber/buddy.c 2006-08-12 11:15:23 UTC (rev 16719) @@ -674,7 +674,7 @@ } if(jbr->client.name) { g_string_append_printf(info_text, "<b>%s:</b> %s %s<br/>", - _("Client:"), jbr->client.name, + _("Client"), jbr->client.name, jbr->client.version ? jbr->client.version : ""); if(jbr->client.os) { g_string_append_printf(info_text, "<b>%s:</b> %s<br/>", @@ -688,7 +688,8 @@ g_free(resource_name); - info_text = g_string_append(info_text, jbi->vcard_text); + if (jbi->vcard_text != NULL) + info_text = g_string_append(info_text, jbi->vcard_text); gaim_notify_userinfo(jbi->js->gc, jbi->jid, info_text->str, NULL, NULL); @@ -699,7 +700,9 @@ g_string_free(info_text, TRUE); - gaim_timeout_remove(jbi->timeout_handle); + if (jbi->timeout_handle > 0) + gaim_timeout_remove(jbi->timeout_handle); + g_free(jbi->jid); g_hash_table_destroy(jbi->resources); g_free(jbi->vcard_text); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sea...@us...> - 2006-05-09 17:38:49
|
Revision: 16167 Author: seanegan Date: 2006-05-09 10:38:37 -0700 (Tue, 09 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16167&view=rev Log Message: ----------- Handle empty <show/> elements as "available," rather than NULL. Modified Paths: -------------- trunk/src/protocols/jabber/buddy.c Modified: trunk/src/protocols/jabber/buddy.c =================================================================== --- trunk/src/protocols/jabber/buddy.c 2006-05-09 04:05:04 UTC (rev 16166) +++ trunk/src/protocols/jabber/buddy.c 2006-05-09 17:38:37 UTC (rev 16167) @@ -1190,8 +1190,9 @@ case JABBER_BUDDY_STATE_ONLINE: return "available"; case JABBER_BUDDY_STATE_UNKNOWN: + return "available"; case JABBER_BUDDY_STATE_ERROR: - return NULL; + return "error"; case JABBER_BUDDY_STATE_UNAVAILABLE: return "offline"; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fac...@us...> - 2006-05-18 04:23:12
|
Revision: 16188 Author: faceprint Date: 2006-05-17 21:23:02 -0700 (Wed, 17 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16188&view=rev Log Message: ----------- jabber status message escape goodness Modified Paths: -------------- trunk/src/protocols/jabber/buddy.c Modified: trunk/src/protocols/jabber/buddy.c =================================================================== --- trunk/src/protocols/jabber/buddy.c 2006-05-16 15:43:45 UTC (rev 16187) +++ trunk/src/protocols/jabber/buddy.c 2006-05-18 04:23:02 UTC (rev 16188) @@ -110,7 +110,7 @@ jbr->state = state; if(jbr->status) g_free(jbr->status); - jbr->status = g_strdup(status); + jbr->status = g_markup_escape_text(status, -1); return jbr; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sea...@us...> - 2006-05-24 17:38:46
|
Revision: 16197 Author: seanegan Date: 2006-05-24 10:38:42 -0700 (Wed, 24 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16197&view=rev Log Message: ----------- more jabber status message escape goodness Modified Paths: -------------- trunk/src/protocols/jabber/buddy.c Modified: trunk/src/protocols/jabber/buddy.c =================================================================== --- trunk/src/protocols/jabber/buddy.c 2006-05-24 00:39:15 UTC (rev 16196) +++ trunk/src/protocols/jabber/buddy.c 2006-05-24 17:38:42 UTC (rev 16197) @@ -110,7 +110,10 @@ jbr->state = state; if(jbr->status) g_free(jbr->status); - jbr->status = g_markup_escape_text(status, -1); + if (status) + jbr->status = g_markup_escape_text(status, -1); + else + jbr->status = NULL; return jbr; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dat...@us...> - 2006-08-10 21:08:04
|
Revision: 16688 Author: datallah Date: 2006-08-10 14:08:00 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16688&view=rev Log Message: ----------- Fix for CID 110 (which also will fix some asserts that happen when you edit your Jabber User Info for the first time) Fix for CID 251 (Null check after deref) Fixes for CID 252, 253. (UNUSED_VALUE) I also changed the jabber_buddy_find() call in jabber_vcard_parse not to create the JabberBuddy if it doesn't exist - there should be a specific jabber buddy attached to the JabberBuddyInfo and if isn't present any more, we shouldn't create a new one. Modified Paths: -------------- trunk/src/protocols/jabber/buddy.c Modified: trunk/src/protocols/jabber/buddy.c =================================================================== --- trunk/src/protocols/jabber/buddy.c 2006-08-10 18:18:17 UTC (rev 16687) +++ trunk/src/protocols/jabber/buddy.c 2006-08-10 21:08:00 UTC (rev 16688) @@ -532,7 +532,7 @@ GaimRequestFieldGroup *group; GaimRequestField *field; const struct vcard_template *vc_tp; - char *user_info; + const char *user_info; char *cdata; xmlnode *x_vc_data = NULL; @@ -543,10 +543,8 @@ /* * Get existing, XML-formatted, user info */ - if((user_info = g_strdup(gaim_account_get_user_info(gc->account))) != NULL) + if((user_info = gaim_account_get_user_info(gc->account)) != NULL) x_vc_data = xmlnode_from_str(user_info, -1); - else - user_info = g_strdup(""); /* * Set up GSLists for edit with labels from "template," data from user info @@ -555,16 +553,20 @@ xmlnode *data_node; if((vc_tp->label)[0] == '\0') continue; - if(vc_tp->ptag == NULL) { - data_node = xmlnode_get_child(x_vc_data, vc_tp->tag); - } else { - gchar *tag = g_strdup_printf("%s/%s", vc_tp->ptag, vc_tp->tag); - data_node = xmlnode_get_child(x_vc_data, tag); - g_free(tag); - } - if(data_node) - cdata = xmlnode_get_data(data_node); - else + + if (x_vc_data != NULL) { + if(vc_tp->ptag == NULL) { + data_node = xmlnode_get_child(x_vc_data, vc_tp->tag); + } else { + gchar *tag = g_strdup_printf("%s/%s", vc_tp->ptag, vc_tp->tag); + data_node = xmlnode_get_child(x_vc_data, tag); + g_free(tag); + } + if(data_node) + cdata = xmlnode_get_data(data_node); + else + cdata = NULL; + } else cdata = NULL; if(strcmp(vc_tp->tag, "DESC") == 0) { @@ -583,8 +585,6 @@ if(x_vc_data != NULL) xmlnode_free(x_vc_data); - g_free(user_info); - gaim_request_fields(gc, _("Edit Jabber vCard"), _("Edit Jabber vCard"), _("All items below are optional. Enter only the " @@ -724,8 +724,7 @@ static void jabber_vcard_parse(JabberStream *js, xmlnode *packet, gpointer data) { - const char *type, *id, *from; - JabberBuddy *jb; + const char *id, *from; GString *info_text; char *bare_jid; char *text; @@ -734,18 +733,17 @@ JabberBuddyInfo *jbi = data; from = xmlnode_get_attrib(packet, "from"); - type = xmlnode_get_attrib(packet, "type"); id = xmlnode_get_attrib(packet, "id"); - jabber_buddy_info_remove_id(jbi, id); - if(!jbi) return; + jabber_buddy_info_remove_id(jbi, id); + if(!from) return; - if(!(jb = jabber_buddy_find(js, from, TRUE))) + if(!jabber_buddy_find(js, from, FALSE)) return; /* XXX: handle the error case */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dat...@us...> - 2006-08-10 21:23:00
|
Revision: 16689 Author: datallah Date: 2006-08-10 14:22:55 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16689&view=rev Log Message: ----------- Plug a leak that I didn't notice while making the other fixes. Modified Paths: -------------- trunk/src/protocols/jabber/buddy.c Modified: trunk/src/protocols/jabber/buddy.c =================================================================== --- trunk/src/protocols/jabber/buddy.c 2006-08-10 21:08:00 UTC (rev 16688) +++ trunk/src/protocols/jabber/buddy.c 2006-08-10 21:22:55 UTC (rev 16689) @@ -533,7 +533,7 @@ GaimRequestField *field; const struct vcard_template *vc_tp; const char *user_info; - char *cdata; + char *cdata = NULL; xmlnode *x_vc_data = NULL; fields = gaim_request_fields_new(); @@ -564,10 +564,7 @@ } if(data_node) cdata = xmlnode_get_data(data_node); - else - cdata = NULL; - } else - cdata = NULL; + } if(strcmp(vc_tp->tag, "DESC") == 0) { field = gaim_request_field_string_new(vc_tp->tag, @@ -579,6 +576,9 @@ FALSE); } + g_free(cdata); + cdata = NULL; + gaim_request_field_group_add_field(group, field); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-08-13 05:50:21
|
Revision: 16732 Author: thekingant Date: 2006-08-12 22:50:19 -0700 (Sat, 12 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16732&view=rev Log Message: ----------- Jabber crashed when getting info from someone on your buddy list if the JID consists only of the domain identifer. For example, add "quser.alpha.qunu.com" to your buddy list then get their info. This fixes the crashing. I'm not really sure if the fix is correct. Can someone familiar with Jabber please look over this? Modified Paths: -------------- trunk/src/protocols/jabber/buddy.c Modified: trunk/src/protocols/jabber/buddy.c =================================================================== --- trunk/src/protocols/jabber/buddy.c 2006-08-13 05:22:33 UTC (rev 16731) +++ trunk/src/protocols/jabber/buddy.c 2006-08-13 05:50:19 UTC (rev 16732) @@ -1119,15 +1119,20 @@ for(resources = jb->resources; resources; resources = resources->next) { JabberBuddyResource *jbr = resources->data; - JabberBuddyInfoResource *jbir = g_new0(JabberBuddyInfoResource, 1); + JabberBuddyInfoResource *jbir; char *full_jid; - if(strrchr(jid, '/')) { + + if ((strchr(jid, '/') == NULL) && (jbr->name != NULL)) { + full_jid = g_strdup_printf("%s/%s", jid, jbr->name); + } else { full_jid = g_strdup(jid); - } else { - full_jid = g_strdup_printf("%s/%s", jid, jbr->name); } - g_hash_table_insert(jbi->resources, g_strdup(jbr->name), jbir); + if (jbr->name != NULL) + { + jbir = g_new0(JabberBuddyInfoResource, 1); + g_hash_table_insert(jbi->resources, g_strdup(jbr->name), jbir); + } if(!jbr->client.name) { iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:version"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |