aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into plugins

Browse Source
This commit is contained in:
James Booth 2013-08-04 17:06:00 +01:00
commit 9e6a6f224f
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/command/command.c
View File

@ -2680,10 +2680,15 @@ _cmd_join(gchar **args, struct cmd_help_t help)
return TRUE;
}
Jid *room_arg = jid_create(args[0]);
if (room_arg == NULL) {
cons_show_error("Specified room has incorrect format");
return TRUE;
}
int num_args = g_strv_length(args);
char *room = NULL;
char *nick = NULL;
Jid *room_arg = jid_create(args[0]);
GString *room_str = g_string_new("");
Jid *my_jid = jid_create(jabber_get_fulljid());

6
src/ui/core.c
View File

@ -399,10 +399,12 @@ ui_incoming_msg(const char * const from, const char * const message,
if (tv_stamp == NULL) {
win_print_time(window, '-');
} else {
// if show users status first, when receiving message via delayed delivery
// show users status first, when receiving message via delayed delivery
if (win_created) {
PContact pcontact = roster_get_contact(from);
win_show_contact(window, pcontact);
if (pcontact != NULL) {
win_show_contact(window, pcontact);
}
}
GDateTime *time = g_date_time_new_from_timeval_utc(tv_stamp);
gchar *date_fmt = g_date_time_format(time, "%H:%M:%S");