diff options
| author | Ted Gould <ted@gould.cx> | 2011-02-21 21:09:31 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-02-21 21:09:31 -0600 |
| commit | 507b6ec86e0e6c4eacd41863f8900a90c023f915 (patch) | |
| tree | d36546ea58f22d63d762740f5ec530c6483e0470 | |
| parent | 494adf9835825c711fd9f05b44143d6331bcab63 (diff) | |
| download | libdbusmenu-507b6ec86e0e6c4eacd41863f8900a90c023f915.tar.gz libdbusmenu-507b6ec86e0e6c4eacd41863f8900a90c023f915.tar.bz2 libdbusmenu-507b6ec86e0e6c4eacd41863f8900a90c023f915.zip | |
Allow for signaling the default value if it makes sense
| -rw-r--r-- | libdbusmenu-glib/menuitem.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index c744435..d25e80d 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -1022,10 +1022,11 @@ dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * pro DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); const gchar * type = menuitem_get_type(mi); + GVariant * default_value = NULL; if (type != NULL) { /* Check the defaults database to see if we have a default for this property. */ - GVariant * default_value = dbusmenu_defaults_default_get(priv->defaults, type, property); + default_value = dbusmenu_defaults_default_get(priv->defaults, type, property); if (default_value != NULL) { /* If we have a default we might also have an expected type */ GVariantType * default_type = dbusmenu_defaults_default_get_type(priv->defaults, type, property); @@ -1073,7 +1074,15 @@ dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * pro table. But the fact that there was a value is the imporant part. */ if (currentval == NULL || replaced) { - g_signal_emit(G_OBJECT(mi), signals[PROPERTY_CHANGED], 0, property, value, TRUE); + GVariant * signalval = value; + + if (signalval == NULL) { + /* Might also be NULL, but if it is we're definitely + clearing this thing. */ + signalval = default_value; + } + + g_signal_emit(G_OBJECT(mi), signals[PROPERTY_CHANGED], 0, property, signalval, TRUE); } return TRUE; |