Hi again.

Soo, adding libnotify support to gnunet-gtk :)

Im guessing its not so cleanly done(depending on how you wish to 
structure it, but ill leave that up to the GNUnet developers ;)), but 
its rather small so you shouldn't have any trouble deciding if it should 
go in SVN or not)

Im unsure about the configure-ac.diff, if it is the "right thing(TM)"
(it works here with and without libnotify)
would be nice to be able to disable it altogether.
(i can't find a good autotool tutorial online)

the small diffs are included in the attached 
file(three-diffs-libnotify.tar.gz).

anyways, im of to bed, good night.

/Nicklas Larsson

7 files changed, 78 insertions, 3 deletions

diff --git a/AUTHORS b/AUTHORS
index 9c2732ab..ce438c70 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,6 +3,7 @@ Christian Grothoff <christian@grothoff.org>
 
 Code contributions also came from:
 Igor Wronsky <iwronsky@users.sourceforge.net>
+Nicklas Larsson <whybill@gmail.com>
 Nils Durner <durner@gnunet.org>
 Milan <nalimilan@club-internet.fr>
 
diff --git a/configure.ac b/configure.ac
index f18a8c0d..291636b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -228,6 +228,18 @@ then
  AC_MSG_ERROR([gnunet-gtk requires libextractor headers])
 fi
 
+# libnotify
+LIBNOTIFY_REQUIRED=0.3.2
+PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= $LIBNOTIFY_REQUIRED], libnotify=yes, libnotify=no)
+AC_SUBST([LIBNOTIFY_CFLAGS])
+AC_SUBST([LIBNOTIFY_LIBS])
+AM_CONDITIONAL([ENABLE_LIBNOTIFY],[test "x$libnotify" = "xyes"])
+if test "x$libnotify" != "xyes"; then
+    AC_MSG_WARN([Library requirements (libnotify >= $LIBNOTIFY_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.])
+else
+    AC_MSG_NOTICE([** libnotify integration enabled])
+    AC_DEFINE(WITH_LIBNOTIFY, 1, [Define if libnotify is enabled])
+fi
 
 # We define the paths here, because MinGW/GCC expands paths
 # passed through the command line ("-DDATADIR=..."). This would
diff --git a/pixmaps/gnunet-gtk-notify.png b/pixmaps/gnunet-gtk-notify.png
new file mode 100644
index 00000000..8c1446a0
--- /dev/null
+++ b/pixmaps/gnunet-gtk-notify.png
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 19b1a6d0..ed844e9f 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -2,7 +2,8 @@ INCLUDES = \
   -I$(top_srcdir)/intl \
   -I$(top_srcdir)/src/include \
   @GTK_CFLAGS@ \
-  @GNUNETGTK_CFLAGS@
+  @GNUNETGTK_CFLAGS@ \
+  $(LIBNOTIFY_CFLAGS)
 
 lib_LTLIBRARIES = \
   libgnunetgtk_common.la
@@ -19,6 +20,6 @@ libgnunetgtk_common_la_LIBADD = \
   @GNUNETGTK_LIBS@ \
   $(INTLLIBS) \
   -lgnunetutil \
-  -lgthread-2.0 
-
+  -lgthread-2.0 \
+  $(LIBNOTIFY_LIBS)
 
diff --git a/src/common/helper.c b/src/common/helper.c
index f323658e..1307401a 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -29,6 +29,10 @@
 
 #define HELPER_DEBUG NO
 
+#ifdef WITH_LIBNOTIFY
+#include <libnotify/notify.h>
+#endif
+
 typedef struct {
   Semaphore * sem;
   void * args;
@@ -205,6 +209,9 @@ 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,4 +507,47 @@ void run_with_save_calls(PThreadMain cb,
   SEMAPHORE_FREE(cls.sig);
 }
 
+/**
+ * Simple glue to libnotify, and others?
+ *
+ */
+void gnunetgtk_notify(const char *message, int type) {
+
+  GtkWidget * root;
+  
+#ifdef WITH_LIBNOTIFY
+  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"));
+      return;
+    }
+  }
+
+  root = glade_xml_get_widget(getMainXML(),"mainWindow");
+  if(gtk_window_is_active(GTK_WINDOW(root)) == FALSE){
+    if( type == 0)
+      libnotify_urgency = NOTIFY_URGENCY_LOW;
+     else if( type == 1)
+       libnotify_urgency = NOTIFY_URGENCY_NORMAL;
+     else
+       libnotify_urgency = NOTIFY_URGENCY_CRITICAL;
+    libnotify = notify_notification_new("GNUnet: gnunet-gtk",
+                                        message,
+                                        PACKAGE_DATA_DIR"/gnunet-gtk-notify.png",
+                                        NULL);
+    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"));
+    g_object_unref(G_OBJECT(libnotify));
+    notify_uninit();
+  }
+#endif
+
+}
+
 /* end of helper.c */
diff --git a/src/include/gnunetgtk_common.h b/src/include/gnunetgtk_common.h
index 091b43cb..54a0e625 100644
--- a/src/include/gnunetgtk_common.h
+++ b/src/include/gnunetgtk_common.h
@@ -97,4 +97,11 @@ void run_with_save_calls(PThreadMain cb,
  */
 void connectGladeWithPlugins(GladeXML * xml);
 
+/**
+ * Sends a message to libnotify
+ *
+ *
+ */
+void gnunetgtk_notify(const char * message, int type);
+
 #endif
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index 6087312c..8733efc1 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -62,6 +62,7 @@ static void saveEventProcessor(void * arg) {
   case FSUI_download_complete:
     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 ? */
     break;
   case FSUI_download_error:
     BREAK();
@@ -83,11 +84,13 @@ 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.main_filename);   /* here or in upload.c ? or call notify directly ? */
     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 ? */
     break;
   case FSUI_gnunetd_connected:
     LOG(LOG_MESSAGE,
@@ -96,6 +99,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 ? */
     break;
   default:
     BREAK();