aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-04-05 14:08:03 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-04-05 14:08:03 -0500
commitecacfc1fab93db37e6b2881cfcc717d192b66e5c (patch)
treea93d4b8ba702af83866d9722b7a9820b2e98a499
parent87ab9751157009059774c63ca3b5a2f395338c85 (diff)
parent62d50f5b58529493bf1029ef90d264e0f16bf0bb (diff)
downloadlibdbusmenu-ecacfc1fab93db37e6b2881cfcc717d192b66e5c.tar.gz
libdbusmenu-ecacfc1fab93db37e6b2881cfcc717d192b66e5c.tar.bz2
libdbusmenu-ecacfc1fab93db37e6b2881cfcc717d192b66e5c.zip
Import upstream version 0.5.99
-rw-r--r--ChangeLog8
-rwxr-xr-xconfigure20
-rw-r--r--configure.ac4
-rw-r--r--docs/libdbusmenu-glib/reference/html/ch01.html2
-rw-r--r--docs/libdbusmenu-glib/reference/version.xml2
-rw-r--r--docs/libdbusmenu-gtk/reference/html/ch01.html2
-rw-r--r--docs/libdbusmenu-gtk/reference/version.xml2
-rw-r--r--libdbusmenu-glib/client.c4
8 files changed, 26 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index f5ffa66..e44f1fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,14 @@
2012-04-05 Charles Kerr <charles.kerr@canonical.com>
+ 0.5.99
+
+2012-04-05 Charles Kerr <charles.kerr@canonical.com>
+
+ make event_data_find() and session_bus_cb() private instead of public
+
+2012-04-05 Charles Kerr <charles.kerr@canonical.com>
+
0.5.98
2012-04-05 Charles Kerr <charles.kerr@canonical.com>
diff --git a/configure b/configure
index 5e5f940..5ef337e 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libdbusmenu 0.5.98.
+# Generated by GNU Autoconf 2.68 for libdbusmenu 0.5.99.
#
# Report bugs to <ted@canonical.com>.
#
@@ -572,8 +572,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libdbusmenu'
PACKAGE_TARNAME='libdbusmenu'
-PACKAGE_VERSION='0.5.98'
-PACKAGE_STRING='libdbusmenu 0.5.98'
+PACKAGE_VERSION='0.5.99'
+PACKAGE_STRING='libdbusmenu 0.5.99'
PACKAGE_BUGREPORT='ted@canonical.com'
PACKAGE_URL=''
@@ -1454,7 +1454,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libdbusmenu 0.5.98 to adapt to many kinds of systems.
+\`configure' configures libdbusmenu 0.5.99 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1524,7 +1524,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libdbusmenu 0.5.98:";;
+ short | recursive ) echo "Configuration of libdbusmenu 0.5.99:";;
esac
cat <<\_ACEOF
@@ -1679,7 +1679,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libdbusmenu configure 0.5.98
+libdbusmenu configure 0.5.99
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2050,7 +2050,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libdbusmenu $as_me 0.5.98, which was
+It was created by libdbusmenu $as_me 0.5.99, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2871,7 +2871,7 @@ fi
# Define the identity of the package.
PACKAGE=libdbusmenu
- VERSION=0.5.98
+ VERSION=0.5.99
# Some tools Automake needs.
@@ -16183,7 +16183,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libdbusmenu $as_me 0.5.98, which was
+This file was extended by libdbusmenu $as_me 0.5.99, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16249,7 +16249,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libdbusmenu config.status 0.5.98
+libdbusmenu config.status 0.5.99
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index a1f269b..9a55549 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
-AC_INIT(libdbusmenu, 0.5.98, ted@canonical.com)
+AC_INIT(libdbusmenu, 0.5.99, ted@canonical.com)
AC_COPYRIGHT([Copyright 2009,2010 Canonical])
AC_PREREQ(2.62)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libdbusmenu, 0.5.98, [-Wno-portability])
+AM_INIT_AUTOMAKE(libdbusmenu, 0.5.99, [-Wno-portability])
AM_MAINTAINER_MODE
diff --git a/docs/libdbusmenu-glib/reference/html/ch01.html b/docs/libdbusmenu-glib/reference/html/ch01.html
index 6a4d4aa..becea1d 100644
--- a/docs/libdbusmenu-glib/reference/html/ch01.html
+++ b/docs/libdbusmenu-glib/reference/html/ch01.html
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp2621352"></a>API</h2></div></div></div>
+<a name="idp2847840"></a>API</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="libdbusmenu-glib-DbusmenuServer.html">DbusmenuServer</a></span><span class="refpurpose"> — The server signals changed and
diff --git a/docs/libdbusmenu-glib/reference/version.xml b/docs/libdbusmenu-glib/reference/version.xml
index c1db89f..6d0dc3b 100644
--- a/docs/libdbusmenu-glib/reference/version.xml
+++ b/docs/libdbusmenu-glib/reference/version.xml
@@ -1 +1 @@
-0.5.98
+0.5.99
diff --git a/docs/libdbusmenu-gtk/reference/html/ch01.html b/docs/libdbusmenu-gtk/reference/html/ch01.html
index e3f9bcc..08b01c9 100644
--- a/docs/libdbusmenu-gtk/reference/html/ch01.html
+++ b/docs/libdbusmenu-gtk/reference/html/ch01.html
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp16968456"></a>API</h2></div></div></div>
+<a name="idp2982872"></a>API</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="libdbusmenu-gtk-DbusmenuGtkMenu.html">DbusmenuGtkMenu</a></span><span class="refpurpose"> — A GTK Menu Object that syncronizes over DBus</span>
diff --git a/docs/libdbusmenu-gtk/reference/version.xml b/docs/libdbusmenu-gtk/reference/version.xml
index c1db89f..6d0dc3b 100644
--- a/docs/libdbusmenu-gtk/reference/version.xml
+++ b/docs/libdbusmenu-gtk/reference/version.xml
@@ -1 +1 @@
-0.5.98
+0.5.99
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index ed89d86..b6e7204 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -1023,7 +1023,7 @@ proxy_destroyed (GObject * gobj_proxy, gpointer userdata)
/* Respond to us getting the session bus (hopefully) or handle
the error if not */
-void
+static void
session_bus_cb (GObject * object, GAsyncResult * res, gpointer user_data)
{
GError * error = NULL;
@@ -1634,7 +1634,7 @@ menuitem_call_cb (GObject * proxy, GAsyncResult * res, gpointer userdata)
}
/* Looks at event_data_t structs to match an ID */
-gint
+static gint
event_data_find (gconstpointer data, gconstpointer user_data)
{
event_data_t * edata = (event_data_t *)data;