gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r2872 - in gnunet-gtk: . po src/include src/plugins/fs


From: grothoff
Subject: [GNUnet-SVN] r2872 - in gnunet-gtk: . po src/include src/plugins/fs
Date: Sat, 20 May 2006 09:35:42 -0700 (PDT)

Author: grothoff
Date: 2006-05-20 09:35:36 -0700 (Sat, 20 May 2006)
New Revision: 2872

Modified:
   gnunet-gtk/ChangeLog
   gnunet-gtk/gnunet-gtk.glade
   gnunet-gtk/po/de.po
   gnunet-gtk/po/fr.po
   gnunet-gtk/po/gnunet-gtk.pot
   gnunet-gtk/po/rw.po
   gnunet-gtk/po/sv.po
   gnunet-gtk/po/vi.po
   gnunet-gtk/src/include/gnunetgtk_common.h
   gnunet-gtk/src/plugins/fs/fs.c
   gnunet-gtk/src/plugins/fs/search.c
Log:
fixing Nils' shutdown deadlock bug -- hopefully

Modified: gnunet-gtk/ChangeLog
===================================================================
--- gnunet-gtk/ChangeLog        2006-05-20 15:24:45 UTC (rev 2871)
+++ gnunet-gtk/ChangeLog        2006-05-20 16:35:36 UTC (rev 2872)
@@ -1,3 +1,7 @@
+Sat May 20 08:37:02 PDT 2006
+       Fixed some deadlocks and other minor bugs.
+       Releasing gnunet-gtk 0.7.0e.
+
 Sat May 13 19:45:41 PDT 2006
        Added some additional stats.
 

Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2006-05-20 15:24:45 UTC (rev 2871)
+++ gnunet-gtk/gnunet-gtk.glade 2006-05-20 16:35:36 UTC (rev 2872)
@@ -1077,8 +1077,8 @@
                    </widget>
                    <packing>
                      <property name="padding">0</property>
-                     <property name="expand">True</property>
-                     <property name="fill">True</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
                    </packing>
                  </child>
                </widget>

Modified: gnunet-gtk/po/de.po
===================================================================
--- gnunet-gtk/po/de.po 2006-05-20 15:24:45 UTC (rev 2871)
+++ gnunet-gtk/po/de.po 2006-05-20 16:35:36 UTC (rev 2872)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre0\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-05-20 03:53-0700\n"
+"POT-Creation-Date: 2006-05-20 08:38-0700\n"
 "PO-Revision-Date: 2006-03-17 21:18+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -1127,15 +1127,15 @@
 msgstr "Unbenannt"
 
 #: src/plugins/fs/search.c:240 src/plugins/fs/search.c:312
-#: src/plugins/fs/search.c:785 src/plugins/fs/search.c:968
+#: src/plugins/fs/search.c:800 src/plugins/fs/search.c:984
 msgid "globally"
 msgstr "global"
 
-#: src/plugins/fs/search.c:626 src/plugins/fs/download.c:736
+#: src/plugins/fs/search.c:626 src/plugins/fs/download.c:758
 msgid "Name"
 msgstr "Name"
 
-#: src/plugins/fs/search.c:645 src/plugins/fs/download.c:755
+#: src/plugins/fs/search.c:645 src/plugins/fs/download.c:777
 msgid "Size"
 msgstr "Größe"
 
@@ -1147,16 +1147,16 @@
 msgid "Preview"
 msgstr "Vorschau"
 
-#: src/plugins/fs/search.c:807
+#: src/plugins/fs/search.c:822
 #, c-format
 msgid "Failed to create namespace URI from `%s'.\n"
 msgstr "Fehler beim Erzeugen der Namespace URI von `%s'.\n"
 
-#: src/plugins/fs/search.c:1110
+#: src/plugins/fs/search.c:1126
 msgid "Query"
 msgstr "Anfrage"
 
-#: src/plugins/fs/search.c:1128
+#: src/plugins/fs/search.c:1144
 msgid "Results"
 msgstr "Ergebnisse"
 
@@ -1203,7 +1203,7 @@
 msgid "Unhandled (unknown) FSUI event: %u.\n"
 msgstr "Unbehandeltes (Unbekanntes) FSUI Ereignis: %u.\n"
 
