diff options
Diffstat (limited to 'debian/patches/fix-defaults-in-client.patch')
| -rw-r--r-- | debian/patches/fix-defaults-in-client.patch | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/debian/patches/fix-defaults-in-client.patch b/debian/patches/fix-defaults-in-client.patch index a299b32..8e422db 100644 --- a/debian/patches/fix-defaults-in-client.patch +++ b/debian/patches/fix-defaults-in-client.patch @@ -1,21 +1,18 @@ -=== modified file 'libdbusmenu-glib/menuitem.c' -Index: libdbusmenu-0.3.99/libdbusmenu-glib/menuitem.c -=================================================================== ---- libdbusmenu-0.3.99.orig/libdbusmenu-glib/menuitem.c 2011-02-25 03:30:16 +0000 -+++ libdbusmenu-0.3.99/libdbusmenu-glib/menuitem.c 2011-02-28 22:51:34 +0000 -@@ -1150,9 +1150,9 @@ +--- a/libdbusmenu-glib/menuitem.c ++++ b/libdbusmenu-glib/menuitem.c +@@ -1150,9 +1150,9 @@ dbusmenu_menuitem_property_set_variant ( DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); GVariant * default_value = NULL; -+ const gchar * type = menuitem_get_type(mi); -+ - if (value != NULL) { +- if (value != NULL) { - const gchar * type = menuitem_get_type(mi); -- ++ const gchar * type = menuitem_get_type(mi); + ++ if (value != NULL) { /* Check the expected type to see if we want to have a warning */ GVariantType * default_type = dbusmenu_defaults_default_get_type(priv->defaults, type, property); if (default_type != NULL) { -@@ -1163,22 +1163,23 @@ +@@ -1163,22 +1163,23 @@ dbusmenu_menuitem_property_set_variant ( g_warning("Setting menuitem property '%s' with value of type '%s' when expecting '%s'", property, g_variant_get_type_string(value), g_variant_type_peek_string(default_type)); } } @@ -51,7 +48,7 @@ Index: libdbusmenu-0.3.99/libdbusmenu-glib/menuitem.c gboolean replaced = FALSE; gpointer currentval = g_hash_table_lookup(priv->properties, property); -@@ -1371,9 +1372,7 @@ +@@ -1371,9 +1372,7 @@ dbusmenu_menuitem_property_remove (Dbusm g_return_if_fail(DBUSMENU_IS_MENUITEM(mi)); g_return_if_fail(property != NULL); @@ -62,4 +59,19 @@ Index: libdbusmenu-0.3.99/libdbusmenu-glib/menuitem.c return; } - +@@ -1753,13 +1752,8 @@ dbusmenu_menuitem_property_is_default (D + return FALSE; + } + +- currentval = dbusmenu_defaults_default_get(priv->defaults, menuitem_get_type(mi), property); +- if (currentval != NULL) { +- return TRUE; +- } +- +- g_warn_if_reached(); +- return FALSE; ++ /* If we haven't stored it locally, then it's the default */ ++ return TRUE; + } + + /* Check to see if this menu item has been sent into the bus yet or |