diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/cfgfiles.c | 1 | ||||
| -rw-r--r-- | src/common/dbus/example.c | 2 | ||||
| -rw-r--r-- | src/common/hexchat.h | 1 | ||||
| -rw-r--r-- | src/common/outbound.c | 38 | ||||
| -rw-r--r-- | src/common/server.c | 6 | ||||
| -rw-r--r-- | src/common/textevents.in | 4 |
6 files changed, 10 insertions, 42 deletions
diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c index 4e7dad5f..9e0146c4 100644 --- a/src/common/cfgfiles.c +++ b/src/common/cfgfiles.c @@ -373,7 +373,6 @@ const struct prefs vars[] = {"away_auto_unmark", P_OFFINT (hex_away_auto_unmark), TYPE_BOOL}, {"away_omit_alerts", P_OFFINT (hex_away_omit_alerts), TYPE_BOOL}, {"away_reason", P_OFFSET (hex_away_reason), TYPE_STR}, - {"away_show_message", P_OFFINT (hex_away_show_message), TYPE_BOOL}, {"away_show_once", P_OFFINT (hex_away_show_once), TYPE_BOOL}, {"away_size_max", P_OFFINT (hex_away_size_max), TYPE_INT}, {"away_timeout", P_OFFINT (hex_away_timeout), TYPE_INT}, diff --git a/src/common/dbus/example.c b/src/common/dbus/example.c index b78bb004..ee1833d3 100644 --- a/src/common/dbus/example.c +++ b/src/common/dbus/example.c @@ -102,7 +102,9 @@ main (int argc, char **argv) gchar *path; GError *error = NULL; +#if ! GLIB_CHECK_VERSION (2, 36, 0) g_type_init (); +#endif connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); if (connection == NULL) { diff --git a/src/common/hexchat.h b/src/common/hexchat.h index 327894df..dd30dce6 100644 --- a/src/common/hexchat.h +++ b/src/common/hexchat.h @@ -134,7 +134,6 @@ struct hexchatprefs /* BOOLEANS */ unsigned int hex_away_auto_unmark; unsigned int hex_away_omit_alerts; - unsigned int hex_away_show_message; unsigned int hex_away_show_once; unsigned int hex_away_track; unsigned int hex_completion_auto; diff --git a/src/common/outbound.c b/src/common/outbound.c index c8d0397d..c8e0ff64 100644 --- a/src/common/outbound.c +++ b/src/common/outbound.c @@ -362,7 +362,6 @@ cmd_allservers (struct session *sess, char *tbuf, char *word[], static int cmd_away (struct session *sess, char *tbuf, char *word[], char *word_eol[]) { - GSList *list; char *reason = word_eol[2]; if (!(*reason)) @@ -382,21 +381,6 @@ cmd_away (struct session *sess, char *tbuf, char *word[], char *word_eol[]) } sess->server->p_set_away (sess->server, reason); - if (prefs.hex_away_show_message) - { - snprintf (tbuf, TBUFSIZE, "me is away: %s", reason); - for (list = sess_list; list; list = list->next) - { - /* am I the right server and not a dialog box */ - if (((struct session *) list->data)->server == sess->server - && ((struct session *) list->data)->type == SESS_CHANNEL - && ((struct session *) list->data)->channel[0]) - { - handle_command ((session *) list->data, tbuf, TRUE); - } - } - } - if (sess->server->last_away_reason != reason) { if (sess->server->last_away_reason) @@ -417,29 +401,9 @@ cmd_away (struct session *sess, char *tbuf, char *word[], char *word_eol[]) static int cmd_back (struct session *sess, char *tbuf, char *word[], char *word_eol[]) { - GSList *list; - unsigned int gone; - if (sess->server->is_away) { sess->server->p_set_back (sess->server); - - if (prefs.hex_away_show_message) - { - gone = time (NULL) - sess->server->away_time; - sprintf (tbuf, "me is back (gone %.2d:%.2d:%.2d)", gone / 3600, - (gone / 60) % 60, gone % 60); - for (list = sess_list; list; list = list->next) - { - /* am I the right server and not a dialog box */ - if (((struct session *) list->data)->server == sess->server - && ((struct session *) list->data)->type == SESS_CHANNEL - && ((struct session *) list->data)->channel[0]) - { - handle_command ((session *) list->data, tbuf, TRUE); - } - } - } } else { @@ -3834,7 +3798,7 @@ const struct commands xc_cmds[] = { {"NICK", cmd_nick, 0, 0, 1, N_("NICK <nickname>, sets your nick")}, {"NOTICE", cmd_notice, 1, 0, 1, - N_("NOTICE <nick/channel> <message>, sends a notice. Notices are a type of message that should be auto reacted to")}, + N_("NOTICE <nick/channel> <message>, sends a notice")}, {"NOTIFY", cmd_notify, 0, 0, 1, N_("NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or adds someone to it")}, {"OP", cmd_op, 1, 1, 1, diff --git a/src/common/server.c b/src/common/server.c index 6bcba087..1f4f626e 100644 --- a/src/common/server.c +++ b/src/common/server.c @@ -1762,7 +1762,11 @@ server_connect (server *serv, char *hostname, int port, int no_login) serv, 0, (DWORD *)&pid)); #else #ifdef LOOKUPD - rand(); /* CL: net_resolve calls rand() when LOOKUPD is set, so prepare a different seed for each child. This method giver a bigger variation in seed values than calling srand(time(0)) in the child itself. */ + /* CL: net_resolve calls rand() when LOOKUPD is set, so prepare a different + * seed for each child. This method gives a bigger variation in seed values + * than calling srand(time(0)) in the child itself. + */ + rand(); #endif switch (pid = fork ()) { diff --git a/src/common/textevents.in b/src/common/textevents.in index 2c12cf01..3b0b676a 100644 --- a/src/common/textevents.in +++ b/src/common/textevents.in @@ -103,7 +103,7 @@ pevt_chanhop_help Channel INVITE XP_TE_CHANINVITE pevt_chaninvite_help -%C22*%O$t%C26$1%C sets invite on %C18$2%O +%C22*%O$t%C26$1%C sets invite exempt on %C18$2%O 2 Channel List @@ -163,7 +163,7 @@ pevt_chanrmexempt_help Channel Remove Invite XP_TE_CHANRMINVITE pevt_chanrminvite_help -%C22*%O$t%C26$1%O removes invite on %C18$2%O +%C22*%O$t%C26$1%O removes invite exempt on %C18$2%O 2 Channel Remove Keyword |