Mercurial > pidgin
changeset 23378:3f765f7e79d4
merge of '500604b1f22bc5f32a818dc80bbc252bc460dc85'
and '8538a2f807d6d671d1896aa0ad6be0d3a07c4035'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Wed, 18 Jun 2008 03:27:05 +0000 |
| parents | 54aaea893a89 (diff) 6c728443b426 (current diff) |
| children | bd542a092a3b f3922a72eb02 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/gntconv.c Wed Jun 18 03:16:28 2008 +0000 +++ b/finch/gntconv.c Wed Jun 18 03:27:05 2008 +0000 @@ -141,7 +141,7 @@ entry_key_pressed(GntWidget *w, FinchConv *ggconv) { const char *text = gnt_entry_get_text(GNT_ENTRY(ggconv->entry)); - if (*text == '/') + if (*text == '/' && *(text + 1) != '/') { PurpleConversation *conv = ggconv->active_conv; PurpleCmdStatus status; @@ -191,7 +191,7 @@ } else { - char *escape = g_markup_escape_text(text, -1); + char *escape = g_markup_escape_text((*text == '/' ? text + 1 : text), -1); char *apos = purple_strreplace(escape, "'", "'"); g_free(escape); escape = apos;
--- a/libpurple/log.c Wed Jun 18 03:16:28 2008 +0000 +++ b/libpurple/log.c Wed Jun 18 03:27:05 2008 +0000 @@ -1083,7 +1083,7 @@ } /* Determine if this (account, name) combination exists as a buddy. */ - if (account != NULL) + if (account != NULL && name != NULL && *name != '\0') set->buddy = (purple_find_buddy(account, name) != NULL); else set->buddy = FALSE;