New interface for su_glib. The old one is still there but deprecated....

New interface for su_glib. The old one is still there but deprecated. libsofia-sip-ua-glib interface version to 1:0:1.

darcs-hash:20060913111739-7659e-9c1dcbbf2647b8b10aaf8886d959458980430a51.gz

RELEASE

@@ -47,9 +47,13 @@ libsofia-sip-ua:
   module unit test (test_nua) built against original 1.12.0 release.
 
 libsofia-sip-ua-glib:
-- No ABI/API changes, compatible with 1.12.0. Note, libsofia-sip-ua-glib
-  interface is not considered stable and may change in a future 1.12.x
-  release.
+- Added sofia-sip/su_glib.h. The old sofia-sip/su_source.h is 
+  deprecated, but still present. Similarly the functions su_root_source()
+  and su_root_source_create() have been deprecated and replaced with
+  su_glib_root_create() and su_glib_root_source().
+- This release is ABI/API compatible with libsofia-sip-ua-glib of 1.12.0. Note, 
+  libsofia-sip-ua-glib interface is NOT considered stable and may change in 
+  a future 1.12.x release.
 
 Contributors to this release
 ----------------------------

configure.ac

@@ -20,9 +20,9 @@ AC_SUBST(LIBVER_SOFIA_SIP_UA_CUR, [2])
 AC_SUBST(LIBVER_SOFIA_SIP_UA_REV, [0])
 AC_SUBST(LIBVER_SOFIA_SIP_UA_AGE, [2])
 AC_SUBST(LIBVER_SOFIA_SIP_UA_SOVER, [0]) # CUR-AGE
-AC_SUBST(LIBVER_SOFIA_SIP_UA_GLIB_CUR, [0])
+AC_SUBST(LIBVER_SOFIA_SIP_UA_GLIB_CUR, [1])
 AC_SUBST(LIBVER_SOFIA_SIP_UA_GLIB_REV, [0])
-AC_SUBST(LIBVER_SOFIA_SIP_UA_GLIB_AGE, [0])
+AC_SUBST(LIBVER_SOFIA_SIP_UA_GLIB_AGE, [1])
 AC_SUBST(LIBVER_SOFIA_SIP_UA_GLIB_SOVER, [0]) # CUR-AGE
 					    
 # dnl calls AC_CANONICAL_ macros that are required by AM_INIT_AUTOMAKE

libsofia-sip-ua-glib/su-glib/Makefile.am

@@ -33,7 +33,8 @@ TESTS = 		su_source_test
 nobase_include_sofia_HEADERS =
 if HAVE_GLIB
 nobase_include_sofia_HEADERS += \
-			sofia-sip/su_source.h
+			sofia-sip/su_source.h \
+			sofia-sip/su_glib.h
 endif
 
 libsu_glib_la_SOURCES = su_source.c

libsofia-sip-ua-glib/su-glib/sofia-sip/su_glib.h

+/*
+ * This file is part of the Sofia-SIP package
+ *
+ * Copyright (C) 2006 Nokia Corporation.
+ *
+ * Contact: Pekka Pessi <pekka.pessi@nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef SU_GLIB_SOURCE_H
+#define SU_GLIB_SOURCE_H
+
+/**
+ * @file su_glib.h
+ * 
+ * @author Pekka Pessi <Pekka.Pessi@nokia.com>
+ * @author Kai Vehmanen <first.surname@nokia.com>
+ */
+
+#ifndef SU_WAIT_H
+#include <sofia-sip/su_wait.h>
+#endif
+#ifndef __GLIB_H__
+#include <glib.h>
+#endif
+
+SOFIA_BEGIN_DECLS
+
+SOFIAPUBFUN su_root_t *su_glib_root_create(su_root_magic_t *) __attribute__((__malloc__));
+SOFIAPUBFUN GSource *su_glib_root_source(su_root_t *);
+
+SOFIA_END_DECLS
+
+#endif /* !defined SU_GLIB_SOURCE_H */

libsofia-sip-ua-glib/su-glib/sofia-sip/su_source.h

@@ -28,8 +28,12 @@
 /**
  * @file su_source.h
  * @brief 
+ *
+ * NOTE: This file (su_source.h) is DEPRECATED as of 1.12.2 release. 
+ *       Please use su_glib.h instead.
  * 
  * @author Pekka Pessi <Pekka.Pessi@nokia.com>
+ * @author Kai Vehmanen <first.surname@nokia.com>
  *  
  * @date Created: Thu Mar  4 19:58:50 2004 ppessi
  * 
@@ -44,8 +48,8 @@
 
 SOFIA_BEGIN_DECLS
 
-su_root_t *su_root_source_create(su_root_magic_t *) __attribute__((__malloc__));
-GSource *su_root_source(su_root_t *);
+SOFIAPUBFUN su_root_t *su_root_source_create(su_root_magic_t *) __attribute__((__malloc__));
+SOFIAPUBFUN GSource *su_root_source(su_root_t *);
 
 SOFIA_END_DECLS
 

libsofia-sip-ua-glib/su-glib/su_source.c

@@ -54,6 +54,7 @@
 #define su_port_s su_source_s
 
 #include "sofia-sip/su_source.h"
+#include "sofia-sip/su_glib.h"
 
 #include "sofia-sip/su.h"
 #include "su_port.h"