aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
Code

Tidied autoaway code

Browse Source
This commit is contained in:
James Booth 2015-09-25 23:29:10 +01:00
parent ca3da5a929
commit 6f2487c5c1
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/profanity.c
View File

@ -172,19 +172,35 @@ _check_autoaway()
return; return;
} }
gint prefs_time = prefs_get_autoaway_time() * 60000; gint autoaway_time = prefs_get_autoaway_time() * 60000;
unsigned long idle_ms = ui_get_idle_time(); unsigned long idle_ms = ui_get_idle_time();
char *pref_autoaway_mode = prefs_get_string(PREF_AUTOAWAY_MODE); char *pref_autoaway_mode = prefs_get_string(PREF_AUTOAWAY_MODE);
if (idle) {
if (idle_ms < autoaway_time) {
idle = FALSE;
if (!idle) { // handle check
resource_presence_t current_presence = accounts_get_last_presence(jabber_get_account_name()); if (prefs_get_boolean(PREF_AUTOAWAY_CHECK)) {
if (strcmp(pref_autoaway_mode, "away") == 0) {
cl_ev_presence_send(autoaway_pre_presence, NULL, 0);
ui_end_auto_away(autoaway_pre_presence);
} else if (strcmp(pref_autoaway_mode, "idle") == 0) {
cl_ev_presence_send(autoaway_pre_presence, NULL, 0);
contact_presence_t contact_presence = contact_presence_from_resource_presence(autoaway_pre_presence);
ui_titlebar_presence(contact_presence);
}
}
}
} else {
char *account_name = jabber_get_account_name();
resource_presence_t current_presence = accounts_get_last_presence(account_name);
autoaway_pre_presence = current_presence; autoaway_pre_presence = current_presence;
if ((current_presence == RESOURCE_ONLINE) if ((current_presence == RESOURCE_ONLINE)
|| (current_presence == RESOURCE_CHAT) || (current_presence == RESOURCE_CHAT)
|| (current_presence == RESOURCE_DND)) { || (current_presence == RESOURCE_DND)) {
if (idle_ms >= prefs_time) { if (idle_ms >= autoaway_time) {
idle = TRUE; idle = TRUE;
char *pref_autoaway_message = prefs_get_string(PREF_AUTOAWAY_MESSAGE); char *pref_autoaway_message = prefs_get_string(PREF_AUTOAWAY_MESSAGE);
@ -197,24 +213,6 @@ _check_autoaway()
} else if (strcmp(pref_autoaway_mode, "idle") == 0) { } else if (strcmp(pref_autoaway_mode, "idle") == 0) {
cl_ev_presence_send(current_presence, pref_autoaway_message, idle_ms / 1000); cl_ev_presence_send(current_presence, pref_autoaway_message, idle_ms / 1000);
} }
prefs_free_string(pref_autoaway_message);
}
}
} else {
if (idle_ms < prefs_time) {
idle = FALSE;
// handle check
if (prefs_get_boolean(PREF_AUTOAWAY_CHECK)) {
if (strcmp(pref_autoaway_mode, "away") == 0) {
cl_ev_presence_send(autoaway_pre_presence, NULL, 0);
ui_end_auto_away(autoaway_pre_presence);
} else if (strcmp(pref_autoaway_mode, "idle") == 0) {
cl_ev_presence_send(autoaway_pre_presence, NULL, 0);
ui_titlebar_presence(contact_presence_from_resource_presence(autoaway_pre_presence));
}
} }
} }
} }