aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-29 19:56:07 -04:00
Code

Merge branch 'master' into plugins

Browse Source
This commit is contained in:
James Booth 2014-03-16 18:23:31 +00:00
commit 7dd4c92d47
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/command/command.c
View File

@ -63,7 +63,7 @@ static char * _account_autocomplete(char *input, int *size);
static char * _who_autocomplete(char *input, int *size); static char * _who_autocomplete(char *input, int *size);
static char * _roster_autocomplete(char *input, int *size); static char * _roster_autocomplete(char *input, int *size);
static char * _group_autocomplete(char *input, int *size); static char * _group_autocomplete(char *input, int *size);
static char * _bookmark_autocomplete(char *input, int *size); //static char * _bookmark_autocomplete(char *input, int *size);
static char * _otr_autocomplete(char *input, int *size); static char * _otr_autocomplete(char *input, int *size);
static char * _connect_autocomplete(char *input, int *size); static char * _connect_autocomplete(char *input, int *size);
static char * _statuses_autocomplete(char *input, int *size); static char * _statuses_autocomplete(char *input, int *size);
@ -297,7 +297,7 @@ static struct cmd_t command_defs[] =
"Example : /rooms conference.jabber.org", "Example : /rooms conference.jabber.org",
"Example : /rooms (if logged in as me@server.org, is equivalent to /rooms conference.server.org)", "Example : /rooms (if logged in as me@server.org, is equivalent to /rooms conference.server.org)",
NULL } } }, NULL } } },
/*
{ "/bookmark", { "/bookmark",
cmd_bookmark, parse_args, 0, 4, NULL, cmd_bookmark, parse_args, 0, 4, NULL,
{ "/bookmark [add|list|remove] [room@server] [autojoin on|off] [nick nickname]", { "/bookmark [add|list|remove] [room@server] [autojoin on|off] [nick nickname]",
@ -306,7 +306,7 @@ static struct cmd_t command_defs[] =
"---------------------------------------------------------------------------", "---------------------------------------------------------------------------",
"Manage bookmarks.", "Manage bookmarks.",
NULL } } }, NULL } } },
*/
{ "/disco", { "/disco",
cmd_disco, parse_args, 1, 2, NULL, cmd_disco, parse_args, 1, 2, NULL,
{ "/disco command entity", "Service discovery.", { "/disco command entity", "Service discovery.",
@ -871,7 +871,7 @@ static Autocomplete close_ac;
static Autocomplete wins_ac; static Autocomplete wins_ac;
static Autocomplete roster_ac; static Autocomplete roster_ac;
static Autocomplete group_ac; static Autocomplete group_ac;
static Autocomplete bookmark_ac; //static Autocomplete bookmark_ac;
static Autocomplete otr_ac; static Autocomplete otr_ac;
static Autocomplete otr_log_ac; static Autocomplete otr_log_ac;
static Autocomplete connect_property_ac; static Autocomplete connect_property_ac;
@ -1042,12 +1042,12 @@ cmd_init(void)
autocomplete_add(who_ac, "available"); autocomplete_add(who_ac, "available");
autocomplete_add(who_ac, "unavailable"); autocomplete_add(who_ac, "unavailable");
autocomplete_add(who_ac, "any"); autocomplete_add(who_ac, "any");
/*
bookmark_ac = autocomplete_new(); bookmark_ac = autocomplete_new();
autocomplete_add(bookmark_ac, "add"); autocomplete_add(bookmark_ac, "add");
autocomplete_add(bookmark_ac, "list"); autocomplete_add(bookmark_ac, "list");
autocomplete_add(bookmark_ac, "remove"); autocomplete_add(bookmark_ac, "remove");
*/
otr_ac = autocomplete_new(); otr_ac = autocomplete_new();
autocomplete_add(otr_ac, "gen"); autocomplete_add(otr_ac, "gen");
autocomplete_add(otr_ac, "start"); autocomplete_add(otr_ac, "start");
@ -1117,7 +1117,7 @@ cmd_uninit(void)
autocomplete_free(wins_ac); autocomplete_free(wins_ac);
autocomplete_free(roster_ac); autocomplete_free(roster_ac);
autocomplete_free(group_ac); autocomplete_free(group_ac);
autocomplete_free(bookmark_ac); // autocomplete_free(bookmark_ac);
autocomplete_free(otr_ac); autocomplete_free(otr_ac);
autocomplete_free(otr_log_ac); autocomplete_free(otr_log_ac);
autocomplete_free(connect_property_ac); autocomplete_free(connect_property_ac);
@ -1240,7 +1240,7 @@ cmd_reset_autocomplete()
autocomplete_reset(wins_ac); autocomplete_reset(wins_ac);
autocomplete_reset(roster_ac); autocomplete_reset(roster_ac);
autocomplete_reset(group_ac); autocomplete_reset(group_ac);
autocomplete_reset(bookmark_ac); // autocomplete_reset(bookmark_ac);
autocomplete_reset(otr_ac); autocomplete_reset(otr_ac);
autocomplete_reset(otr_log_ac); autocomplete_reset(otr_log_ac);
autocomplete_reset(connect_property_ac); autocomplete_reset(connect_property_ac);
@ -1249,7 +1249,7 @@ cmd_reset_autocomplete()
autocomplete_reset(alias_ac); autocomplete_reset(alias_ac);
autocomplete_reset(aliases_ac); autocomplete_reset(aliases_ac);
autocomplete_reset(join_property_ac); autocomplete_reset(join_property_ac);
bookmark_autocomplete_reset(); // bookmark_autocomplete_reset();
} }
// Command execution // Command execution
@ -1529,7 +1529,8 @@ _cmd_complete_parameters(char *input, int *size)
autocompleter acs[] = { _who_autocomplete, _sub_autocomplete, _notify_autocomplete, autocompleter acs[] = { _who_autocomplete, _sub_autocomplete, _notify_autocomplete,
_autoaway_autocomplete, _titlebar_autocomplete, _theme_autocomplete, _autoaway_autocomplete, _titlebar_autocomplete, _theme_autocomplete,
_account_autocomplete, _roster_autocomplete, _group_autocomplete, _account_autocomplete, _roster_autocomplete, _group_autocomplete,
_bookmark_autocomplete, _autoconnect_autocomplete, _otr_autocomplete, // _bookmark_autocomplete, _autoconnect_autocomplete, _otr_autocomplete,
_autoconnect_autocomplete, _otr_autocomplete,
_connect_autocomplete, _statuses_autocomplete, _alias_autocomplete, _connect_autocomplete, _statuses_autocomplete, _alias_autocomplete,
_join_autocomplete }; _join_autocomplete };
@ -1601,7 +1602,7 @@ _group_autocomplete(char *input, int *size)
return NULL; return NULL;
} }
/*
static char * static char *
_bookmark_autocomplete(char *input, int *size) _bookmark_autocomplete(char *input, int *size)
{ {
@ -1629,6 +1630,7 @@ _bookmark_autocomplete(char *input, int *size)
return result; return result;
} }
*/
static char * static char *
_notify_autocomplete(char *input, int *size) _notify_autocomplete(char *input, int *size)

2
src/xmpp/connection.c
View File

@ -439,7 +439,7 @@ _connection_handler(xmpp_conn_t * const conn,
iq_add_handlers(); iq_add_handlers();
roster_request(); roster_request();
bookmark_request(); // bookmark_request();
jabber_conn.conn_status = JABBER_CONNECTED; jabber_conn.conn_status = JABBER_CONNECTED;
if (prefs_get_reconnect() != 0) { if (prefs_get_reconnect() != 0) {