-#: src/plugins/fs/download.c:210 src/plugins/fs/download.c:398
+#: src/plugins/fs/download.c:244 src/plugins/fs/download.c:416
 #, c-format
 msgid ""
 "You must specify a directory in the configuration in section `%s' under `%s'."
@@ -1211,25 +1211,25 @@
 "Sie müssen in der Konfigurationsdatei in Sektion `%s' unter `%s' ein "
 "Verzeichnis angeben."
 
-#: src/plugins/fs/download.c:335 src/plugins/fs/download.c:446
+#: src/plugins/fs/download.c:359 src/plugins/fs/download.c:464
 #, c-format
 msgid "Downloading `%s'"
 msgstr "Downloading `%s'"
 
-#: src/plugins/fs/download.c:380
+#: src/plugins/fs/download.c:399
 #, c-format
 msgid "Invalid URI `%s'"
 msgstr "Ungültige URI: `%s'"
 
-#: src/plugins/fs/download.c:385
+#: src/plugins/fs/download.c:404
 msgid "Please use the search function for keyword (KSK) URIs!"
 msgstr ""
 
-#: src/plugins/fs/download.c:390
+#: src/plugins/fs/download.c:409
 msgid "Location URIs are not yet supported"
 msgstr ""
 
-#: src/plugins/fs/download.c:773 src/plugins/fs/upload.c:517
+#: src/plugins/fs/download.c:795 src/plugins/fs/upload.c:530
 #: src/plugins/fs/namespace.c:1255
 msgid "URI"
 msgstr "URI"
@@ -1291,20 +1291,20 @@
 msgid "Choose files to insert..."
 msgstr "Wählen Sie die einzufügenden Dateien..."
 
-#: src/plugins/fs/upload.c:355
+#: src/plugins/fs/upload.c:383
 #, c-format
 msgid "Uploading `%s'"
 msgstr "Lade `%s' hoch."
 
-#: src/plugins/fs/upload.c:450
+#: src/plugins/fs/upload.c:463
 msgid "Choose the file you want to publish."
 msgstr "Wählen Sie die Datei, die Sie veröffentlichen möchten."
 
-#: src/plugins/fs/upload.c:453
+#: src/plugins/fs/upload.c:466
 msgid "Choose the directory you want to publish."
 msgstr "Wählen Sie das Verzeichnis, das Sie veröffentlichen möchten."
 
-#: src/plugins/fs/upload.c:506 src/plugins/fs/namespace.c:98
+#: src/plugins/fs/upload.c:519 src/plugins/fs/namespace.c:98
 #: src/plugins/fs/namespace.c:1219
 msgid "Filename"
 msgstr "Dateiname"

Modified: gnunet-gtk/po/fr.po
===================================================================
--- gnunet-gtk/po/fr.po 2006-05-20 15:24:45 UTC (rev 2871)
+++ gnunet-gtk/po/fr.po 2006-05-20 16:35:36 UTC (rev 2872)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet-gtk 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-05-20 03:53-0700\n"
+"POT-Creation-Date: 2006-05-20 08:38-0700\n"
 "PO-Revision-Date: 2006-05-02 18:51+0200\n"
 "Last-Translator: Milan <address@hidden>\n"
 "Language-Team: French <address@hidden>\n"
@@ -1454,15 +1454,15 @@
 msgstr "pas de nom fourni"
 
 #: src/plugins/fs/search.c:240 src/plugins/fs/search.c:312
-#: src/plugins/fs/search.c:785 src/plugins/fs/search.c:968
+#: src/plugins/fs/search.c:800 src/plugins/fs/search.c:984
 msgid "globally"
 msgstr "globalement"
 
-#: src/plugins/fs/search.c:626 src/plugins/fs/download.c:736
+#: src/plugins/fs/search.c:626 src/plugins/fs/download.c:758
 msgid "Name"
 msgstr "Nom"
 
-#: src/plugins/fs/search.c:645 src/plugins/fs/download.c:755
+#: src/plugins/fs/search.c:645 src/plugins/fs/download.c:777
 msgid "Size"
 msgstr "Taille"
 
