ekiga r7710 - in trunk: . lib/engine lib/engine/components lib/engine/components/libnotify lib/engine/components/opal

[dsandras svn gnome org]

Author: dsandras
Date: Tue Mar  3 19:22:50 2009
New Revision: 7710
URL: http://svn.gnome.org/viewvc/ekiga?rev=7710&view=rev

Log:
Uniformised the detection of libnotify. Fixes compilation with mingw.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/lib/engine/Makefile.am
   trunk/lib/engine/components/Makefile.am
   trunk/lib/engine/components/libnotify/Makefile.am
   trunk/lib/engine/components/opal/sip-endpoint.cpp
   trunk/lib/engine/engine.cpp

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Mar  3 19:22:50 2009
@@ -608,23 +608,6 @@
 
 AM_CONDITIONAL(HAVE_XCAP, test "x$found_xcap" = "xyes")
 
-dnl ###############################
-dnl     libnotify support
-dnl ###############################
-LIBNOTIFY="disabled"
-
-AC_ARG_ENABLE(libnotify, [ --enable-libnotify           Enable libnotify support],enable_libnotify=yes,)
-
-if test "x$enable_libnotify" = "xyes"; then
-   PKG_CHECK_MODULES([LIBNOTIFY], [libnotify])
-   found_libnotify=yes
-   LIBNOTIFY="enabled"
-   AC_SUBST(LIBNOTIFY_CFLAGS)
-   AC_SUBST(LIBNOTIFY_LIBS)
-   AC_DEFINE(HAVE_LIBNOTIFY,1,[libnotify support])
-fi
-
-AM_CONDITIONAL(HAVE_LIBNOTIFY, test "x$found_libnotify" = "xyes")
 
 dnl ###############################
 dnl   Gnome-Doc-Utils
@@ -836,7 +819,6 @@
 echo "            KAddressBook support  :  $KAB"
 echo "                     KDE support  :  $KDE"
 echo "                    XCAP support  :  $XCAP"
-echo "               libnotify support  :  $LIBNOTIFY"
 echo ""
 echo "                         OS Type  :  $target_os"
 echo "                    Machine Type  :  $target_cpu"

Modified: trunk/lib/engine/Makefile.am
==============================================================================
--- trunk/lib/engine/Makefile.am	(original)
+++ trunk/lib/engine/Makefile.am	Tue Mar  3 19:22:50 2009
@@ -164,7 +164,7 @@
 	components/resource-list/libgmresource_list.la
 endif
 
-if HAVE_LIBNOTIFY
+if HAVE_NOTIFY
 INCLUDES += -I$(top_srcdir)/lib/engine/components/libnotify/
 libekiga_engine_la_LIBADD += components/libnotify/libgmlibnotify.la
 endif

Modified: trunk/lib/engine/components/Makefile.am
==============================================================================
--- trunk/lib/engine/components/Makefile.am	(original)
+++ trunk/lib/engine/components/Makefile.am	Tue Mar  3 19:22:50 2009
@@ -39,7 +39,7 @@
 KDE_DIR = kde
 endif
 
-if HAVE_LIBNOTIFY
+if HAVE_NOTIFY
 LIBNOTIFY_DIR = libnotify
 endif
 

Modified: trunk/lib/engine/components/libnotify/Makefile.am
==============================================================================
--- trunk/lib/engine/components/libnotify/Makefile.am	(original)
+++ trunk/lib/engine/components/libnotify/Makefile.am	Tue Mar  3 19:22:50 2009
@@ -2,7 +2,7 @@
 
 libnotify_dir = $(top_srcdir)/lib/engine/components/libnotify
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(LIBNOTIFY_CFLAGS)
+AM_CXXFLAGS = $(SIGC_CFLAGS) $(NOTIFY_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/engine/framework \
@@ -16,4 +16,4 @@
 	$(top_builddir)/lib/engine/framework/libgmframework.la \
 	$(top_builddir)/lib/engine/notification/libnotification.la
 
-libgmlibnotify_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(LIBNOTIFY_LIBS)
\ No newline at end of file
+libgmlibnotify_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(NOTIFY_LIBS)

Modified: trunk/lib/engine/components/opal/sip-endpoint.cpp
==============================================================================
--- trunk/lib/engine/components/opal/sip-endpoint.cpp	(original)
+++ trunk/lib/engine/components/opal/sip-endpoint.cpp	Tue Mar  3 19:22:50 2009
@@ -154,7 +154,7 @@
   /* Timeouts */
   SetAckTimeout (PTimeInterval (0, 32));
   SetPduCleanUpTimeout (PTimeInterval (0, 1));
-  SetInviteTimeout (PTimeInterval (0, 6));
+  SetInviteTimeout (PTimeInterval (0, 60));
   SetNonInviteTimeout (PTimeInterval (0, 6));
   SetRetryTimeouts (500, 4000);
   SetMaxRetries (8);

Modified: trunk/lib/engine/engine.cpp
==============================================================================
--- trunk/lib/engine/engine.cpp	(original)
+++ trunk/lib/engine/engine.cpp	Tue Mar  3 19:22:50 2009
@@ -99,7 +99,7 @@
 #include "ldap-main.h"
 #endif
 
-#ifdef HAVE_LIBNOTIFY
+#ifdef HAVE_NOTIFY
 #include "libnotify-main.h"
 #endif
 
@@ -202,7 +202,7 @@
     return;
   }
 
-#ifdef HAVE_LIBNOTIFY
+#ifdef HAVE_NOTIFY
   libnotify_init (kickstart);
 #endif