aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog87
-rw-r--r--libdbusmenu-glib/client.c8
-rw-r--r--tests/Makefile.am3
3 files changed, 16 insertions, 82 deletions
diff --git a/debian/changelog b/debian/changelog
index aa50083..3f0f274 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,87 +1,10 @@
-libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix14) karmic; urgency=low
+libdbusmenu (0.1.5-0ubuntu1~ppa2) UNRELEASED; urgency=low
- * Adding destroy messages
+ * Managing the life-cycle of the GTK Menu item better to
+ ensure that it is positioned correctly and dies
+ appropriately. (LP: #430904 and LP: #419953)
- -- Ted Gould <ted@ubuntu.com> Fri, 02 Oct 2009 15:02:55 -0500
-
-libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix13) karmic; urgency=low
-
- * Reporting on request version vs. actual
-
- -- Ted Gould <ted@ubuntu.com> Thu, 01 Oct 2009 20:47:30 -0500
-
-libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix12) karmic; urgency=low
-
- * Adding a little reffing in.
-
- -- Ted Gould <ted@ubuntu.com> Thu, 01 Oct 2009 16:57:46 -0500
-
-libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix11) karmic; urgency=low
-
- * Killing some bad looking warnings that are stupid
-
- -- Ted Gould <ted@ubuntu.com> Thu, 01 Oct 2009 15:52:08 -0500
-
-libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix10) karmic; urgency=low
-
- * Removing from the container
-
- -- Ted Gould <ted@ubuntu.com> Thu, 01 Oct 2009 15:10:04 -0500
-
-libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix9) karmic; urgency=low
-
- * Handling child added differently.
-
- -- Ted Gould <ted@ubuntu.com> Thu, 01 Oct 2009 14:52:17 -0500
-
-libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix8) karmic; urgency=low
-
- * Better log domains and typos
-
- -- Ted Gould <ted@ubuntu.com> Thu, 01 Oct 2009 14:25:34 -0500
-
-libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix7) karmic; urgency=low
-
- * More messages
-
- -- Ted Gould <ted@ubuntu.com> Thu, 01 Oct 2009 14:17:21 -0500
-
-libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix6) karmic; urgency=low
-
- * get_position messages
-
- -- Ted Gould <ted@ubuntu.com> Thu, 01 Oct 2009 13:54:20 -0500
-
-libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix5) karmic; urgency=low
-
- * More messages from client
-
- -- Ted Gould <ted@ubuntu.com> Thu, 01 Oct 2009 13:45:16 -0500
-
-libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix4) karmic; urgency=low
-
- * More debugging info
-
- -- Ted Gould <ted@ubuntu.com> Thu, 01 Oct 2009 13:19:44 -0500
-
-libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix3) karmic; urgency=low
-
- * Better messages
-
- -- Ted Gould <ted@ubuntu.com> Thu, 01 Oct 2009 12:36:44 -0500
-
-libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix2) karmic; urgency=low
-
- * Typo++
-
- -- Ted Gould <ted@ubuntu.com> Thu, 01 Oct 2009 12:03:28 -0500
-
-libdbusmenu (0.1.5-0ubuntu1~ppa2~bugfix1) karmic; urgency=low
-
- * Adding stuff, mostly debugging info
- * debian/rules: Enabling massive debugging
-
- -- Ted Gould <ted@ubuntu.com> Thu, 01 Oct 2009 10:22:56 -0500
+ -- Ted Gould <ted@ubuntu.com> Fri, 02 Oct 2009 16:54:56 -0500
libdbusmenu (0.1.5-0ubuntu1~ppa1) karmic; urgency=low
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index 1a018a8..ab307bd 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -576,6 +576,10 @@ get_properties_helper (gpointer key, gpointer value, gpointer data)
static void
menuitem_get_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError * error, gpointer data)
{
+ if (error != NULL) {
+ g_warning("Error getting properties on a menuitem: %s", error->message);
+ return;
+ }
g_hash_table_foreach(properties, get_properties_helper, data);
g_hash_table_destroy(properties);
return;
@@ -586,6 +590,10 @@ menuitem_get_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError
static void
menuitem_get_properties_new_cb (DBusGProxy * proxy, GHashTable * properties, GError * error, gpointer data)
{
+ if (error != NULL) {
+ g_warning("Error getting properties on a new menuitem: %s", error->message);
+ return;
+ }
g_return_if_fail(data != NULL);
newItemPropData * propdata = (newItemPropData *)data;
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ace4bf4..f111054 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -189,3 +189,6 @@ examples_DATA = \
EXTRA_DIST = \
$(examples_DATA) \
test-gtk-label.json
+
+DISTCLEANFILES = \
+ $(TESTS)