* New upstream release (0.4.91).

  * Add in a property for setting the menuitem disposition
* New upstream release (0.4.92).
  * Fix GTK 2 build for style properties
  * Fixed proxied menu events not getting returned (LP: #799878)
* Removed debian/patches:
  * All upstream
* debian/libdbusmenu-gtk4.symbols debian/libdbusmenu-gtk3-4.symbols
  - Added new symbols

4 files changed, 82 insertions, 3 deletions

diff --git a/libdbusmenu-glib/dbus-menu.xml b/libdbusmenu-glib/dbus-menu.xml
index a36c148..4b5a5d8 100644
--- a/libdbusmenu-glib/dbus-menu.xml
+++ b/libdbusmenu-glib/dbus-menu.xml
@@ -157,6 +157,19 @@ License version 3 and version 2.1 along with this program.  If not, see
 			</td>
 			<td>""</td>
 		</tr>
+		<tr>
+			<td>disposition</td>
+			<td>string</td>
+			<td>
+			How the menuitem feels the information it's displaying to the
+			user should be presented.
+			- "normal" a standard menu item
+			- "informative" providing additional information to the user
+			- "warning" looking at potentially harmful results
+			- "alert" something bad could potentially happen
+			</td>
+			<td>"normal"</td>
+		</tr>
 		</table>
 
 		Vendor specific properties can be added by prefixing them with
diff --git a/libdbusmenu-glib/defaults.c b/libdbusmenu-glib/defaults.c
index aa479b1..a5caf0b 100644
--- a/libdbusmenu-glib/defaults.c
+++ b/libdbusmenu-glib/defaults.c
@@ -87,6 +87,7 @@ dbusmenu_defaults_init (DbusmenuDefaults *self)
 	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_DEFAULT,    DBUSMENU_MENUITEM_PROP_TOGGLE_STATE,   G_VARIANT_TYPE_INT32,     NULL); 
 	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_DEFAULT,    DBUSMENU_MENUITEM_PROP_SHORTCUT,       G_VARIANT_TYPE("aas"),    NULL); 
 	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_DEFAULT,    DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY,  G_VARIANT_TYPE_STRING,    NULL); 
+	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_DEFAULT,    DBUSMENU_MENUITEM_PROP_DISPOSITION,    G_VARIANT_TYPE_STRING,    g_variant_new_string(DBUSMENU_MENUITEM_DISPOSITION_NORMAL)); 
 
 	/* Separator defaults */
 	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_SEPARATOR,  DBUSMENU_MENUITEM_PROP_VISIBLE,        G_VARIANT_TYPE_BOOLEAN,   g_variant_new_boolean(TRUE)); 
diff --git a/libdbusmenu-glib/menuitem.h b/libdbusmenu-glib/menuitem.h
index afd1d4e..985e1a3 100644
--- a/libdbusmenu-glib/menuitem.h
+++ b/libdbusmenu-glib/menuitem.h
@@ -41,7 +41,9 @@ G_BEGIN_DECLS
 #define DBUSMENU_IS_MENUITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DBUSMENU_TYPE_MENUITEM))
 #define DBUSMENU_MENUITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), DBUSMENU_TYPE_MENUITEM, DbusmenuMenuitemClass))
 
-
+/* ***************************************** */
+/* *********  GLib Object Signals  ********* */
+/* ***************************************** */
 /**
  * DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED:
  *
@@ -103,6 +105,9 @@ G_BEGIN_DECLS
  */
 #define DBUSMENU_MENUITEM_SIGNAL_EVENT               "event"
 
+/* ***************************************** */
+/* *********  Menuitem Properties  ********* */
+/* ***************************************** */
 /**
  * DBUSMENU_MENUITEM_PROP_TYPE:
  *
@@ -184,7 +189,17 @@ G_BEGIN_DECLS
  * #DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU.  Type: #G_VARIANT_TYPE_STRING
  */
 #define DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY         "children-display"
+/**
+ * DBUSMENU_MENUITEM_PROP_DISPOSITION:
+ *
+ * #DbusmenuMenuitem property to tell what type of information that the
+ * menu item is displaying to the user.  Type: #G_VARIANT_TYPE_STRING
+ */
+#define DBUSMENU_MENUITEM_PROP_DISPOSITION           "disposition"
 
