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

Fixed name clashes with windows.h

Browse Source
This commit is contained in:
James Booth 2012-12-11 23:58:54 +00:00
parent 253eb453f2
commit 803eacc488
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/chat_log.c
View File

@ -87,7 +87,7 @@ chat_log_chat(const gchar * const login, gchar *other,
FILE *logp = fopen(dated_log->filename, "a"); FILE *logp = fopen(dated_log->filename, "a");
if (direction == IN) { if (direction == PROF_IN_LOG) {
if (strncmp(msg, "/me ", 4) == 0) { if (strncmp(msg, "/me ", 4) == 0) {
fprintf(logp, "%s - *%s %s\n", date_fmt, other_copy, msg + 4); fprintf(logp, "%s - *%s %s\n", date_fmt, other_copy, msg + 4);
} else { } else {

4
src/chat_log.h
View File

@ -26,8 +26,8 @@
#include <glib.h> #include <glib.h>
typedef enum { typedef enum {
IN, PROF_IN_LOG,
OUT PROF_OUT_LOG
} chat_log_direction_t; } chat_log_direction_t;
void chat_log_init(void); void chat_log_init(void);

6
src/command.c
View File

@ -857,7 +857,7 @@ cmd_execute_default(const char * const inp)
if (prefs_get_chlog()) { if (prefs_get_chlog()) {
const char *jid = jabber_get_jid(); const char *jid = jabber_get_jid();
chat_log_chat(jid, recipient, inp, OUT, NULL); chat_log_chat(jid, recipient, inp, PROF_OUT_LOG, NULL);
} }
win_show_outgoing_msg("me", recipient, inp); win_show_outgoing_msg("me", recipient, inp);
@ -1506,7 +1506,7 @@ _cmd_msg(gchar **args, struct cmd_help_t help)
if (prefs_get_chlog()) { if (prefs_get_chlog()) {
const char *jid = jabber_get_jid(); const char *jid = jabber_get_jid();
chat_log_chat(jid, usr, msg, OUT, NULL); chat_log_chat(jid, usr, msg, PROF_OUT_LOG, NULL);
} }
return TRUE; return TRUE;
@ -1607,7 +1607,7 @@ _cmd_tiny(gchar **args, struct cmd_help_t help)
if (prefs_get_chlog()) { if (prefs_get_chlog()) {
const char *jid = jabber_get_jid(); const char *jid = jabber_get_jid();
chat_log_chat(jid, recipient, tiny, OUT, NULL); chat_log_chat(jid, recipient, tiny, PROF_OUT_LOG, NULL);
} }
win_show_outgoing_msg("me", recipient, tiny); win_show_outgoing_msg("me", recipient, tiny);

4
src/profanity.c
View File

@ -127,7 +127,7 @@ prof_handle_incoming_message(char *from, char *message, gboolean priv)
char *short_from = strtok(from_cpy, "/"); char *short_from = strtok(from_cpy, "/");
const char *jid = jabber_get_jid(); const char *jid = jabber_get_jid();
chat_log_chat(jid, short_from, message, IN, NULL); chat_log_chat(jid, short_from, message, PROF_IN_LOG, NULL);
} }
} }
@ -144,7 +144,7 @@ prof_handle_delayed_message(char *from, char *message, GTimeVal tv_stamp,
char *short_from = strtok(from_cpy, "/"); char *short_from = strtok(from_cpy, "/");
const char *jid = jabber_get_jid(); const char *jid = jabber_get_jid();
chat_log_chat(jid, short_from, message, IN, &tv_stamp); chat_log_chat(jid, short_from, message, PROF_IN_LOG, &tv_stamp);
} }
} }