Mercurial > pidgin
changeset 21969:27d665278485
merge of '7e8103bd3c5298a43a4e18bb59037980f5c213c9'
and 'dc6923294f5f33ff7a52a998e1b9e9ad47be0211'
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Wed, 02 Jan 2008 06:42:29 +0000 |
| parents | a463f05b4566 (diff) eaaac273d80c (current diff) |
| children | a83a70314f8a |
| files | |
| diffstat | 5 files changed, 12 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/connection.h Wed Jan 02 06:36:35 2008 +0000 +++ b/libpurple/connection.h Wed Jan 02 06:42:29 2008 +0000 @@ -196,11 +196,11 @@ * available; on Windows, it uses Win32's network change notification * infrastructure. */ - void (*network_connected)(); + void (*network_connected)(void); /** Called when libpurple discovers that the computer's network * connection has gone away. */ - void (*network_disconnected)(); + void (*network_disconnected)(void); /** Called when an error causes a connection to be disconnected. * Called before #disconnected. This op is intended to replace
--- a/libpurple/plugin.c Wed Jan 02 06:36:35 2008 +0000 +++ b/libpurple/plugin.c Wed Jan 02 06:42:29 2008 +0000 @@ -667,7 +667,10 @@ } else { +#if 0 + /* This isn't necessary. This has already been done when unloading dep_plugin. */ plugin->dependent_plugins = g_list_delete_link(plugin->dependent_plugins, l); +#endif } } }
--- a/libpurple/protocols/irc/cmds.c Wed Jan 02 06:36:35 2008 +0000 +++ b/libpurple/protocols/irc/cmds.c Wed Jan 02 06:42:29 2008 +0000 @@ -367,7 +367,12 @@ if (!end) end = cur + strlen(cur); msg = g_strndup(cur, end - cur); - buf = irc_format(irc, "vt:", "PRIVMSG", args[0], msg); + + if(!strcmp(cmd, "msg")) + buf = irc_format(irc, "vt:", "PRIVMSG", args[0], msg); + else /* seding a notice if we get here */ + buf = irc_format(irc, "vt:", "NOTICE", args[0], msg); + irc_send(irc, buf); g_free(msg); g_free(buf);
--- a/libpurple/protocols/irc/parse.c Wed Jan 02 06:36:35 2008 +0000 +++ b/libpurple/protocols/irc/parse.c Wed Jan 02 06:42:29 2008 +0000 @@ -136,6 +136,7 @@ { "names", "c", irc_cmd_names, N_("names [channel]: List the users currently in a channel.") }, { "nick", "n", irc_cmd_nick, N_("nick <new nickname>: Change your nickname.") }, { "nickserv", ":", irc_cmd_service, N_("nickserv: Send a command to nickserv") }, + { "notice", "t:", irc_cmd_privmsg, N_("notice <target<: Send a notice to a user or channel.") }, { "op", ":", irc_cmd_op, N_("op <nick1> [nick2] ...: Grant channel operator status to someone. You must be a channel operator to do this.") }, { "operwall", ":", irc_cmd_wallops, N_("operwall <message>: If you don't know what this is, you probably can't use it.") }, { "operserv", ":", irc_cmd_service, N_("operserv: Send a command to operserv") },
--- a/pidgin/gtkconn.c Wed Jan 02 06:36:35 2008 +0000 +++ b/pidgin/gtkconn.c Wed Jan 02 06:42:29 2008 +0000 @@ -162,11 +162,6 @@ if (info != NULL) g_hash_table_remove(auto_reconns, account); - /* - * TODO: Do we really want to disable the account when it's - * disconnected by wants_to_die? This happens when you sign - * on from somewhere else, or when you enter an invalid password. - */ purple_account_set_enabled(account, PIDGIN_UI, FALSE); }