@@ -1474,16 +1474,16 @@
 msgid "Preview"
 msgstr "Aperçu"
 
-#: src/plugins/fs/search.c:807
+#: src/plugins/fs/search.c:822
 #, c-format
 msgid "Failed to create namespace URI from `%s'.\n"
 msgstr "Impossible de créer l'URI de l'espace de noms à partir de `%s'.\n"
 
-#: src/plugins/fs/search.c:1110
+#: src/plugins/fs/search.c:1126
 msgid "Query"
 msgstr "Requête"
 
-#: src/plugins/fs/search.c:1128
+#: src/plugins/fs/search.c:1144
 msgid "Results"
 msgstr "Résultats"
 
@@ -1530,7 +1530,7 @@
 msgid "Unhandled (unknown) FSUI event: %u.\n"
 msgstr "Événement FSUI non géré (inconnu) : %u.\n"
 
-#: src/plugins/fs/download.c:210 src/plugins/fs/download.c:398
+#: src/plugins/fs/download.c:244 src/plugins/fs/download.c:416
 #, c-format
 msgid ""
 "You must specify a directory in the configuration in section `%s' under `%s'."
@@ -1538,25 +1538,25 @@
 "Vous devez spécifier un répertoire dans la configuration, section `%s' sous `"
 "%s'."
 
-#: src/plugins/fs/download.c:335 src/plugins/fs/download.c:446
+#: src/plugins/fs/download.c:359 src/plugins/fs/download.c:464
 #, c-format
 msgid "Downloading `%s'"
 msgstr "Téléchargement de `%s'"
 
-#: src/plugins/fs/download.c:380
+#: src/plugins/fs/download.c:399
 #, c-format
 msgid "Invalid URI `%s'"
 msgstr "URI invalide : '%s'"
 
-#: src/plugins/fs/download.c:385
+#: src/plugins/fs/download.c:404
 msgid "Please use the search function for keyword (KSK) URIs!"
 msgstr "Utilisez la fonction de recherche pour les URI de mots-clés (KSK) !"
 
-#: src/plugins/fs/download.c:390
+#: src/plugins/fs/download.c:409
 msgid "Location URIs are not yet supported"
 msgstr "Les URI de lieu ne sont pas encore supportées."
 
-#: src/plugins/fs/download.c:773 src/plugins/fs/upload.c:517
+#: src/plugins/fs/download.c:795 src/plugins/fs/upload.c:530
 #: src/plugins/fs/namespace.c:1255
 msgid "URI"
 msgstr "URI"
@@ -1618,20 +1618,20 @@
 msgid "Choose files to insert..."
 msgstr "Choisissez les fichiers à insérer..."
 
-#: src/plugins/fs/upload.c:355
+#: src/plugins/fs/upload.c:383
 #, c-format
 msgid "Uploading `%s'"
 msgstr "Publication de `%s'"
 
-#: src/plugins/fs/upload.c:450
+#: src/plugins/fs/upload.c:463
 msgid "Choose the file you want to publish."
 msgstr "Choisissez le fichier que vous voulez publier."
 
-#: src/plugins/fs/upload.c:453
+#: src/plugins/fs/upload.c:466
 msgid "Choose the directory you want to publish."
 msgstr "Choisissez le dossier que vous voulez publier."
 
-#: src/plugins/fs/upload.c:506 src/plugins/fs/namespace.c:98
+#: src/plugins/fs/upload.c:519 src/plugins/fs/namespace.c:98
 #: src/plugins/fs/namespace.c:1219
 msgid "Filename"
 msgstr "Nom du fichier"

Modified: gnunet-gtk/po/gnunet-gtk.pot
===================================================================
--- gnunet-gtk/po/gnunet-gtk.pot        2006-05-20 15:24:45 UTC (rev 2871)
+++ gnunet-gtk/po/gnunet-gtk.pot        2006-05-20 16:35:36 UTC (rev 2872)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-05-20 03:53-0700\n"
+"POT-Creation-Date: 2006-05-20 08:38-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"
@@ -1026,15 +1026,15 @@
 msgstr ""
 
 #: src/plugins/fs/search.c:240 src/plugins/fs/search.c:312
