[Gpa-commits] r926 - trunk/src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2008-12-18 16:50:45 +0100 (Thu, 18 Dec 2008)
New Revision: 926

Modified:
   trunk/src/cardman.c
   trunk/src/filewatch.c
Log:
Use another event to detect a card status change.


Modified: trunk/src/cardman.c
===================================================================
--- trunk/src/cardman.c	2008-12-17 18:41:28 UTC (rev 925)
+++ trunk/src/cardman.c	2008-12-18 15:50:45 UTC (rev 926)
@@ -278,7 +278,7 @@
 {
   GpaCardManager *cardman = opaque;
 
-  if (cardman && strchr (reason, 'c') )
+  if (cardman && strchr (reason, 'w') )
     card_reload (cardman);
 }
 
@@ -503,7 +503,7 @@
   char *fname;
 
   fname = g_build_filename (gnupg_homedir, "reader_0.status", NULL);
-  cardman->watch = gpa_add_filewatch (fname, "c", watcher_cb, cardman);
+  cardman->watch = gpa_add_filewatch (fname, "w", watcher_cb, cardman);
   xfree (fname);
 }
 

Modified: trunk/src/filewatch.c
===================================================================
--- trunk/src/filewatch.c	2008-12-17 18:41:28 UTC (rev 925)
+++ trunk/src/filewatch.c	2008-12-18 15:50:45 UTC (rev 926)
@@ -94,9 +94,6 @@
       while (nread >= sizeof *ev) 
         {
           ev = (void *)p;
-          g_debug ("event: wd=%d mask=%#x cookie=%#x len=%u name=`%.*s'",
-                   ev->wd, ev->mask, ev->cookie, ev->len, 
-                   (int)ev->len, ev->name);
 #define MAKEREASON(a,b) do { if ((ev->mask & (b))                   \
                                   && reasonidx < sizeof reason) \
                                 reason[reasonidx++] = (a);      \