+/* ***************************************** */
+/* *********    Toggle Values      ********* */
+/* ***************************************** */
 /**
  * DBUSMENU_MENUITEM_TOGGLE_CHECK:
  *
@@ -200,6 +215,9 @@ G_BEGIN_DECLS
  */
 #define DBUSMENU_MENUITEM_TOGGLE_RADIO               "radio"
 
+/* ***************************************** */
+/* *********    Toggle States      ********* */
+/* ***************************************** */
 /**
  * DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED:
  *
@@ -222,6 +240,9 @@ G_BEGIN_DECLS
  */
 #define DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN       -1
 
+/* ***************************************** */
+/* *********    Icon specials      ********* */
+/* ***************************************** */
 /**
  * DBUSMENU_MENUITEM_ICON_NAME_BLANK:
  *
@@ -230,6 +251,9 @@ G_BEGIN_DECLS
  */
 #define DBUSMENU_MENUITEM_ICON_NAME_BLANK            "blank-icon"
 
+/* ***************************************** */
+/* *********  Shortcut Modifiers   ********* */
+/* ***************************************** */
 /**
  * DBUSMENU_MENUITEM_SHORTCUT_CONTROL:
  *
@@ -259,6 +283,9 @@ G_BEGIN_DECLS
  */
 #define DBUSMENU_MENUITEM_SHORTCUT_SUPER             "Super"
 
+/* ***************************************** */
+/* *********  Child Display Types  ********* */
+/* ***************************************** */
 /**
  * DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU:
  *
@@ -267,6 +294,44 @@ G_BEGIN_DECLS
  */
 #define DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU      "submenu"
 
+/* ***************************************** */
+/* ********* Menuitem Dispositions ********* */
+/* ***************************************** */
+/**
+ * DBUSMENU_MENUITEM_DISPOSITION_NORMAL:
+ *
+ * Used in #DBUSMENU_MENUITEM_PROP_DISPOSITION to have a menu
+ * item displayed in the normal manner.  Default value.
+ */
+#define DBUSMENU_MENUITEM_DISPOSITION_NORMAL         "normal"
+/**
+ * DBUSMENU_MENUITEM_DISPOSITION_INFORMATIVE:
+ *
+ * Used in #DBUSMENU_MENUITEM_PROP_DISPOSITION to have a menu
+ * item displayed in a way that conveys it's giving additional
+ * information to the user.
+ */
+#define DBUSMENU_MENUITEM_DISPOSITION_INFORMATIVE    "informative"
+/**
+ * DBUSMENU_MENUITEM_DISPOSITION_WARNING:
+ *
+ * Used in #DBUSMENU_MENUITEM_PROP_DISPOSITION to have a menu
+ * item displayed in a way that conveys it's giving a warning
+ * to the user.
+ */
+#define DBUSMENU_MENUITEM_DISPOSITION_WARNING        "warning"
+/**
+ * DBUSMENU_MENUITEM_DISPOSITION_ALERT:
+ *
+ * Used in #DBUSMENU_MENUITEM_PROP_DISPOSITION to have a menu
+ * item displayed in a way that conveys it's giving an alert
+ * to the user.
+ */
+#define DBUSMENU_MENUITEM_DISPOSITION_ALERT          "alert"
+
+/* ***************************************** */
+/* *********   Dbusmenu Events     ********* */
+/* ***************************************** */
 /**
  * DBUSMENU_MENUITEM_EVENT_ACTIVATED:
  *
diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c
index f81b3ed..c7057df 100644
--- a/libdbusmenu-glib/server.c
+++ b/libdbusmenu-glib/server.c
@@ -976,10 +976,10 @@ menuitem_property_idle (gpointer user_data)
 		gotsomething = TRUE;
 	} else {
 		GError * error = NULL;
-		megadata[1] = g_variant_parse(G_VARIANT_TYPE("a(ia(s))"), "[ ]", NULL, NULL, &error);
+		megadata[1] = g_variant_parse(G_VARIANT_TYPE("a(ias)"), "[ ]", NULL, NULL, &error);
 
 		if (error != NULL) {
-			g_warning("Unable to parse '[ ]' as a 'a(ia(s))': %s", error->message);
+			g_warning("Unable to parse '[ ]' as a 'a(ias)': %s", error->message);
 			g_error_free(error);
 		}
 	}