-#: src/plugins/fs/search.c:785 src/plugins/fs/search.c:968
+#: src/plugins/fs/search.c:800 src/plugins/fs/search.c:984
 msgid "globally"
 msgstr ""
 
-#: src/plugins/fs/search.c:626 src/plugins/fs/download.c:736
+#: src/plugins/fs/search.c:626 src/plugins/fs/download.c:758
 msgid "Name"
 msgstr ""
 
-#: src/plugins/fs/search.c:645 src/plugins/fs/download.c:755
+#: src/plugins/fs/search.c:645 src/plugins/fs/download.c:777
 msgid "Size"
 msgstr ""
 
@@ -1046,16 +1046,16 @@
 msgid "Preview"
 msgstr ""
 
-#: src/plugins/fs/search.c:807
+#: src/plugins/fs/search.c:822
 #, c-format
 msgid "Failed to create namespace URI from `%s'.\n"
 msgstr ""
 
-#: src/plugins/fs/search.c:1110
+#: src/plugins/fs/search.c:1126
 msgid "Query"
 msgstr ""
 
-#: src/plugins/fs/search.c:1128
+#: src/plugins/fs/search.c:1144
 msgid "Results"
 msgstr ""
 
@@ -1102,31 +1102,31 @@
 msgid "Unhandled (unknown) FSUI event: %u.\n"
 msgstr ""
 
-#: src/plugins/fs/download.c:210 src/plugins/fs/download.c:398
+#: src/plugins/fs/download.c:244 src/plugins/fs/download.c:416
 #, c-format
 msgid ""
 "You must specify a directory in the configuration in section `%s' under `%s'."
 msgstr ""
 
-#: src/plugins/fs/download.c:335 src/plugins/fs/download.c:446
+#: src/plugins/fs/download.c:359 src/plugins/fs/download.c:464
 #, c-format
 msgid "Downloading `%s'"
 msgstr ""
 
-#: src/plugins/fs/download.c:380
+#: src/plugins/fs/download.c:399
 #, c-format
 msgid "Invalid URI `%s'"
 msgstr ""
 
-#: src/plugins/fs/download.c:385
+#: src/plugins/fs/download.c:404
 msgid "Please use the search function for keyword (KSK) URIs!"
 msgstr ""
 
-#: src/plugins/fs/download.c:390
+#: src/plugins/fs/download.c:409
 msgid "Location URIs are not yet supported"
 msgstr ""
 
-#: src/plugins/fs/download.c:773 src/plugins/fs/upload.c:517
+#: src/plugins/fs/download.c:795 src/plugins/fs/upload.c:530
 #: src/plugins/fs/namespace.c:1255
 msgid "URI"
 msgstr ""
@@ -1184,20 +1184,20 @@
 msgid "Choose files to insert..."
 msgstr ""
 
-#: src/plugins/fs/upload.c:355
+#: src/plugins/fs/upload.c:383
 #, c-format
 msgid "Uploading `%s'"
 msgstr ""
 
-#: src/plugins/fs/upload.c:450
+#: src/plugins/fs/upload.c:463
 msgid "Choose the file you want to publish."
 msgstr ""
 
-#: src/plugins/fs/upload.c:453
+#: src/plugins/fs/upload.c:466
 msgid "Choose the directory you want to publish."
 msgstr ""
 
-#: src/plugins/fs/upload.c:506 src/plugins/fs/namespace.c:98
+#: src/plugins/fs/upload.c:519 src/plugins/fs/namespace.c:98
 #: src/plugins/fs/namespace.c:1219
 msgid "Filename"
 msgstr ""

Modified: gnunet-gtk/po/rw.po
===================================================================
--- gnunet-gtk/po/rw.po 2006-05-20 15:24:45 UTC (rev 2871)
+++ gnunet-gtk/po/rw.po 2006-05-20 16:35:36 UTC (rev 2872)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre0\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-05-20 03:53-0700\n"
+"POT-Creation-Date: 2006-05-20 08:38-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"
@@ -1083,15 +1083,15 @@
 msgstr ""
 
 #: src/plugins/fs/search.c:240 src/plugins/fs/search.c:312
