diff options
author | James Booth <boothj5@gmail.com> | 2013-08-25 23:27:42 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2013-08-25 23:27:42 +0100 |
commit | d3cfeb9d5cac0520d43dbf35e36d9364c35a95e5 (patch) | |
tree | e262e193eadbb95717e6b04612ace879c7be5848 /src/ui/core.c | |
parent | 3c39befa5e565bbc3cc13a0f060a8d7a18f735f1 (diff) | |
parent | e21bf8a18d682ae95699b6ddedf17aa870303a3c (diff) | |
download | profani-tty-d3cfeb9d5cac0520d43dbf35e36d9364c35a95e5.tar.gz |
Merge branch 'master' into windows
Diffstat (limited to 'src/ui/core.c')
-rw-r--r-- | src/ui/core.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/ui/core.c b/src/ui/core.c index 48e9ff03..df63ac2a 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -249,8 +249,9 @@ ui_incoming_msg(const char * const from, const char * const message, GTimeVal *tv_stamp, gboolean priv) { gboolean win_created = FALSE; - char *display_from; + char *display_from = NULL; win_type_t win_type; + if (priv) { win_type = WIN_PRIVATE; display_from = get_nick_from_full_jid(from); @@ -394,7 +395,7 @@ ui_incoming_msg(const char * const from, const char * const message, if (prefs_get_boolean(PREF_NOTIFY_MESSAGE)) notify_message(display_from, ui_index); - FREE_SET_NULL(display_from); + free(display_from); } void @@ -447,15 +448,15 @@ ui_contact_online(const char * const barejid, const char * const resource, // use nickname if exists if (p_contact_name(contact) != NULL) { - g_string_append(display_str, strdup(p_contact_name(contact))); + g_string_append(display_str, p_contact_name(contact)); } else { - g_string_append(display_str, strdup(barejid)); + g_string_append(display_str, barejid); } // add resource if not default provided by profanity if (strcmp(jid->resourcepart, "__prof_default") != 0) { g_string_append(display_str, " ("); - g_string_append(display_str, strdup(jid->resourcepart)); + g_string_append(display_str, jid->resourcepart); g_string_append(display_str, ")"); } @@ -489,15 +490,15 @@ ui_contact_offline(const char * const from, const char * const show, // use nickname if exists if (p_contact_name(contact) != NULL) { - g_string_append(display_str, strdup(p_contact_name(contact))); + g_string_append(display_str, p_contact_name(contact)); } else { - g_string_append(display_str, strdup(jidp->barejid)); + g_string_append(display_str, jidp->barejid); } // add resource if not default provided by profanity if (strcmp(jidp->resourcepart, "__prof_default") != 0) { g_string_append(display_str, " ("); - g_string_append(display_str, strdup(jidp->resourcepart)); + g_string_append(display_str, jidp->resourcepart); g_string_append(display_str, ")"); } |