[GNUnet-SVN] r1816 - in GNUnet: . po src/applications/fs/fsui src/applications/fs/tools src/include

[grothoff]

Author: grothoff
Date: 2005-08-20 20:05:10 -0700 (Sat, 20 Aug 2005)
New Revision: 1816

Modified:
   GNUnet/configure.ac
   GNUnet/po/GNUnet.pot
   GNUnet/po/de.po
   GNUnet/po/rw.po
   GNUnet/po/vi.po
   GNUnet/src/applications/fs/fsui/file_info.c
   GNUnet/src/applications/fs/tools/gnunet-directory.c
   GNUnet/src/include/gnunet_fsui_lib.h
Log:
cleanup

Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2005-08-21 02:25:15 UTC (rev 1815)
+++ GNUnet/configure.ac 2005-08-21 03:05:10 UTC (rev 1816)
@@ -21,8 +21,8 @@
 #
 #
 AC_PREREQ(2.57)
-AC_INIT([GNUnet], [0.7.0pre6],address@hidden)
-AM_INIT_AUTOMAKE([GNUnet], [0.7.0pre6])
+AC_INIT([GNUnet], [0.7.0pre6-svn],address@hidden)
+AM_INIT_AUTOMAKE([GNUnet], [0.7.0pre6-svn])
 AM_CONFIG_HEADER([config.h])
 
 AH_TOP([#define _GNU_SOURCE  1])

Modified: GNUnet/po/GNUnet.pot
===================================================================
--- GNUnet/po/GNUnet.pot        2005-08-21 02:25:15 UTC (rev 1815)
+++ GNUnet/po/GNUnet.pot        2005-08-21 03:05:10 UTC (rev 1816)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-08-20 13:51-0700\n"
+"POT-Creation-Date: 2005-08-20 19:23-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -2866,41 +2866,41 @@
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr ""
 
-#: src/server/connection.c:2209
+#: src/server/connection.c:2210
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr ""
 
-#: src/server/connection.c:2286
+#: src/server/connection.c:2287
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr ""
 
-#: src/server/connection.c:2302
+#: src/server/connection.c:2303
 msgid "Message received more than one day old. Dropped.\n"
 msgstr ""
 
-#: src/server/connection.c:2696
+#: src/server/connection.c:2697
 msgid "# outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:2698
+#: src/server/connection.c:2699
 msgid "# bytes of outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:2700
+#: src/server/connection.c:2701
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:2702
+#: src/server/connection.c:2703
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/server/connection.c:2704
+#: src/server/connection.c:2705
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/server/connection.c:2706
+#: src/server/connection.c:2707
 msgid "# bytes noise sent"
 msgstr ""
 

Modified: GNUnet/po/de.po
===================================================================
--- GNUnet/po/de.po     2005-08-21 02:25:15 UTC (rev 1815)
+++ GNUnet/po/de.po     2005-08-21 03:05:10 UTC (rev 1816)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre5\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-08-20 13:51-0700\n"
+"POT-Creation-Date: 2005-08-20 19:23-0700\n"
 "PO-Revision-Date: 2005-08-20 14:11+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -3238,42 +3238,42 @@
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Nachrichten Details: %u: L�nge %d, Priorit�t: %d\n"
 
-#: src/server/connection.c:2209
+#: src/server/connection.c:2210
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Nachricht von `%s' verworfen: ung�ltiges Format.\n"
 
-#: src/server/connection.c:2286
+#: src/server/connection.c:2287
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr "Ung�ltige Sequenznummer %u <= %u, Nachricht wird verworfen.\n"
 
-#: src/server/connection.c:2302
+#: src/server/connection.c:2303
 msgid "Message received more than one day old. Dropped.\n"
 msgstr ""
 "Empfangene Nachricht ist mehr als ein Tag alt. Nachricht wird verworfen.\n"
 
-#: src/server/connection.c:2696
+#: src/server/connection.c:2697
 msgid "# outgoing messages dropped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/server/connection.c:2698
+#: src/server/connection.c:2699
 msgid "# bytes of outgoing messages dropped"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/server/connection.c:2700
+#: src/server/connection.c:2701
 msgid "# connections closed (HANGUP sent)"
 msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
-#: src/server/connection.c:2702
+#: src/server/connection.c:2703
 msgid "# bytes encrypted"
 msgstr "# Bytes verschl�sselt"
 
-#: src/server/connection.c:2704
+#: src/server/connection.c:2705
 msgid "# bytes decrypted"
 msgstr "# Bytes entschl�sselt"
 
-#: src/server/connection.c:2706
+#: src/server/connection.c:2707
 msgid "# bytes noise sent"
 msgstr "# Bytes Rauschen gesendet"
 

Modified: GNUnet/po/rw.po
===================================================================
--- GNUnet/po/rw.po     2005-08-21 02:25:15 UTC (rev 1815)
+++ GNUnet/po/rw.po     2005-08-21 03:05:10 UTC (rev 1816)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre0\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-08-20 13:51-0700\n"
+"POT-Creation-Date: 2005-08-20 19:23-0700\n"
 "PO-Revision-Date: 2005-04-04 10:55-0700\n"
 "Last-Translator: Steven Michael Murphy <address@hidden>\n"
 "Language-Team: Kinyarwanda <address@hidden>\n"
@@ -3150,46 +3150,46 @@
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Birambuye Uburebure By'ibanze"
 
-#: src/server/connection.c:2209
+#: src/server/connection.c:2210
 #, fuzzy, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Bivuye Sibyo Imiterere"
 
-#: src/server/connection.c:2286
+#: src/server/connection.c:2287
 #, fuzzy, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr "Umubare Bya"
 
-#: src/server/connection.c:2302
+#: src/server/connection.c:2303
 #, fuzzy
 msgid "Message received more than one day old. Dropped.\n"
 msgstr "BYAKIRIWE Birenzeho UMUNSI ki/ bishaje"
 
-#: src/server/connection.c:2696
+#: src/server/connection.c:2697
 #, fuzzy
 msgid "# outgoing messages dropped"
 msgstr "#Ubutumwa"
 
-#: src/server/connection.c:2698
+#: src/server/connection.c:2699
 #, fuzzy
 msgid "# bytes of outgoing messages dropped"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/server/connection.c:2700
+#: src/server/connection.c:2701
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:2702
+#: src/server/connection.c:2703
 #, fuzzy
 msgid "# bytes encrypted"
 msgstr "#Bayite"
 
-#: src/server/connection.c:2704
+#: src/server/connection.c:2705
 #, fuzzy
 msgid "# bytes decrypted"
 msgstr "#Bayite"
 
-#: src/server/connection.c:2706
+#: src/server/connection.c:2707
 #, fuzzy
 msgid "# bytes noise sent"
 msgstr "#Bayite Bya BYAKIRIWE"

Modified: GNUnet/po/vi.po
===================================================================
--- GNUnet/po/vi.po     2005-08-21 02:25:15 UTC (rev 1815)
+++ GNUnet/po/vi.po     2005-08-21 03:05:10 UTC (rev 1816)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre4\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-08-20 13:51-0700\n"
+"POT-Creation-Date: 2005-08-20 19:23-0700\n"
 "PO-Revision-Date: 2005-07-05 21:18+0400\n"
 "Last-Translator: Phan Vinh Thinh <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -3136,43 +3136,43 @@
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Chi tiết về thông báo: %u: dài %d, ưu tiên: %d\n"
 
-#: src/server/connection.c:2209
+#: src/server/connection.c:2210
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Bỏ đi thông báo từ `%s': định dạng sai.\n"
 
-#: src/server/connection.c:2286
+#: src/server/connection.c:2287
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr "Số của chuỗi sai %u <= %u, đang bỏ đi thông báo.\n"
 
-#: src/server/connection.c:2302
+#: src/server/connection.c:2303
 msgid "Message received more than one day old. Dropped.\n"
 msgstr "Thông báo nhận được cũ hơn một ngày. Đã loại bỏ.\n"
 
-#: src/server/connection.c:2696
+#: src/server/connection.c:2697
 msgid "# outgoing messages dropped"
 msgstr "# thông báo đi ra đã loại bỏ"
 
-#: src/server/connection.c:2698
+#: src/server/connection.c:2699
 msgid "# bytes of outgoing messages dropped"
 msgstr "# byte của các thông báo đi ra đã loại bỏ"
 
-#: src/server/connection.c:2700
+#: src/server/connection.c:2701
 msgid "# connections closed (HANGUP sent)"
 msgstr "# các kết nối đã đóng (gửi HANGUP)"
 
-#: src/server/connection.c:2702
+#: src/server/connection.c:2703
 #, fuzzy
 msgid "# bytes encrypted"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/server/connection.c:2704
+#: src/server/connection.c:2705
 #, fuzzy
 msgid "# bytes decrypted"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/server/connection.c:2706
+#: src/server/connection.c:2707
 #, fuzzy
 msgid "# bytes noise sent"
 msgstr "# byte nhận được do nhiễu đường truyền"

Modified: GNUnet/src/applications/fs/fsui/file_info.c
===================================================================
--- GNUnet/src/applications/fs/fsui/file_info.c 2005-08-21 02:25:15 UTC (rev 
1815)
+++ GNUnet/src/applications/fs/fsui/file_info.c 2005-08-21 03:05:10 UTC (rev 
1816)
@@ -116,7 +116,7 @@
  * Remove all of the root-nodes of a particular type
  * from the tracking database.
  */
-static void emptyTrackDatabase() {
+void FSUI_clearTrackedURIS() {
   IPC_Semaphore * sem;
 
   sem = createIPC();
@@ -130,12 +130,9 @@
  * Toggle tracking URIs.
  *
  * @param onOff YES to enable tracking, NO to disable
- *  disabling tracking also deletes all entries in the
- *  cache.
+ *  disabling tracking
  */
 void FSUI_trackURIS(int onOff) {
-  if (onOff == NO)
-    emptyTrackDatabase();
   onOff = htonl(onOff);
   stateWriteContent(TRACK_OPTION,
                    sizeof(int),
@@ -221,7 +218,7 @@
  FORMATERROR:
   IPC_SEMAPHORE_UP(sem);
   IPC_SEMAPHORE_FREE(sem);
-  emptyTrackDatabase();
+  FSUI_clearTrackedURIS();
   return SYSERR;
 }
 

Modified: GNUnet/src/applications/fs/tools/gnunet-directory.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-directory.c 2005-08-21 02:25:15 UTC 
(rev 1815)
+++ GNUnet/src/applications/fs/tools/gnunet-directory.c 2005-08-21 03:05:10 UTC 
(rev 1816)
@@ -199,8 +199,10 @@
     printf(_("Listed %d matching entries.\n"),
           FSUI_listURIs(&printNode,
                         NULL));
-  if (do_kill)
+  if (do_kill) {
     FSUI_trackURIS(NO);
+    FSUI_clearTrackedURIS();
+  }
   if (do_track)
     FSUI_trackURIS(YES);
 

Modified: GNUnet/src/include/gnunet_fsui_lib.h
===================================================================
--- GNUnet/src/include/gnunet_fsui_lib.h        2005-08-21 02:25:15 UTC (rev 
1815)
+++ GNUnet/src/include/gnunet_fsui_lib.h        2005-08-21 03:05:10 UTC (rev 
1816)
@@ -770,12 +770,16 @@
  * Toggle tracking URIs.
  *
  * @param onOff YES to enable tracking, NO to disable
- *  disabling tracking also deletes all entries in the
- *  cache.
+ *  disabling tracking 
  */
 void FSUI_trackURIS(int onOff); /* file_info.c */
 
 /**
+ * Deletes all entries in the FSUI tracking cache.
+ */
+void FSUI_clearTrackedURIS(void); /* file_info.c */
+
+/**
  * Get the FSUI URI tracking status.
  *
  * @return YES of tracking is enabled, NO if not