-#: src/plugins/fs/search.c:785 src/plugins/fs/search.c:968
+#: src/plugins/fs/search.c:800 src/plugins/fs/search.c:984
 msgid "globally"
 msgstr ""
 
-#: src/plugins/fs/search.c:626 src/plugins/fs/download.c:736
+#: src/plugins/fs/search.c:626 src/plugins/fs/download.c:758
 msgid "Name"
 msgstr ""
 
-#: src/plugins/fs/search.c:645 src/plugins/fs/download.c:755
+#: src/plugins/fs/search.c:645 src/plugins/fs/download.c:777
 msgid "Size"
 msgstr "Ingano"
 
@@ -1105,16 +1105,16 @@
 msgid "Preview"
 msgstr ""
 
-#: src/plugins/fs/search.c:807
+#: src/plugins/fs/search.c:822
 #, fuzzy, c-format
 msgid "Failed to create namespace URI from `%s'.\n"
 msgstr "Kuri Ibirimo Ububikoshingiro Isomero"
 
-#: src/plugins/fs/search.c:1110
+#: src/plugins/fs/search.c:1126
 msgid "Query"
 msgstr ""
 
-#: src/plugins/fs/search.c:1128
+#: src/plugins/fs/search.c:1144
 msgid "Results"
 msgstr ""
 
@@ -1163,31 +1163,31 @@
 msgid "Unhandled (unknown) FSUI event: %u.\n"
 msgstr ""
 
-#: src/plugins/fs/download.c:210 src/plugins/fs/download.c:398
+#: src/plugins/fs/download.c:244 src/plugins/fs/download.c:416
 #, fuzzy, c-format
 msgid ""
 "You must specify a directory in the configuration in section `%s' under `%s'."
 msgstr "a Umubare kugirango in i Iboneza in Icyiciro"
 
-#: src/plugins/fs/download.c:335 src/plugins/fs/download.c:446
+#: src/plugins/fs/download.c:359 src/plugins/fs/download.c:464
 #, fuzzy, c-format
 msgid "Downloading `%s'"
 msgstr "Iyimura"
 
-#: src/plugins/fs/download.c:380
+#: src/plugins/fs/download.c:399
 #, fuzzy, c-format
 msgid "Invalid URI `%s'"
 msgstr "Inkoresha siyo"
 
-#: src/plugins/fs/download.c:385
+#: src/plugins/fs/download.c:404
 msgid "Please use the search function for keyword (KSK) URIs!"
 msgstr ""
 
-#: src/plugins/fs/download.c:390
+#: src/plugins/fs/download.c:409
 msgid "Location URIs are not yet supported"
 msgstr ""
 
-#: src/plugins/fs/download.c:773 src/plugins/fs/upload.c:517
+#: src/plugins/fs/download.c:795 src/plugins/fs/upload.c:530
 #: src/plugins/fs/namespace.c:1255
 msgid "URI"
 msgstr ""
@@ -1252,22 +1252,22 @@
 msgid "Choose files to insert..."
 msgstr "IDOSIYE Kuri Byinjijwemo"
 
-#: src/plugins/fs/upload.c:355
+#: src/plugins/fs/upload.c:383
 #, c-format
 msgid "Uploading `%s'"
 msgstr ""
 
-#: src/plugins/fs/upload.c:450
+#: src/plugins/fs/upload.c:463
 #, fuzzy
 msgid "Choose the file you want to publish."
 msgstr "bushyinguro Kuri cyavuye ahandi/ cyatumijwe"
 
-#: src/plugins/fs/upload.c:453
+#: src/plugins/fs/upload.c:466
 #, fuzzy
 msgid "Choose the directory you want to publish."
 msgstr "bushyinguro Kuri cyavuye ahandi/ cyatumijwe"
 
-#: src/plugins/fs/upload.c:506 src/plugins/fs/namespace.c:98
+#: src/plugins/fs/upload.c:519 src/plugins/fs/namespace.c:98
 #: src/plugins/fs/namespace.c:1219
 msgid "Filename"
 msgstr "Izina ry'idosiye"

