devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'master' into openpgp

Browse Source
This commit is contained in:
James Booth
2015-06-14 00:02:00 +01:00
parent b07a7035df e50461a897
commit 10a5f29023
6 changed files with 80 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/command/commands.c
View File

@@ -1494,13 +1494,13 @@ cmd_roster(gchar **args, struct cmd_help_t help)
{
jabber_conn_status_t conn_status = jabber_get_connection_status();
if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected.");
return TRUE;
}
// show roster
if (args[0] == NULL) {
if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected.");
return TRUE;
}
GSList *list = roster_get_contacts();
cons_show_roster(list);
g_slist_free(list);
@@ -1508,6 +1508,11 @@ cmd_roster(gchar **args, struct cmd_help_t help)
// show roster, only online contacts
} else if(g_strcmp0(args[0], "online") == 0){
if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected.");
return TRUE;
}
GSList *list = roster_get_contacts_online();
cons_show_roster(list);
g_slist_free(list);
@@ -1525,7 +1530,7 @@ cmd_roster(gchar **args, struct cmd_help_t help)
if (res) {
prefs_set_roster_size(intval);
cons_show("Roster screen size set to: %d%%", intval);
if (prefs_get_boolean(PREF_ROSTER)) {
if (conn_status == JABBER_CONNECTED && prefs_get_boolean(PREF_ROSTER)) {
wins_resize_all();
}
return TRUE;
@@ -1540,17 +1545,23 @@ cmd_roster(gchar **args, struct cmd_help_t help)
if (args[1] == NULL) {
cons_show("Roster enabled.");
prefs_set_boolean(PREF_ROSTER, TRUE);
ui_show_roster();
if (conn_status == JABBER_CONNECTED) {
ui_show_roster();
}
return TRUE;
} else if (g_strcmp0(args[1], "offline") == 0) {
cons_show("Roster offline enabled");
prefs_set_boolean(PREF_ROSTER_OFFLINE, TRUE);
rosterwin_roster();
if (conn_status == JABBER_CONNECTED) {
rosterwin_roster();
}
return TRUE;
} else if (g_strcmp0(args[1], "resource") == 0) {
cons_show("Roster resource enabled");
prefs_set_boolean(PREF_ROSTER_RESOURCE, TRUE);
rosterwin_roster();
if (conn_status == JABBER_CONNECTED) {
rosterwin_roster();
}
return TRUE;
} else {
cons_show("Usage: %s", help.usage);
@@ -1560,17 +1571,23 @@ cmd_roster(gchar **args, struct cmd_help_t help)
if (args[1] == NULL) {
cons_show("Roster disabled.");
prefs_set_boolean(PREF_ROSTER, FALSE);
ui_hide_roster();
if (conn_status == JABBER_CONNECTED) {
ui_hide_roster();
}
return TRUE;
} else if (g_strcmp0(args[1], "offline") == 0) {
cons_show("Roster offline disabled");
prefs_set_boolean(PREF_ROSTER_OFFLINE, FALSE);
rosterwin_roster();
if (conn_status == JABBER_CONNECTED) {
rosterwin_roster();
}
return TRUE;
} else if (g_strcmp0(args[1], "resource") == 0) {
cons_show("Roster resource disabled");
prefs_set_boolean(PREF_ROSTER_RESOURCE, FALSE);
rosterwin_roster();
if (conn_status == JABBER_CONNECTED) {
rosterwin_roster();
}
return TRUE;
} else {
cons_show("Usage: %s", help.usage);
@@ -1581,17 +1598,23 @@ cmd_roster(gchar **args, struct cmd_help_t help)
if (g_strcmp0(args[1], "group") == 0) {
cons_show("Grouping roster by roster group");
prefs_set_string(PREF_ROSTER_BY, "group");
rosterwin_roster();
if (conn_status == JABBER_CONNECTED) {
rosterwin_roster();
}
return TRUE;
} else if (g_strcmp0(args[1], "presence") == 0) {
cons_show("Grouping roster by presence");
prefs_set_string(PREF_ROSTER_BY, "presence");
rosterwin_roster();
if (conn_status == JABBER_CONNECTED) {
rosterwin_roster();
}
return TRUE;
} else if (g_strcmp0(args[1], "none") == 0) {
cons_show("Roster grouping disabled");
prefs_set_string(PREF_ROSTER_BY, "none");
rosterwin_roster();
if (conn_status == JABBER_CONNECTED) {
rosterwin_roster();
}
return TRUE;
} else {
cons_show("Usage: %s", help.usage);
@@ -1599,6 +1622,10 @@ cmd_roster(gchar **args, struct cmd_help_t help)
}
// add contact
} else if (strcmp(args[0], "add") == 0) {
if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected.");
return TRUE;
}
char *jid = args[1];
if (jid == NULL) {
cons_show("Usage: %s", help.usage);
@@ -1610,6 +1637,10 @@ cmd_roster(gchar **args, struct cmd_help_t help)
// remove contact
} else if (strcmp(args[0], "remove") == 0) {
if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected.");
return TRUE;
}
char *jid = args[1];
if (jid == NULL) {
cons_show("Usage: %s", help.usage);
@@ -1620,6 +1651,10 @@ cmd_roster(gchar **args, struct cmd_help_t help)
// change nickname
} else if (strcmp(args[0], "nick") == 0) {
if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected.");
return TRUE;
}
char *jid = args[1];
if (jid == NULL) {
cons_show("Usage: %s", help.usage);
@@ -1650,6 +1685,10 @@ cmd_roster(gchar **args, struct cmd_help_t help)
// remove nickname
} else if (strcmp(args[0], "clearnick") == 0) {
if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected.");
return TRUE;
}
char *jid = args[1];
if (jid == NULL) {
cons_show("Usage: %s", help.usage);