[ekg-commit] r2831 - in trunk: . src

[EKG commit list]

Author: gophi
Date: 2009-06-26 01:21:36 +0200 (Fri, 26 Jun 2009)
New Revision: 2831

Modified:
trunk/ChangeLog
trunk/src/commands.c
Log:
- dodanie /list -f oraz -D (zigi/g)



Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-06-25 23:13:12 UTC (rev 2830)
+++ trunk/ChangeLog 2009-06-25 23:21:36 UTC (rev 2831)
@@ -7,6 +7,7 @@
// 2009-06-26

- aktualizacja man?w (gophi)
+- dodanie /list -f oraz -D (zigi/g)

// 2009-06-17


Modified: trunk/src/commands.c
===================================================================
--- trunk/src/commands.c 2009-06-25 23:13:12 UTC (rev 2830)
+++ trunk/src/commands.c 2009-06-25 23:21:36 UTC (rev 2831)
@@ -1831,6 +1831,7 @@
list_t l;
int count = 0, show_all = 1, show_busy = 0, show_active = 0, show_group_inverted = 0;
int show_inactive = 0, show_invisible = 0, show_descr = 0, show_blocked = 0, show_offline = 0, j;
+ int show_ffc = 0, show_dnd = 0;
char **argv = NULL, *show_group = NULL, *ip_str;
const char *tmp;
int params_null = 0;
@@ -2255,6 +2256,16 @@
show_busy = 1;
}

+ if (match_arg(argv[i], 'f', "ffc", 2)) {
+ show_all = 0;
+ show_ffc = 1;
+ }
+
+ if (match_arg(argv[i], 'D', "dnd", 2)) {
+ show_all = 0;
+ show_dnd = 1;
+ }
+
if (match_arg(argv[i], 'I', "invisible", 2)) {
show_all = 0;
show_invisible = 1;
@@ -2319,12 +2330,18 @@

show = show_all;

- if (show_busy && GG_S_B(u->status))
+ if (show_busy && GG_S_B(u->status) && !GG_S_DD(u->status))
show = 1;

- if (show_active && GG_S_A(u->status))
+ if (show_ffc && GG_S_FF(u->status))
show = 1;

+ if (show_dnd && GG_S_DD(u->status))
+ show = 1;
+
+ if (show_active && GG_S_A(u->status) && !GG_S_FF(u->status))
+ show = 1;
+
if (show_inactive && GG_S_NA(u->status))
show = 1;

@@ -6631,6 +6648,8 @@
"Wy?wietlanie os?b o podanym stanie \"list [-a|-b|-i|-I|-B|-d|-m|-o]\":\n"
" -a, --active dost?pne\n"
" -b, --busy zaj?te\n"
+ " -f, --ffc chc?ce poGGada?\n"
+ " -D, --dnd nie chc?ce, ?eby im przeszkadzano\n"
" -i, --inactive niedost?pne\n"
" -I, --invisible niewidoczne\n"
" -B, --blocked blokuj?ce nas\n"