Modified: gnunet-gtk/po/sv.po
===================================================================
--- gnunet-gtk/po/sv.po 2006-05-20 15:24:45 UTC (rev 2871)
+++ gnunet-gtk/po/sv.po 2006-05-20 16:35:36 UTC (rev 2872)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet-gtk 0.7.0d\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-05-20 03:53-0700\n"
+"POT-Creation-Date: 2006-05-20 08:38-0700\n"
 "PO-Revision-Date: 2006-05-20 11:44+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -1514,15 +1514,15 @@
 msgstr "inget namn angivet"
 
 #: src/plugins/fs/search.c:240 src/plugins/fs/search.c:312
-#: src/plugins/fs/search.c:785 src/plugins/fs/search.c:968
+#: src/plugins/fs/search.c:800 src/plugins/fs/search.c:984
 msgid "globally"
 msgstr "globalt"
 
-#: src/plugins/fs/search.c:626 src/plugins/fs/download.c:736
+#: src/plugins/fs/search.c:626 src/plugins/fs/download.c:758
 msgid "Name"
 msgstr "Namn"
 
-#: src/plugins/fs/search.c:645 src/plugins/fs/download.c:755
+#: src/plugins/fs/search.c:645 src/plugins/fs/download.c:777
 msgid "Size"
 msgstr "Storlek"
 
@@ -1534,16 +1534,16 @@
 msgid "Preview"
 msgstr "Förhandsgranska"
 
-#: src/plugins/fs/search.c:807
+#: src/plugins/fs/search.c:822
 #, c-format
 msgid "Failed to create namespace URI from `%s'.\n"
 msgstr "Misslyckades att skapa URI-namnrymd från \"%s\".\n"
 
-#: src/plugins/fs/search.c:1110
+#: src/plugins/fs/search.c:1126
 msgid "Query"
 msgstr "Fråga"
 
-#: src/plugins/fs/search.c:1128
+#: src/plugins/fs/search.c:1144
 msgid "Results"
 msgstr "Resultat"
 
@@ -1590,32 +1590,32 @@
 msgid "Unhandled (unknown) FSUI event: %u.\n"
 msgstr "Ohanterad (okänd) FSUI-händelse: %u.\n"
 
-#: src/plugins/fs/download.c:210 src/plugins/fs/download.c:398
+#: src/plugins/fs/download.c:244 src/plugins/fs/download.c:416
 #, c-format
 msgid ""
 "You must specify a directory in the configuration in section `%s' under `%s'."
 msgstr ""
 "Du måste ange en katalog i konfigurationen i sektionen \"%s\" under \"%s\"."
 
-#: src/plugins/fs/download.c:335 src/plugins/fs/download.c:446
+#: src/plugins/fs/download.c:359 src/plugins/fs/download.c:464
 #, c-format
 msgid "Downloading `%s'"
 msgstr "Laddar ner \"%s\""
 
-#: src/plugins/fs/download.c:380
+#: src/plugins/fs/download.c:399
 #, c-format
 msgid "Invalid URI `%s'"
 msgstr "Ogiltig URI \"%s\""
 
-#: src/plugins/fs/download.c:385
+#: src/plugins/fs/download.c:404
 msgid "Please use the search function for keyword (KSK) URIs!"
 msgstr "Använd sökfunktionen för nyckelord (KSK) URI:er!"
 
-#: src/plugins/fs/download.c:390
+#: src/plugins/fs/download.c:409
 msgid "Location URIs are not yet supported"
 msgstr "Plats-URI:er stöds inte än"
 
-#: src/plugins/fs/download.c:773 src/plugins/fs/upload.c:517
+#: src/plugins/fs/download.c:795 src/plugins/fs/upload.c:530
 #: src/plugins/fs/namespace.c:1255
 msgid "URI"
 msgstr "URI"
@@ -1676,20 +1676,20 @@
 msgid "Choose files to insert..."
 msgstr "Välj filer att lägga till..."
 
-#: src/plugins/fs/upload.c:355
+#: src/plugins/fs/upload.c:383
 #, c-format
 msgid "Uploading `%s'"
 msgstr "Laddar upp \"%s\""
 
