diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/dbus/dbus-plugin.c | 8 | ||||
| -rw-r--r-- | src/common/hexchat-plugin.h | 8 | ||||
| -rw-r--r-- | src/common/plugin-timer.c | 6 | ||||
| -rw-r--r-- | src/common/plugin.c | 6 | ||||
| -rw-r--r-- | src/fe-gtk/plugin-tray.c | 22 |
5 files changed, 25 insertions, 25 deletions
diff --git a/src/common/dbus/dbus-plugin.c b/src/common/dbus/dbus-plugin.c index 5f38fba8..c1cca2fc 100644 --- a/src/common/dbus/dbus-plugin.c +++ b/src/common/dbus/dbus-plugin.c @@ -1000,7 +1000,7 @@ open_context_cb (char *word[], info->context = xchat_get_context (ph); contexts = g_list_prepend (contexts, info); - return XCHAT_EAT_NONE; + return HEXCHAT_EAT_NONE; } static int @@ -1018,7 +1018,7 @@ close_context_cb (char *word[], } } - return XCHAT_EAT_NONE; + return HEXCHAT_EAT_NONE; } static gboolean @@ -1042,10 +1042,10 @@ unload_plugin_cb (char *word[], char *word_eol[], void *userdata) g_signal_emit (obj, signals[UNLOAD_SIGNAL], 0); - return XCHAT_EAT_ALL; + return HEXCHAT_EAT_ALL; } - return XCHAT_EAT_NONE; + return HEXCHAT_EAT_NONE; } int diff --git a/src/common/hexchat-plugin.h b/src/common/hexchat-plugin.h index 459b1c03..423061f2 100644 --- a/src/common/hexchat-plugin.h +++ b/src/common/hexchat-plugin.h @@ -15,10 +15,10 @@ #define HEXCHAT_FD_EXCEPTION 4 #define HEXCHAT_FD_NOTSOCKET 8 -#define XCHAT_EAT_NONE 0 /* pass it on through! */ -#define XCHAT_EAT_XCHAT 1 /* don't let xchat see this event */ -#define XCHAT_EAT_PLUGIN 2 /* don't let other plugins see this event */ -#define XCHAT_EAT_ALL (XCHAT_EAT_XCHAT|XCHAT_EAT_PLUGIN) /* don't let anything see this event */ +#define HEXCHAT_EAT_NONE 0 /* pass it on through! */ +#define HEXCHAT_EAT_XCHAT 1 /* don't let xchat see this event */ +#define HEXCHAT_EAT_PLUGIN 2 /* don't let other plugins see this event */ +#define HEXCHAT_EAT_ALL (HEXCHAT_EAT_XCHAT|HEXCHAT_EAT_PLUGIN) /* don't let anything see this event */ #ifdef __cplusplus extern "C" { diff --git a/src/common/plugin-timer.c b/src/common/plugin-timer.c index 8da1edbf..b294c005 100644 --- a/src/common/plugin-timer.c +++ b/src/common/plugin-timer.c @@ -148,7 +148,7 @@ timer_cb (char *word[], char *word_eol[], void *userdata) if (!word[2][0]) { timer_showlist (); - return XCHAT_EAT_XCHAT; + return HEXCHAT_EAT_XCHAT; } if (g_ascii_strcasecmp (word[2], "-quiet") == 0) @@ -160,7 +160,7 @@ timer_cb (char *word[], char *word_eol[], void *userdata) if (g_ascii_strcasecmp (word[2 + offset], "-delete") == 0) { timer_del_ref (atoi (word[3 + offset]), quiet); - return XCHAT_EAT_XCHAT; + return HEXCHAT_EAT_XCHAT; } if (g_ascii_strcasecmp (word[2 + offset], "-refnum") == 0) @@ -183,7 +183,7 @@ timer_cb (char *word[], char *word_eol[], void *userdata) else timer_add (ref, timeout, repeat, command); - return XCHAT_EAT_XCHAT; + return HEXCHAT_EAT_XCHAT; } int diff --git a/src/common/plugin.c b/src/common/plugin.c index b2b79386..8961f0d2 100644 --- a/src/common/plugin.c +++ b/src/common/plugin.c @@ -562,14 +562,14 @@ plugin_hook_run (session *sess, char *name, char *word[], char *word_eol[], int break; } - if ((ret & XCHAT_EAT_XCHAT) && (ret & XCHAT_EAT_PLUGIN)) + if ((ret & HEXCHAT_EAT_XCHAT) && (ret & HEXCHAT_EAT_PLUGIN)) { eat = 1; goto xit; } - if (ret & XCHAT_EAT_PLUGIN) + if (ret & HEXCHAT_EAT_PLUGIN) goto xit; /* stop running plugins */ - if (ret & XCHAT_EAT_XCHAT) + if (ret & HEXCHAT_EAT_XCHAT) eat = 1; /* eventually we'll return 1, but continue running plugins */ list = next; diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c index 581e9dfc..76154492 100644 --- a/src/fe-gtk/plugin-tray.c +++ b/src/fe-gtk/plugin-tray.c @@ -576,7 +576,7 @@ static int tray_hilight_cb (char *word[], void *userdata) { /*if (tray_status == TS_HIGHLIGHT) - return XCHAT_EAT_NONE;*/ + return HEXCHAT_EAT_NONE;*/ if (prefs.hex_input_tray_hilight && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1)) { @@ -596,14 +596,14 @@ tray_hilight_cb (char *word[], void *userdata) tray_set_balloonf (word[2], _(DISPLAY_NAME": Highlighted message from: %s (%s)"), word[1], xchat_get_info (ph, "channel")); - return XCHAT_EAT_NONE; + return HEXCHAT_EAT_NONE; } static int tray_message_cb (char *word[], void *userdata) { if (/*tray_status == TS_MESSAGE ||*/ tray_status == TS_HIGHLIGHT) - return XCHAT_EAT_NONE; + return HEXCHAT_EAT_NONE; if (prefs.hex_input_tray_chans && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1)) { @@ -621,7 +621,7 @@ tray_message_cb (char *word[], void *userdata) tray_set_balloonf (word[2], _(DISPLAY_NAME": New public message from: %s (%s)"), word[1], xchat_get_info (ph, "channel")); - return XCHAT_EAT_NONE; + return HEXCHAT_EAT_NONE; } static void @@ -655,24 +655,24 @@ static int tray_priv_cb (char *word[], void *userdata) { /*if (tray_status == TS_HIGHLIGHT) - return XCHAT_EAT_NONE;*/ + return HEXCHAT_EAT_NONE;*/ if (prefs.hex_input_tray_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1)) tray_priv (word[1], word[2]); - return XCHAT_EAT_NONE; + return HEXCHAT_EAT_NONE; } static int tray_invited_cb (char *word[], void *userdata) { /*if (tray_status == TS_HIGHLIGHT) - return XCHAT_EAT_NONE;*/ + return HEXCHAT_EAT_NONE;*/ if (prefs.hex_input_tray_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1)) tray_priv (word[2], "Invited"); - return XCHAT_EAT_NONE; + return HEXCHAT_EAT_NONE; } static int @@ -681,7 +681,7 @@ tray_dcc_cb (char *word[], void *userdata) const char *network; /* if (tray_status == TS_FILEOFFER) - return XCHAT_EAT_NONE;*/ + return HEXCHAT_EAT_NONE;*/ network = xchat_get_info (ph, "network"); if (!network) @@ -704,7 +704,7 @@ tray_dcc_cb (char *word[], void *userdata) tray_set_balloonf ("", _(DISPLAY_NAME": File offer from: %s (%s)"), word[1], network); - return XCHAT_EAT_NONE; + return HEXCHAT_EAT_NONE; } static int @@ -712,7 +712,7 @@ tray_focus_cb (char *word[], void *userdata) { tray_stop_flash (); tray_reset_counts (); - return XCHAT_EAT_NONE; + return HEXCHAT_EAT_NONE; } static void |