Mercurial > pidgin
comparison libpurple/blist.c @ 28247:bc87a89e4401
merge of '9ce1a7ac92f523b7b5b9983746ae57ee1fac1a67'
and 'ebf771e2c74addf4821a643a9c9179f4adc67c3b'
| author | Etan Reisner <pidgin@unreliablesource.net> |
|---|---|
| date | Tue, 08 Sep 2009 02:23:49 +0000 |
| parents | f7bb03f0518e |
| children | ec2782028fc5 |
comparison
equal
deleted
inserted
replaced
| 28238:1f0b2af9e2b8 | 28247:bc87a89e4401 |
|---|---|
| 1116 } | 1116 } |
| 1117 | 1117 |
| 1118 old_alias = buddy->alias; | 1118 old_alias = buddy->alias; |
| 1119 | 1119 |
| 1120 if ((new_alias != NULL) && (*new_alias != '\0')) | 1120 if ((new_alias != NULL) && (*new_alias != '\0')) |
| 1121 buddy->alias = g_strdup(alias); | 1121 buddy->alias = new_alias; |
| 1122 else { | 1122 else { |
| 1123 buddy->alias = NULL; | 1123 buddy->alias = NULL; |
| 1124 g_free(new_alias); /* could be "\0" */ | 1124 g_free(new_alias); /* could be "\0" */ |
| 1125 } | 1125 } |
| 1126 | 1126 |