mantis 1098

3 files changed, 52 insertions, 19 deletions

diff --git a/src/common/helper.c b/src/common/helper.c
index b89597e6..581106a9 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -184,9 +184,6 @@ void infoMessage(int doPopup,
   info.note = g_strdup_vprintf(format, args);
   va_end(args);
   info.doPopup = doPopup;
-
-  gnunetgtk_notify(info.note, 1);
-
   gtkSaveCall(&doInfoMessage,
               &info);
   g_free(info.note);
@@ -500,36 +497,57 @@ void run_with_save_calls(PThreadMain cb,
  * Simple glue to libnotify, and others?
  *
  */
-void gnunetgtk_notify(const char *message, int type) {
+void gnunetgtk_notify(int type,
+                      const char *message, 
+                      ...) {
 #ifdef WITH_LIBNOTIFY
+  static int once;
+  char * msg;
+  size_t size;
+  va_list arg;
   GtkWidget * root; 
   NotifyNotification *libnotify;
   NotifyUrgency libnotify_urgency = NOTIFY_URGENCY_NORMAL;
   long libnotify_expire_timeout = NOTIFY_EXPIRES_DEFAULT;
 
-  if (!notify_is_initted()){
-    if (!notify_init ("gnunet-gtk")){
-      LOG(LOG_DEBUG,_("Could not init libnotify\n"));
+  if (! notify_is_initted()){
+    if (once == 1)
+      return; 
+    if (! notify_init ("gnunet-gtk")) {
+      once = 1;
+      LOG(LOG_WARNING,
+          _("Could not initialize libnotify\n"));    
       return;
     }
   }
-
+  
   root = glade_xml_get_widget(getMainXML(),"mainWindow");
-  if(gtk_window_is_active(GTK_WINDOW(root)) == FALSE){
-    if( type == 0)
+  if (gtk_window_is_active(GTK_WINDOW(root)) == FALSE) {
+    if (type == NOTIFY_LOW)
       libnotify_urgency = NOTIFY_URGENCY_LOW;
-     else if( type == 1)
+     else if( type == NOTIFY_NORMAL)
        libnotify_urgency = NOTIFY_URGENCY_NORMAL;
      else
        libnotify_urgency = NOTIFY_URGENCY_CRITICAL;
+    va_start(arg, message);
+    size = vsnprintf(NULL, 0, message, arg);
+    va_end(arg);
+    msg = MALLOC(size+1);
+    va_start(arg, message);
+    vsnprintf(msg, size, message, arg);
+    va_end(arg);
     libnotify = notify_notification_new("GNUnet: gnunet-gtk",
-                                        message,
+                                        msg,
                                         PACKAGE_DATA_DIR"/gnunet-gtk-notify.png",
                                         NULL);
+    FREE(msg);
     notify_notification_set_timeout(libnotify, libnotify_expire_timeout);
     notify_notification_set_urgency(libnotify, libnotify_urgency);
-    if (!notify_notification_show (libnotify, NULL))
-      LOG(LOG_DEBUG,_("Could not send notification\n"));
+    if (! notify_notification_show (libnotify, NULL)) {
+      once = 1;
+      LOG(LOG_WARNING,
+          _("Could not send notification via libnotify\n"));
+    }
     g_object_unref(G_OBJECT(libnotify));
     notify_uninit();
   }
diff --git a/src/include/gnunetgtk_common.h b/src/include/gnunetgtk_common.h
index 1f0992c5..5abb24db 100644
--- a/src/include/gnunetgtk_common.h
+++ b/src/include/gnunetgtk_common.h
@@ -103,10 +103,16 @@ void run_with_save_calls(PThreadMain cb,
  */
 void connectGladeWithPlugins(GladeXML * xml);
 
+#define NOTIFY_LOW 0
+#define NOTIFY_NORMAL 1
+#define NOTIFY_CRITICAL 2
+
 /**
  * Sends a message to libnotify
  */
-void gnunetgtk_notify(const char * message, int type);
+void gnunetgtk_notify(int type,
+                      const char * message, 
+                      ...);
 
 /**
  * Validate that a string is a Utf-8 string.
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index 5bfa5f8d..3b53784b 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -64,7 +64,10 @@ static void saveEventProcessor(void * arg) {
     displayDownloadComplete(event->data.DownloadProgress.uri,
                             event->data.DownloadProgress.filename);
     addLogEntry(_("Download `%s' complete"), 
-                event->data.DownloadProgress.filename); /* here or in download.c ? or call notify directly ? */
+                event->data.DownloadProgress.filename); 
+    gnunetgtk_notify(NOTIFY_NORMAL,
+                     _("Download `%s' complete"), 
+                     event->data.DownloadProgress.filename);    
     break;
   case FSUI_download_error:
     BREAK();
@@ -86,13 +89,19 @@ static void saveEventProcessor(void * arg) {
     displayUploadComplete(event->data.UploadComplete.main_filename,
                           event->data.UploadComplete.filename,
                           event->data.UploadComplete.uri);
-    addLogEntry(_("Upload `%s' complete"), event->data.UploadComplete.filename); /* here or in upload.c ? or call notify directly ? */
+    addLogEntry(_("Upload `%s' complete"), 
+                event->data.UploadComplete.filename);
+    gnunetgtk_notify(NOTIFY_NORMAL,
+                     _("Upload `%s' complete"), 
+                     event->data.UploadComplete.filename);
     break;
   case FSUI_upload_error:
     LOG(LOG_ERROR,
         _("Error while uploading: %s\n"),
         event->data.message);
-    addLogEntry(_("Error while uploading `%s'"), event->data.message);  /* here or in upload.c ? */
+    gnunetgtk_notify(NOTIFY_NORMAL,
+                     _("Error while uploading `%s'"), 
+                     event->data.message);
     break;
   case FSUI_gnunetd_connected:
     LOG(LOG_MESSAGE,
@@ -101,7 +110,7 @@ static void saveEventProcessor(void * arg) {
   case FSUI_gnunetd_disconnected:
     LOG(LOG_MESSAGE,
         _("Disconnected from gnunetd.\n"));
-    addLogEntry(_("Disconnected from gnunetd.\n"));     /* here or ? or call notify directly ? */
+    addLogEntry(_("Disconnected from gnunetd.\n"));
     break;
   default:
     BREAK();