aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xconfigure46
-rw-r--r--configure.ac6
-rw-r--r--debian/changelog29
-rw-r--r--libdbusmenu-glib/Makefile.in6
-rw-r--r--libdbusmenu-glib/server.c4
-rw-r--r--libdbusmenu-gtk/Makefile.in6
-rw-r--r--libdbusmenu-gtk/client.c23
-rw-r--r--libdbusmenu-gtk/client.h1
8 files changed, 58 insertions, 63 deletions
diff --git a/configure b/configure
index 5c9ce73..549e682 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.65 for libdbusmenu 0.2.9.
+# Generated by GNU Autoconf 2.65 for libdbusmenu 0.3.0.
#
# Report bugs to <ted@canonical.com>.
#
@@ -703,8 +703,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libdbusmenu'
PACKAGE_TARNAME='libdbusmenu'
-PACKAGE_VERSION='0.2.9'
-PACKAGE_STRING='libdbusmenu 0.2.9'
+PACKAGE_VERSION='0.3.0'
+PACKAGE_STRING='libdbusmenu 0.3.0'
PACKAGE_BUGREPORT='ted@canonical.com'
PACKAGE_URL=''
@@ -1494,7 +1494,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.2.9 to adapt to many kinds of systems.
+\`configure' configures libdbusmenu 0.3.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1564,7 +1564,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libdbusmenu 0.2.9:";;
+ short | recursive ) echo "Configuration of libdbusmenu 0.3.0:";;
esac
cat <<\_ACEOF
@@ -1685,7 +1685,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libdbusmenu configure 0.2.9
+libdbusmenu configure 0.3.0
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2058,7 +2058,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.2.9, which was
+It was created by libdbusmenu $as_me 0.3.0, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2872,7 +2872,7 @@ fi
# Define the identity of the package.
PACKAGE=libdbusmenu
- VERSION=0.2.9
+ VERSION=0.3.0
# Some tools Automake needs.
@@ -8708,10 +8708,6 @@ _lt_linker_boilerplate=`cat conftest.err`
$RM -r conftest*
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
if test -n "$compiler"; then
lt_prog_compiler_no_builtin_flag=
@@ -8737,11 +8733,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8740: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8736: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8744: \$? = $ac_status" >&5
+ echo "$as_me:8740: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9076,11 +9072,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9079: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9075: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9083: \$? = $ac_status" >&5
+ echo "$as_me:9079: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9181,11 +9177,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9184: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9180: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9188: \$? = $ac_status" >&5
+ echo "$as_me:9184: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9236,11 +9232,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9239: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9235: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9243: \$? = $ac_status" >&5
+ echo "$as_me:9239: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11620,7 +11616,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11623 "configure"
+#line 11619 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11716,7 +11712,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11719 "configure"
+#line 11715 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12571,7 +12567,7 @@ fi
###########################
LIBDBUSMENU_CURRENT=1
-LIBDBUSMENU_REVISION=6
+LIBDBUSMENU_REVISION=7
LIBDBUSMENU_AGE=0
@@ -13856,7 +13852,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.2.9, which was
+This file was extended by libdbusmenu $as_me 0.3.0, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13922,7 +13918,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.2.9
+libdbusmenu config.status 0.3.0
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index b88d96d..d6c7d51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
-AC_INIT(libdbusmenu, 0.2.9, ted@canonical.com)
+AC_INIT(libdbusmenu, 0.3.0, ted@canonical.com)
AC_COPYRIGHT([Copyright 2009,2010 Canonical])
AC_PREREQ(2.62)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libdbusmenu, 0.2.9, [-Wno-portability])
+AM_INIT_AUTOMAKE(libdbusmenu, 0.3.0, [-Wno-portability])
AM_MAINTAINER_MODE
@@ -78,7 +78,7 @@ AC_PATH_PROG([VALA_API_GEN], [vapigen])
###########################
LIBDBUSMENU_CURRENT=1
-LIBDBUSMENU_REVISION=6
+LIBDBUSMENU_REVISION=7
LIBDBUSMENU_AGE=0
AC_SUBST(LIBDBUSMENU_CURRENT)
diff --git a/debian/changelog b/debian/changelog
index 0eaff72..e21f5b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,35 +1,18 @@
-libdbusmenu (0.2.9-0ubuntu1~ppa4) lucid; urgency=low
+libdbusmenu (0.3.0-0ubuntu1~ppa1) UNRELEASED; urgency=low
- * Autogen update
-
- -- Ted Gould <ted@ubuntu.com> Fri, 21 May 2010 13:57:31 -0500
-
-libdbusmenu (0.3.0~dev-0ubuntu1~ppa3) lucid; urgency=low
-
- * Upstream Merge
- * Fixing the version string in the GIR file
-
- -- Ted Gould <ted@ubuntu.com> Fri, 21 May 2010 13:39:44 -0500
-
-libdbusmenu (0.3.0~dev-0ubuntu1~ppa2) lucid; urgency=low
-
- * Upstream Merge
+ * New upstream release.
+ * Add function to get submenu of GTK-ified items
+ * Fix signal prototype of ID update
* Fixing up VAPI files to build them correctly
+ * Fixing the version string in the GIR file
* Fix documentation title page
* Reject text nodes early (warnings with Qt integration)
- * Autogen
* debian/libdbusmenu-glib-dev.install: Updating gir and vapi file
names for package list.
* debian/gir1.0-dbusmenu-glib-0.2.install: Changing the name of the
typelib file.
- -- Ted Gould <ted@ubuntu.com> Thu, 20 May 2010 13:58:45 -0500
-
-libdbusmenu (0.3.0~dev-0ubuntu1~ppa1) lucid; urgency=low
-
- * Bump version
-
- -- Ted Gould <ted@ubuntu.com> Thu, 06 May 2010 10:33:11 +0200
+ -- Ted Gould <ted@ubuntu.com> Thu, 27 May 2010 11:40:42 -0500
libdbusmenu (0.2.9-0ubuntu3~ppa1) lucid; urgency=low
diff --git a/libdbusmenu-glib/Makefile.in b/libdbusmenu-glib/Makefile.in
index 2bd983e..94d607f 100644
--- a/libdbusmenu-glib/Makefile.in
+++ b/libdbusmenu-glib/Makefile.in
@@ -43,11 +43,7 @@ subdir = libdbusmenu-glib
DIST_COMMON = $(libdbusmenu_glibinclude_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/dbusmenu-glib.pc.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
- $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c
index 02c9c57..0da66cc 100644
--- a/libdbusmenu-glib/server.c
+++ b/libdbusmenu-glib/server.c
@@ -146,8 +146,8 @@ dbusmenu_server_class_init (DbusmenuServerClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(DbusmenuServerClass, id_update),
NULL, NULL,
- g_cclosure_marshal_VOID__UINT,
- G_TYPE_NONE, 1, G_TYPE_UINT);
+ g_cclosure_marshal_VOID__INT,
+ G_TYPE_NONE, 1, G_TYPE_INT);
/**
DbusmenuServer::layout-updated:
@arg0: The #DbusmenuServer emitting the signal.
diff --git a/libdbusmenu-gtk/Makefile.in b/libdbusmenu-gtk/Makefile.in
index 6cc87ee..f64ef95 100644
--- a/libdbusmenu-gtk/Makefile.in
+++ b/libdbusmenu-gtk/Makefile.in
@@ -43,11 +43,7 @@ subdir = libdbusmenu-gtk
DIST_COMMON = $(libdbusmenu_gtkinclude_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/dbusmenu-gtk.pc.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
- $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c
index b13af6a..3bd0af6 100644
--- a/libdbusmenu-gtk/client.c
+++ b/libdbusmenu-gtk/client.c
@@ -423,6 +423,29 @@ dbusmenu_gtkclient_menuitem_get (DbusmenuGtkClient * client, DbusmenuMenuitem *
return GTK_MENU_ITEM(data);
}
+/**
+ dbusmenu_gtkclient_menuitem_get_submenu:
+ @client: A #DbusmenuGtkClient with the item in it.
+ @item: #DbusmenuMenuitem to get associated #GtkMenu on.
+
+ This grabs the submenu associated with the menuitem.
+
+ Return value: The #GtkMenu if there is one.
+*/
+GtkMenu *
+dbusmenu_gtkclient_menuitem_get_submenu (DbusmenuGtkClient * client, DbusmenuMenuitem * item)
+{
+ g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), NULL);
+ g_return_val_if_fail(DBUSMENU_IS_MENUITEM(item), NULL);
+
+ gpointer data = g_object_get_data(G_OBJECT(item), data_menu);
+ if (data == NULL) {
+ return NULL;
+ }
+
+ return GTK_MENU(data);
+}
+
/* The base type handler that builds a plain ol'
GtkMenuItem to represent, well, the GtkMenuItem */
static gboolean
diff --git a/libdbusmenu-gtk/client.h b/libdbusmenu-gtk/client.h
index 4cfbdcf..7672bf7 100644
--- a/libdbusmenu-gtk/client.h
+++ b/libdbusmenu-gtk/client.h
@@ -77,6 +77,7 @@ struct _DbusmenuGtkClient {
GType dbusmenu_gtkclient_get_type (void);
DbusmenuGtkClient * dbusmenu_gtkclient_new (gchar * dbus_name, gchar * dbus_object);
GtkMenuItem * dbusmenu_gtkclient_menuitem_get (DbusmenuGtkClient * client, DbusmenuMenuitem * item);
+GtkMenu * dbusmenu_gtkclient_menuitem_get_submenu (DbusmenuGtkClient * client, DbusmenuMenuitem * item);
void dbusmenu_gtkclient_newitem_base (DbusmenuGtkClient * client, DbusmenuMenuitem * item, GtkMenuItem * gmi, DbusmenuMenuitem * parent);
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-28 14:56:15 +0000