#5589: Fix compilation of libnotify under

sflphone-client-gnome/configure.ac

@@ -51,13 +51,13 @@ AC_SUBST(LIBSEXY_CFLAGS)
 AC_SUBST(LIBSEXY_LIBS)
 
 PKG_CHECK_MODULES(DBUSGLIB, dbus-glib-1 >= 0.75, HAVE_DBUS_G_PROXY_SET_DEFAULT_TIMEOUT=true, HAVE_DBUS_G_PROXY_SET_DEFAULT_TIMEOUT=false);
-PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= 0.4)
+PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= 0.7.2], [AC_DEFINE([LIBNOTIFY_VERSION_0_7_2],[],[Using libnotify-0.7.2 or higher])],[PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= 0.4])])
 PKG_CHECK_MODULES(SFLGTK, gtk+-2.0 > 2.2)
 PKG_CHECK_MODULES(SFLGLIB, glib-2.0 >= 2.2)
 PKG_CHECK_MODULES(WEBKIT, webkit-1.0)
 PKG_CHECK_MODULES(LIBEBOOK, libebook-1.2 >= 1.4)
 PKG_CHECK_MODULES(LIBEDATASERVER, libedataserver-1.2)
-PKG_CHECK_MODULES(LIBEDATASERVERUI, libedataserverui-1.2)
+#PKG_CHECK_MODULES(LIBEDATASERVERUI, libedataserverui-1.2)
 PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
 PKG_CHECK_MODULES(GNOMEDOCUTILS, gnome-doc-utils)
 

sflphone-client-gnome/src/contacts/addressbook/eds.c

@@ -540,6 +540,7 @@ authenticate_source (EBook *book)
     if (auth) {
         component_name = auth_domain ? auth_domain : "Addressbook";
 
+/*
         password = e_passwords_get_password (component_name, uri);
 
         if (e_book_authenticate_user (book, user, password, auth, &err)) {
@@ -548,6 +549,7 @@ authenticate_source (EBook *book)
         else {
             ERROR ("Addressbook: authentication error");
         }
+*/
     }
 }
 

sflphone-client-gnome/src/sflnotify.c

@@ -27,9 +27,10 @@
  *  shall include the source code for the parts of OpenSSL used as well
  *  as that of the covered work.
  */
+#include <eel-gconf-extensions.h>
 
+#include "config.h"
 #include "sflnotify.h"
-#include <eel-gconf-extensions.h>
 
 GnomeNotification *_gnome_notification;
 
@@ -44,11 +45,17 @@ void create_new_gnome_notification (gchar *title, gchar *body, NotifyUrgency urg
         notify_init ("SFLphone");
 
         // Set struct fields
+#ifdef LIBNOTIFY_VERSION_0_7_2
+        _notif->notification = notify_notification_new (title, body, NULL);
+#else
         _notif->notification = notify_notification_new (title, body, NULL, NULL);
-        //_notif->icon = gdk_pixbuf_new_from_file_at_size (LOGO, 120, 120, NULL);
+#endif
         _notif->icon = gdk_pixbuf_new_from_file (LOGO_SMALL, NULL);
+#ifdef LIBNOTIFY_VERSION_0_7_2
+#else
 #if GTK_CHECK_VERSION(2,10,0)
         notify_notification_attach_to_status_icon (_notif->notification , get_status_icon());
+#endif
 #endif
 
         notify_notification_set_urgency (_notif->notification, urgency);