From 81c59db04899b607c1a55b9d729c77c26c8f2754 Mon Sep 17 00:00:00 2001
From: bustico
Date: Fri, 21 Jun 2013 16:54:18 +0000
Subject:  * add new pong callback introduced by ivy-c 3.14  * remove
 compilation warning

---
 Ivy.cxx          | 28 +++++++++++++++++++++++++++-
 IvyCallback.h    |  6 +++---
 Ivycpp.h         |  1 +
 Makefile         |  6 +++---
 debian/changelog |  7 +++++++
 5 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/Ivy.cxx b/Ivy.cxx
index b4150c6..d5bfed7 100644
--- a/Ivy.cxx
+++ b/Ivy.cxx
@@ -169,7 +169,14 @@ void Ivy::stop()
  */
 long Ivy::BindMsg(const char *regexp, IvyMessageCallback *cb)
 {
+#if defined(__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-security"
+#endif
   return (long)IvyC::IvyBindMsg( MsgCb , cb, regexp );
+#if defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif
 }
 
 
@@ -181,7 +188,14 @@ long Ivy::BindMsg (IvyMessageCallback *cb, const char *regexp, ... )
   va_start( args, regexp );     /* Initialize variable arguments. */
   vsprintf( buffer, regexp, args );
   va_end( args);
+#if defined(__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-security"
+#endif
   return (long)IvyC::IvyBindMsg( MsgCb , cb, buffer );
+#if defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif
 }
 
 
@@ -195,7 +209,7 @@ long Ivy::BindMsg (IvyMessageCallback *cb, const char *regexp, ... )
  */
 void Ivy::UnbindMsg(int id)
 {
-	IvyC::IvyUnbindMsg( (IvyC::MsgRcvPtr)id );
+  IvyC::IvyUnbindMsg( (IvyC::MsgRcvPtr) long(id) );
 }
 
 
@@ -242,7 +256,14 @@ int Ivy::SendMsg(const char *fmt, ... )
 	make_message( &buffer, fmt, args );
 	va_end( args);
 
+#if defined(__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-security"
+#endif
 	return IvyC::IvySendMsg (buffer.data); 
+#if defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif
 }
 
 
@@ -419,3 +440,8 @@ void Ivy::SetBindCallback(IvyBindingCallback* bind_callback )
 {
   IvySetBindCallback (BindCallbackCb,  bind_callback);
 }
+
+void Ivy::SetPongCallback(IvyC::IvyPongCallback pong_callback)
+{
+  IvyC::IvySetPongCallback( pong_callback );
+}
diff --git a/IvyCallback.h b/IvyCallback.h
index 7b60296..2eb51a7 100644
--- a/IvyCallback.h
+++ b/IvyCallback.h
@@ -4,8 +4,8 @@
 //
 
 
-#ifndef __IVYXTLOOP_H__
-#define __IVYXTLOOP_H__
+#ifndef __IVY_CALLBACK_H__
+#define __IVY_CALLBACK_H__
 
 class IvyApplication;
 
@@ -219,6 +219,6 @@ public:
 	{
 	}
 };
-#endif // __IVYXTLOOP_H__
+#endif // __IVY_CALLBACK_H__
 
 
diff --git a/Ivycpp.h b/Ivycpp.h
index 86e1075..b00882d 100644
--- a/Ivycpp.h
+++ b/Ivycpp.h
@@ -58,6 +58,7 @@ public:
 
 
 	static void SetBindCallback(IvyBindingCallback* bind_callback );
+        static void SetPongCallback(IvyC::IvyPongCallback pong_callback);
 	static void SetFilter( int argc, const char **argv );
 	static void start(const char *domain);
 	static void stop();
diff --git a/Makefile b/Makefile
index b5bb37d..559803d 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,7 @@ LIBIVY_GLFW_SHARED = $(LIBIVY_GLFW)$(DSO_EXT)
 LIBIVY_GLFW_DEPLIBS = -lglfw  -livy -lX11  -lXext -lXxf86vm -lGL -lpthread
 
 LIBIVY_QT_SHARED = $(LIBIVY_QT)$(DSO_EXT)
-LIBIVY_QT_DEPLIBS = -lX11  -lXext -lQtCore -lpthread
+LIBIVY_QT_DEPLIBS = -lX11  -lXext -lQtCore -livy -lpthread
 
 LIBIVY_XT_SHARED = $(LIBIVY_XT)$(DSO_EXT)
 LIBIVY_XT_DEPLIBS = -lX11  -lXext -lXt -lpthread
@@ -163,7 +163,7 @@ install_mandriva64:  default
 	install -m 0644 $(LIBIVY_SHARED) /usr/local/lib64/$(DBG)
 	install -m 0644 $(LIBIVY_GLFW_SHARED) /usr/local/lib64/$(DBG)
 
-LLDLIBS = -L $(XTLIB) -Wl,-rpath,$(XTLIB)  -L. -Wl,-rpath,. -L$(IVY_PATH)/src
+LLDLIBS = -L $(XTLIB) -Wl,-rpath,$(XTLIB)  -L. -Wl,-rpath,. -L$(IVY_PATH)/src -Wl,-rpath,/usr/local/lib64 -L/usr/local/lib64
 
 testIvyXt : testIvyXt.cxx
 	g++  -g  $(CPPFLAGS) $(XTLIB) $(LLDLIBS)  -o $@  testIvyXt.cxx  -lIvy -lxtivy -lXt -lX11 -lIvy_Xt
@@ -172,7 +172,7 @@ testIvyQt.moc: testIvyQt.cxx
 	moc $(QTOPT) $(QTINC) -i $< -o $@
 
 testIvyQt : testIvyQt.cxx testIvyQt.moc
-	g++  -g  $(QTOPT) $(QTINC) $(QTLIB) $(LLDLIBS)  -o $@  testIvyQt.cxx -lIvy_Qt -livy
+	g++  -g  $(QTOPT) $(QTINC) $(QTLIB) $(LLDLIBS) -L$(PREFIX)/lib64 -lIvy_Qt -livy -o $@  testIvyQt.cxx 
 
 
 distclean clean : 
diff --git a/debian/changelog b/debian/changelog
index 5c73f96..7478c6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ivy-cpp (1.1-1) unstable; urgency=low
+
+  * add new pong callback introduced by ivy-c 3.14
+  * remove compilation warning
+
+ -- Alexandre Bustico <alexandre.bustico@enac.fr>  Fri, 21 Jun 2013 11:41:00 +0200
+
 ivy-cpp (1.1-0) unstable; urgency=low
 
   * Add new callback virtual method introduced by ivy-c 3.11 non blocking
-- 
cgit v1.1