Mercurial > pidgin.yaz
comparison pidgin/gtkconv.c @ 28197:5058cdd46464
merge of '82204c4b8e636617e72c31b471d4f81e85194540'
and '84289cafb705d202e2c87aa0b5b6a00aa796b7f5'
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Fri, 07 Aug 2009 08:36:12 +0000 |
| parents | d1040bb86b6a |
| children | 6f27b4d8c1c3 |
comparison
equal
deleted
inserted
replaced
| 28192:47a356df8b5a | 28197:5058cdd46464 |
|---|---|
| 4363 if(current_topic && !g_utf8_collate(new_topic, current_topic)){ | 4363 if(current_topic && !g_utf8_collate(new_topic, current_topic)){ |
| 4364 g_free(new_topic); | 4364 g_free(new_topic); |
| 4365 return; | 4365 return; |
| 4366 } | 4366 } |
| 4367 | 4367 |
| 4368 gtk_entry_set_text(GTK_ENTRY(gtkchat->topic_text), current_topic); | 4368 if (current_topic) |
| 4369 gtk_entry_set_text(GTK_ENTRY(gtkchat->topic_text), current_topic); | |
| 4370 else | |
| 4371 gtk_entry_set_text(GTK_ENTRY(gtkchat->topic_text), ""); | |
| 4372 | |
| 4369 prpl_info->set_chat_topic(gc, purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv)), | 4373 prpl_info->set_chat_topic(gc, purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv)), |
| 4370 new_topic); | 4374 new_topic); |
| 4371 | 4375 |
| 4372 g_free(new_topic); | 4376 g_free(new_topic); |
| 4373 } | 4377 } |