-#: src/plugins/fs/upload.c:450
+#: src/plugins/fs/upload.c:463
 msgid "Choose the file you want to publish."
 msgstr "Välj den fil du vill publisera."
 
-#: src/plugins/fs/upload.c:453
+#: src/plugins/fs/upload.c:466
 msgid "Choose the directory you want to publish."
 msgstr "Välj den katalog du vill publisera."
 
-#: src/plugins/fs/upload.c:506 src/plugins/fs/namespace.c:98
+#: src/plugins/fs/upload.c:519 src/plugins/fs/namespace.c:98
 #: src/plugins/fs/namespace.c:1219
 msgid "Filename"
 msgstr "Filnamn"

Modified: gnunet-gtk/po/vi.po
===================================================================
--- gnunet-gtk/po/vi.po 2006-05-20 15:24:45 UTC (rev 2871)
+++ gnunet-gtk/po/vi.po 2006-05-20 16:35:36 UTC (rev 2872)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnunet-gtk 0.7.0pre4\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-05-20 03:53-0700\n"
+"POT-Creation-Date: 2006-05-20 08:38-0700\n"
 "PO-Revision-Date: 2005-07-05 22:33+0400\n"
 "Last-Translator: Phan Vinh Thinh <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -1081,15 +1081,15 @@
 msgstr "chưa đưa ra tên"
 
 #: src/plugins/fs/search.c:240 src/plugins/fs/search.c:312
-#: src/plugins/fs/search.c:785 src/plugins/fs/search.c:968
+#: src/plugins/fs/search.c:800 src/plugins/fs/search.c:984
 msgid "globally"
 msgstr "toàn cầu"
 
-#: src/plugins/fs/search.c:626 src/plugins/fs/download.c:736
+#: src/plugins/fs/search.c:626 src/plugins/fs/download.c:758
 msgid "Name"
 msgstr "Tên"
 
-#: src/plugins/fs/search.c:645 src/plugins/fs/download.c:755
+#: src/plugins/fs/search.c:645 src/plugins/fs/download.c:777
 msgid "Size"
 msgstr "Kích thước"
 
@@ -1101,16 +1101,16 @@
 msgid "Preview"
 msgstr "Xem trước"
 
-#: src/plugins/fs/search.c:807
+#: src/plugins/fs/search.c:822
 #, fuzzy, c-format
 msgid "Failed to create namespace URI from `%s'.\n"
 msgstr "Thất bại khi tạo URI không gian tên từ '%s'.\n"
 
-#: src/plugins/fs/search.c:1110
+#: src/plugins/fs/search.c:1126
 msgid "Query"
 msgstr "Hỏi"
 
-#: src/plugins/fs/search.c:1128
+#: src/plugins/fs/search.c:1144
 msgid "Results"
 msgstr "Kết quả"
 
@@ -1157,32 +1157,32 @@
 msgid "Unhandled (unknown) FSUI event: %u.\n"
 msgstr "Sự kiện FSUI không thể điều khiển (không rõ): %u.\n"
 
-#: src/plugins/fs/download.c:210 src/plugins/fs/download.c:398
+#: src/plugins/fs/download.c:244 src/plugins/fs/download.c:416
 #, fuzzy, c-format
 msgid ""
 "You must specify a directory in the configuration in section `%s' under `%s'."
 msgstr ""
 "Người dùng phải chỉ ra một thư mục trong phần '%s' dưới '%s' của cấu hình."
 
-#: src/plugins/fs/download.c:335 src/plugins/fs/download.c:446
+#: src/plugins/fs/download.c:359 src/plugins/fs/download.c:464
 #, fuzzy, c-format
 msgid "Downloading `%s'"
 msgstr "_Tải xuống"
 
-#: src/plugins/fs/download.c:380
+#: src/plugins/fs/download.c:399
 #, c-format
 msgid "Invalid URI `%s'"
 msgstr ""
 
-#: src/plugins/fs/download.c:385
+#: src/plugins/fs/download.c:404
 msgid "Please use the search function for keyword (KSK) URIs!"
 msgstr ""
 
