From e447e0e186bfff3e2edaf02ba40e312705ee1f39 Mon Sep 17 00:00:00 2001 From: Christian Hammond Date: Sun, 18 Jun 2006 02:17:56 +0000 Subject: Add G_BEGIN_DECLS and G_END_DECLS to notify.h, so that libnotify can be used in C++ applications properly. --- ChangeLog | 8 ++++++++ NEWS | 4 ++++ configure.ac | 4 ++-- libnotify/internal.h | 4 ++++ libnotify/notify.h | 7 ++----- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a5584c..47aab7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Sat Jun 17 19:17:05 PDT 2006 Christian Hammond + + * libnotify/internal.h: + * libnotify/notify.h: + * configure.ac: + - Add G_BEGIN_DECLS and G_END_DECLS to notify.h, so that libnotify can + be used in C++ applications properly. + ========================= 0.4.1 ========================= Sat Jun 17 18:17:28 PDT 2006 Christian Hammond diff --git a/NEWS b/NEWS index 6024670..c0005c8 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +version 0.4.2 (17-June-2006): + * Add G_BEGIN_DECLS and G_END_DECLS to notify.h, so that libnotify can + be used in C++ applications properly. + version 0.4.1 (17-June-2006): * Added support for attaching to a GtkStatusIcon. Patch by chpe. (Bug #60) * Added GObject properties to NotifyNotification. Patch by chpe. (Bug #60) diff --git a/configure.ac b/configure.ac index a5ecdc0..0a71d96 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Process this file with autoconf to create configure. dnl ################################################################ dnl # Initialize autoconf dnl ################################################################ -AC_INIT(libnotify, 0.4.1, chipx86@chipx86.com) +AC_INIT(libnotify, 0.4.2, chipx86@chipx86.com) AC_PREREQ(2.50) AC_CONFIG_SRCDIR(config.h.in) AC_COPYRIGHT([Copyright 2004-2006 Christian Hammond]) @@ -14,7 +14,7 @@ dnl # Version information dnl ################################################################ LIBGALAGO_MAJOR_VERSION=0 LIBGALAGO_MINOR_VERSION=4 -LIBGALAGO_MICRO_VERSION=1 +LIBGALAGO_MICRO_VERSION=2 LIBGALAGO_DEVEL_VERSION=0 LIBGALAGO_VERSION=$LIBGALAGO_MAJOR_VERSION.$LIBGALAGO_MINOR_VERSION.$LIBGALAGO_MICRO_VERSION diff --git a/libnotify/internal.h b/libnotify/internal.h index d73ef26..697f64a 100644 --- a/libnotify/internal.h +++ b/libnotify/internal.h @@ -36,6 +36,8 @@ #define NOTIFY_DBUS_CORE_INTERFACE "org.freedesktop.Notifications" #define NOTIFY_DBUS_CORE_OBJECT "/org/freedesktop/Notifications" +G_BEGIN_DECLS + DBusGConnection *_notify_get_dbus_g_conn(void); DBusGProxy *_notify_get_g_proxy(void); @@ -45,4 +47,6 @@ gint _notify_notification_get_timeout(const NotifyNotification *n); gboolean _notify_notification_has_nondefault_actions( const NotifyNotification *n); +G_END_DECLS + #endif /* _LIBNOTIFY_INTERNAL_H_ */ diff --git a/libnotify/notify.h b/libnotify/notify.h index 9c02896..0e1cad8 100644 --- a/libnotify/notify.h +++ b/libnotify/notify.h @@ -27,10 +27,7 @@ #include #include -/**************************************************************************/ -/** @name libnotify Base API */ -/**************************************************************************/ -/*@{*/ +G_BEGIN_DECLS /** * Initializes the notifications library. @@ -87,6 +84,6 @@ gboolean notify_get_server_info(char **ret_name, char **ret_version, char **ret_spec_version); -/*@}*/ +G_END_DECLS #endif /* _LIBNOTIFY_NOTIFY_H_ */ -- cgit v1.2.1