moparisthebest
/
hexchat
mirror of https://github.com/moparisthebest/hexchat
1
0
Fork 0
Code Issues Releases Wiki Activity

Some more cleanup for SysInfo

This commit is contained in:
Berke Viktor 2012-10-21 12:49:55 +02:00
parent d9dc34499d
commit 1e7d7101c6
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/sysinfo/xsys.c
View File

@ -578,13 +578,13 @@ netdata_cb (char *word[], char *word_eol[], void *userdata)
xchat_pluginpref_get_str (ph, "format", format); xchat_pluginpref_get_str (ph, "format", format);
format_output ("Netdata", netdata, format); format_output ("Netdata", netdata, format);
if ((long)userdata) if (xchat_list_int (ph, NULL, "type") >= 2)
{ {
xchat_printf (ph, "%s", netdata); xchat_commandf (ph, "ME %s", netdata);
} }
else else
{ {
xchat_commandf (ph, "say %s", netdata); xchat_printf (ph, "%s", netdata);
} }
return XCHAT_EAT_ALL; return XCHAT_EAT_ALL;
@ -651,13 +651,13 @@ netstream_cb (char *word[], char *word_eol[], void *userdata)
xchat_pluginpref_get_str (ph, "format", format); xchat_pluginpref_get_str (ph, "format", format);
format_output ("Netstream", netstream, format); format_output ("Netstream", netstream, format);
if ((long)userdata) if (xchat_list_int (ph, NULL, "type") >= 2)
{ {
xchat_printf (ph, "%s", netstream); xchat_commandf (ph, "ME %s", netstream);
} }
else else
{ {
xchat_commandf (ph, "say %s", netstream); xchat_printf (ph, "%s", netstream);
} }
return XCHAT_EAT_ALL; return XCHAT_EAT_ALL;
@ -746,11 +746,9 @@ xchat_plugin_init (xchat_plugin *plugin_handle, char **plugin_name, char **plugi
*plugin_version = version; *plugin_version = version;
char buffer[bsize]; char buffer[bsize];
xchat_hook_command (ph, "SYSINFO", XCHAT_PRI_NORM, sysinfo_cb, "Usage: /SYSINFO [OS|DISTRO|CPU|RAM|DISK|VGA|SOUND|ETHERNET|UPTIME]", 0); xchat_hook_command (ph, "SYSINFO", XCHAT_PRI_NORM, sysinfo_cb, "Usage: /SYSINFO [OS|DISTRO|CPU|RAM|DISK|VGA|SOUND|ETHERNET|UPTIME]", NULL);
xchat_hook_command (ph, "NETDATA", XCHAT_PRI_NORM, netdata_cb, NULL, (void *) 0); xchat_hook_command (ph, "SYSNETDATA", XCHAT_PRI_NORM, netdata_cb, NULL, NULL);
xchat_hook_command (ph, "ENETDATA", XCHAT_PRI_NORM, netdata_cb, NULL, (void *) 1); xchat_hook_command (ph, "SYSNETSTREAM", XCHAT_PRI_NORM, netstream_cb, NULL, NULL);
xchat_hook_command (ph, "NETSTREAM", XCHAT_PRI_NORM, netstream_cb, NULL, (void *) 0);
xchat_hook_command (ph, "ENETSTREAM", XCHAT_PRI_NORM, netstream_cb, NULL, (void *) 1);
/* this is required for the very first run */ /* this is required for the very first run */
if (xchat_pluginpref_get_str (ph, "pciids", buffer) == 0) if (xchat_pluginpref_get_str (ph, "pciids", buffer) == 0)