-#: src/plugins/fs/download.c:390
+#: src/plugins/fs/download.c:409
 msgid "Location URIs are not yet supported"
 msgstr ""
 
-#: src/plugins/fs/download.c:773 src/plugins/fs/upload.c:517
+#: src/plugins/fs/download.c:795 src/plugins/fs/upload.c:530
 #: src/plugins/fs/namespace.c:1255
 msgid "URI"
 msgstr "URI"
@@ -1243,22 +1243,22 @@
 msgid "Choose files to insert..."
 msgstr ""
 
-#: src/plugins/fs/upload.c:355
+#: src/plugins/fs/upload.c:383
 #, c-format
 msgid "Uploading `%s'"
 msgstr ""
 
-#: src/plugins/fs/upload.c:450
+#: src/plugins/fs/upload.c:463
 #, fuzzy
 msgid "Choose the file you want to publish."
 msgstr "Chọn tập tin hoặc thư mục muốn đưa ra chia sẻ."
 
-#: src/plugins/fs/upload.c:453
+#: src/plugins/fs/upload.c:466
 #, fuzzy
 msgid "Choose the directory you want to publish."
 msgstr "Chọn tập tin hoặc thư mục muốn đưa ra chia sẻ."
 
-#: src/plugins/fs/upload.c:506 src/plugins/fs/namespace.c:98
+#: src/plugins/fs/upload.c:519 src/plugins/fs/namespace.c:98
 #: src/plugins/fs/namespace.c:1219
 msgid "Filename"
 msgstr "Tên tập tin"

Modified: gnunet-gtk/src/include/gnunetgtk_common.h
===================================================================
--- gnunet-gtk/src/include/gnunetgtk_common.h   2006-05-20 15:24:45 UTC (rev 
2871)
+++ gnunet-gtk/src/include/gnunetgtk_common.h   2006-05-20 16:35:36 UTC (rev 
2872)
@@ -27,7 +27,7 @@
 #ifndef GTKUI_HELPER_H
 #define GTKUI_HELPER_H
 
-#define DEBUG_GTK 0
+#define DEBUG_GTK 1
 
 #if DEBUG_GTK
 #define DEBUG_BEGIN() fprintf(stderr, "BEGIN of %s\n", __FUNCTION__)

Modified: gnunet-gtk/src/plugins/fs/fs.c
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.c      2006-05-20 15:24:45 UTC (rev 2871)
+++ gnunet-gtk/src/plugins/fs/fs.c      2006-05-20 16:35:36 UTC (rev 2872)
@@ -39,6 +39,7 @@
 static void saveEventProcessor(void * arg) {
   const FSUI_Event * event = arg;
 
+  DEBUG_BEGIN();
   switch (event->type) {
   case FSUI_search_result:
     displaySearchResult(&event->data.SearchResult.fi,
@@ -119,6 +120,7 @@
        event->type);
     break;
   }
+  DEBUG_END();
 }
 
 /**
@@ -157,12 +159,14 @@
 }
 
 void done_fs() {
+  DEBUG_BEGIN();
   fs_download_stop();
   fs_search_stop();
   fs_collection_stop();
   fs_namespace_stop();
   fs_upload_stop();
   FSUI_stop(ctx);
+  DEBUG_END();
 }
 
 /* end of fs.c */

Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c  2006-05-20 15:24:45 UTC (rev 2871)
+++ gnunet-gtk/src/plugins/fs/search.c  2006-05-20 16:35:36 UTC (rev 2872)
@@ -421,10 +421,8 @@
       break;
     list = list->next;
   }
-  if (list == NULL) {
-    BREAK();
-    return;
-  }
+  if (list == NULL) 
+    return; /* search result received during shutdown */  
   addSearchResultToModel(info,
                         list->treeview,
                         row);
@@ -1173,7 +1171,8 @@
     list = head;
     head = head->next;
     freeSearchModel(list->model, NULL);
-    closeSearchPage(list);
+    gtkSaveCall((SimpleCallback)&closeSearchPage,
+               list);
     FREE(list);
   }
 





reply via email to

[Prev in Thread] Current Thread [Next in Thread]