Mercurial > pidgin.yaz
comparison src/conversation.c @ 11478:67abb500f600
[gaim-migrate @ 13720]
Room join notices (for the user's account) were showing (null) when the user didn't have an account alias set. It's fixed now.
committer: Tailor Script <tailor@pidgin.im>
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 09 Sep 2005 17:35:43 +0000 |
parents | c3cb62d33f53 |
children | c80edbd8961a |
comparison
equal
deleted
inserted
replaced
11477:36f575351c49 | 11478:67abb500f600 |
---|---|
1983 GaimConvChatBuddyFlags flags = GPOINTER_TO_INT(fl->data); | 1983 GaimConvChatBuddyFlags flags = GPOINTER_TO_INT(fl->data); |
1984 const char *extra_msg = (extra_msgs ? extra_msgs->data : NULL); | 1984 const char *extra_msg = (extra_msgs ? extra_msgs->data : NULL); |
1985 | 1985 |
1986 if (!(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) { | 1986 if (!(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) { |
1987 char *tmp; | 1987 char *tmp; |
1988 GaimBuddy *buddy; | |
1989 | 1988 |
1990 if (prpl_info->options & OPT_PROTO_USE_DISPLAY_NAME_FOR_ME_IN_CHATS) | 1989 if (prpl_info->options & OPT_PROTO_USE_DISPLAY_NAME_FOR_ME_IN_CHATS) |
1991 tmp = g_strdup(gaim_normalize(conv->account, gc->display_name)); | 1990 tmp = g_strdup(gaim_normalize(conv->account, gc->display_name)); |
1992 else | 1991 else |
1993 tmp = g_strdup(gaim_normalize(conv->account, conv->account->username)); | 1992 tmp = g_strdup(gaim_normalize(conv->account, conv->account->username)); |
1994 | 1993 |
1995 if (!strcmp(tmp, gaim_normalize(conv->account, user))) { | 1994 if (!strcmp(tmp, gaim_normalize(conv->account, user))) { |
1996 alias = gaim_account_get_alias(conv->account); | 1995 const char *alias2 = gaim_account_get_alias(conv->account); |
1997 if (alias == NULL) | 1996 if (alias2 != NULL) |
1998 alias = gaim_connection_get_display_name(gc); | 1997 alias = alias2; |
1998 else | |
1999 { | |
2000 const char *display_name = gaim_connection_get_display_name(gc); | |
2001 if (display_name != NULL) | |
2002 alias = display_name; | |
2003 } | |
1999 } else { | 2004 } else { |
2005 GaimBuddy *buddy; | |
2000 if ((buddy = gaim_find_buddy(gc->account, user)) != NULL) | 2006 if ((buddy = gaim_find_buddy(gc->account, user)) != NULL) |
2001 alias = gaim_buddy_get_contact_alias(buddy); | 2007 alias = gaim_buddy_get_contact_alias(buddy); |
2002 } | 2008 } |
2003 g_free(tmp); | 2009 g_free(tmp); |
2004 } | 2010 } |