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

cons_show now uses vargs

This commit is contained in:
James Booth 2012-10-03 22:06:04 +01:00
parent a1476f1780
commit 6aa1fe5513
3 changed files with 16 additions and 3 deletions

View File

@ -753,6 +753,13 @@ _cmd_set_remind(const char * const inp, struct cmd_help_t help)
gint period = atoi(period_str); gint period = atoi(period_str);
prefs_set_remind(period); prefs_set_remind(period);
if (period == 0) {
cons_show("Message reminders disabled.");
} else if (period == 1) {
cons_show("Message reminder period set to 1 second.");
} else {
cons_show("Message reminder period set to %d seconds.", period);
}
} }
return TRUE; return TRUE;

View File

@ -104,7 +104,7 @@ void win_remind(void);
void cons_help(void); void cons_help(void);
void cons_prefs(void); void cons_prefs(void);
void cons_bad_command(const char * const cmd); void cons_bad_command(const char * const cmd);
void cons_show(const char * const cmd); void cons_show(const char * const cmd, ...);
void cons_bad_show(const char * const cmd); void cons_bad_show(const char * const cmd);
void cons_highlight_show(const char * const cmd); void cons_highlight_show(const char * const cmd);
void cons_show_online_contacts(GSList * list); void cons_show_online_contacts(GSList * list);

View File

@ -631,10 +631,16 @@ cons_bad_show(const char * const msg)
} }
void void
cons_show(const char * const msg) cons_show(const char * const msg, ...)
{ {
va_list arg;
va_start(arg, msg);
GString *fmt_msg = g_string_new(NULL);
g_string_vprintf(fmt_msg, msg, arg);
_win_show_time(_cons_win); _win_show_time(_cons_win);
wprintw(_cons_win, "%s\n", msg); wprintw(_cons_win, "%s\n", fmt_msg->str);
g_string_free(fmt_msg, TRUE);
va_end(arg);
if (_curr_prof_win == 0) if (_curr_prof_win == 0)
dirty = TRUE; dirty = TRUE;