minor fixes

5 files changed, 22 insertions, 7 deletions

diff --git a/src/common/helper.c b/src/common/helper.c
index 83a3667a..c2d9a971 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -235,10 +235,18 @@ static void saveAddLogEntry(void * args) {
  * @param txt the log entry
  *
  */
-void addLogEntry(const char * txt) {
-  infoMessage(NO, txt);
+void addLogEntry(const char * txt,
+                 ...) {
+  va_list args;
+  gchar * note;
+  
+  va_start(args, txt);
+  note = g_strdup_vprintf(txt, args);
+  va_end(args);
+  infoMessage(NO, note);
   gtkSaveCall(&saveAddLogEntry,
-              (void*) txt);
+              (void*) note);
+  g_free(note);
 }
 
 /**
diff --git a/src/core/main.c b/src/core/main.c
index 9b2c06af..f738c3e4 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -101,6 +101,10 @@ static void gnunet_gtk_main_quit() {
   gtk_main_quit();
 }
 
+static void customLog(const char * msg) {
+  addLogEntry("%s", msg);
+}
+
 int main(int argc, 
          char *argv[]) {
   GtkWidget * root;
@@ -129,7 +133,7 @@ int main(int argc,
                            "mainWindow");
   gtk_window_maximize(GTK_WINDOW(root));
   gtk_widget_show(root);
-  setCustomLogProc(&addLogEntry);
+  setCustomLogProc(&customLog);
   /* start the event loop */
   gdk_threads_enter();    
   gtk_main();
diff --git a/src/include/gnunetgtk_common.h b/src/include/gnunetgtk_common.h
index 5cf23904..a4708493 100644
--- a/src/include/gnunetgtk_common.h
+++ b/src/include/gnunetgtk_common.h
@@ -59,7 +59,7 @@ void infoMessage(int doPopup,
  *
  * @param txt the log entry
  */
-void addLogEntry(const char * txt);
+void addLogEntry(const char * txt, ...);
                
 /**
  * Simple callback function.
diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index 06fbbadf..461b10b7 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -46,10 +46,13 @@ static GtkTreeStore * summary;
 static int addFilesToDirectory
   (const ECRS_FileInfo * fi,
    const HashCode512 * key,
+   int isRoot,
    void * closure) {
   struct ECRS_URI * uri = closure;
   DownloadList * pos;
 
+  if (isRoot == YES)
+    return OK;
   FSUI_trackURI(fi);
   pos = head;
   while (pos != NULL) {
@@ -174,7 +177,7 @@ static void initiateDownload(GtkTreeModel * model,
   if (name == NULL)
     name = filename;
     
-  addLogEntry(_("Downloading..."));      
+  addLogEntry(_("Downloading `%s'"), name);      
     
   list = MALLOC(sizeof(DownloadList));
   list->next = head;
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index d3cb0b3c..feda58ae 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -345,7 +345,7 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
     int doIndex;
     int doRec;
     
-    addLogEntry(_("Uploading.."));
+    addLogEntry(_("Uploading `%s'"), filenamerest);
 
     recBut = glade_xml_get_widget(getMainXML(),
                                   "scopeRecursiveButton");