Include the current headers first

If you pass NULL as the fourth argument to notify_get_server_info it
segfaults.

https://bugzilla.gnome.org/show_bug.cgi?id=623096
(cherry picked from commit 4830863bab)

NEWS

@@ -1,3 +1,11 @@
+NEW in 0.5.2:
+==============
+
+Note that the 0.5.1 release was released from the 0.6 branch in error.
+Sorry about that.
+
+- Fixed #623096, Use correct variable in NULL check
+- Added a macro NOTIFY_CHECK_VERSION
 
 NEW in 0.5.0:
 ==============

configure.ac

@@ -3,7 +3,7 @@ dnl Process this file with autoconf to create configure.
 dnl ################################################################
 dnl # Initialize autoconf
 dnl ################################################################
-AC_INIT([libnotify],[0.5.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=libnotify],[libnotify])
+AC_INIT([libnotify],[0.5.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=libnotify],[libnotify])
 AC_PREREQ(2.50)
 AC_CONFIG_SRCDIR(config.h.in)
 
@@ -14,9 +14,13 @@ dnl # Version information
 dnl ################################################################
 LIBNOTIFY_MAJOR_VERSION=0
 LIBNOTIFY_MINOR_VERSION=5
-LIBNOTIFY_MICRO_VERSION=1
+LIBNOTIFY_MICRO_VERSION=2
 LIBNOTIFY_DEVEL_VERSION=0
 
+AC_SUBST(LIBNOTIFY_MAJOR_VERSION)
+AC_SUBST(LIBNOTIFY_MINOR_VERSION)
+AC_SUBST(LIBNOTIFY_MICRO_VERSION)
+
 LIBNOTIFY_VERSION=$LIBNOTIFY_MAJOR_VERSION.$LIBNOTIFY_MINOR_VERSION.$LIBNOTIFY_MICRO_VERSION
 
 if test "x$LIBNOTIFY_DEVEL_VERSION" != "x0"; then
@@ -32,6 +36,7 @@ AC_DEFINE_UNQUOTED(LIBNOTIFY_MICRO_VERSION, $LIBNOTIFY_MICRO_VERSION,
 AC_DEFINE_UNQUOTED(LIBNOTIFY_VERSION, "$LIBNOTIFY_VERSION",
 	[libnotify version.])
 
+
 dnl ################################################################
 dnl # libtool versioning
 dnl ################################################################
@@ -42,9 +47,9 @@ dnl #  ? : +1 :  ?   == internal changes that doesn't break anything.
 dnl #
 dnl # CURRENT : REVISION : AGE
 dnl #
-LT_CURRENT=3
-LT_REVISION=3
-LT_AGE=2
+LT_CURRENT=4
+LT_REVISION=0
+LT_AGE=3
 
 LT_RELEASE=$LIBNOTIFY_MAJOR_VERSION.$LIBNOTIFY_MINOR_VERSION.$LIBNOTIFY_MICRO_VERSION
 
@@ -204,6 +209,7 @@ docs/Makefile
 docs/reference/Makefile
 libnotify.pc
 libnotify/Makefile
+libnotify/notify-features.h
 tests/Makefile
 tools/Makefile
 ])

libnotify/Makefile.am

@@ -8,6 +8,7 @@ lib_LTLIBRARIES = libnotify.la
 
 notify_headers = \
 	notify.h \
+	notify-features.h \
 	notification.h
 
 notifyinc_HEADERS = \

libnotify/notify-features.h.in

@@ -0,0 +1,42 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+ *
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef __NOTIFY_VERSION_H__
+#define __NOTIFY_VERSION_H__
+
+/* compile time version
+ */
+#define NOTIFY_VERSION_MAJOR    (@LIBNOTIFY_MAJOR_VERSION@)
+#define NOTIFY_VERSION_MINOR    (@LIBNOTIFY_MINOR_VERSION@)
+#define NOTIFY_VERSION_MICRO    (@LIBNOTIFY_MICRO_VERSION@)
+
+/* check whether a version equal to or greater than
+ * major.minor.micro is present.
+ */
+#define NOTIFY_CHECK_VERSION(major,minor,micro) \
+    (NOTIFY_VERSION_MAJOR > (major) || \
+     (NOTIFY_VERSION_MAJOR == (major) && NOTIFY_VERSION_MINOR > (minor)) || \
+     (NOTIFY_VERSION_MAJOR == (major) && NOTIFY_VERSION_MINOR == (minor) && \
+      NOTIFY_VERSION_MICRO >= (micro)))
+
+
+#endif /* __NOTIFY_VERSION_H__ */
+

libnotify/notify.c

@@ -139,7 +139,9 @@ notify_uninit (void)
                 }
         }
 
-        g_object_unref (_proxy);
+        if (_proxy != NULL) {
+            g_object_unref (_proxy);
+        }
 
         _initted = FALSE;
 }
@@ -338,7 +340,7 @@ notify_get_server_info (char **ret_name,
                 g_free (version);
         }
 
-        if (spec_version != NULL) {
+        if (ret_spec_version != NULL) {
                 *ret_spec_version = spec_version;
         } else {
                 g_free (spec_version);

libnotify/notify.h

@@ -27,6 +27,7 @@
 
 #include <libnotify/notification.h>
 #include <libnotify/notify-enum-types.h>
+#include <libnotify/notify-features.h>
 
 G_BEGIN_DECLS
 

tests/Makefile.am

@@ -67,8 +67,10 @@ test_rtl_LDADD = $(common_ldflags)
 
 EXTRA_DIST = applet-critical.png
 
-INCLUDES = $(PACKAGE_CFLAGS)	\
-	$(GDK_CFLAGS)		\
-	-I$(top_srcdir)
+INCLUDES = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/libnotify \
+	$(PACKAGE_CFLAGS)	\
+	$(GDK_CFLAGS)
 
 -include $(top_srcdir)/git.mk

tools/Makefile.am

@@ -7,7 +7,10 @@ common_ldflags = \
 notify_send_SOURCES = notify-send.c
 notify_send_LDADD   = $(common_ldflags)
 
-INCLUDES = $(PACKAGE_CFLAGS)	\
-	-I$(top_srcdir)
+INCLUDES = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/libnotify \
+	$(PACKAGE_CFLAGS)
+
 
 -include $(top_srcdir)/git.mk