aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-06-22 14:49:32 -0500
committerTed Gould <ted@gould.cx>2010-06-22 14:49:32 -0500
commit30c73018d2ba93ea84b7c89b02d9be5e6fb04709 (patch)
treea0037e2d8880f52ed5333dea2c8e2f144b2315d7
parent8d57fff00109f049fc4f5341bc5c9ae09390d163 (diff)
parent5c0f9d84925fc1221f20b8356810c015dbad962c (diff)
downloadlibdbusmenu-30c73018d2ba93ea84b7c89b02d9be5e6fb04709.tar.gz
libdbusmenu-30c73018d2ba93ea84b7c89b02d9be5e6fb04709.tar.bz2
libdbusmenu-30c73018d2ba93ea84b7c89b02d9be5e6fb04709.zip
* Upstream Merge
* Useful warning messages
-rw-r--r--debian/changelog7
-rw-r--r--libdbusmenu-gtk/menuitem.c2
2 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 45f2aaf..443006e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdbusmenu (0.3.2-1ubuntu1~ppa4~value3) UNRELEASED; urgency=low
+
+ * Upstream Merge
+ * Useful warning messages
+
+ -- Ted Gould <ted@ubuntu.com> Tue, 22 Jun 2010 14:48:56 -0500
+
libdbusmenu (0.3.2-1ubuntu1~ppa4~value2) lucid; urgency=low
* Upstream Merge
diff --git a/libdbusmenu-gtk/menuitem.c b/libdbusmenu-gtk/menuitem.c
index 0eb0758..a7aa9d2 100644
--- a/libdbusmenu-gtk/menuitem.c
+++ b/libdbusmenu-gtk/menuitem.c
@@ -296,6 +296,7 @@ dbusmenu_menuitem_property_get_shortcut (DbusmenuMenuitem * menuitem, guint * ke
return;
}
if (!G_VALUE_HOLDS(wrapper, G_TYPE_VALUE_ARRAY)) {
+ g_warning("Unexpected shortcut structure. Wrapper is: %s", G_VALUE_TYPE_NAME(wrapper));
return;
}
@@ -310,6 +311,7 @@ dbusmenu_menuitem_property_get_shortcut (DbusmenuMenuitem * menuitem, guint * ke
GValue * ventryarray = g_value_array_get_nth(wrapperarray, 0);
if (!G_VALUE_HOLDS(ventryarray, G_TYPE_VALUE_ARRAY)) {
+ g_warning("Unexpected shortcut structure. Value array is: %s", G_VALUE_TYPE_NAME(ventryarray));
return;
}