diff options
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | libdbusmenu-glib/menuitem.h | 4 | ||||
| -rw-r--r-- | libdbusmenu-gtk/client.c | 8 | ||||
| -rw-r--r-- | tests/test-gtk-label.json | 6 |
4 files changed, 19 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index e58c6d1..de8aba4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libdbusmenu (0.2.0~dev-0ubuntu1~ppa9) UNRELEASED; urgency=low + + * Upstream update: + * Fixing the consistency between the #defines and what + was used in the code. + + -- Ted Gould <ted@ubuntu.com> Thu, 07 Jan 2010 11:01:21 -0600 + libdbusmenu (0.2.0~dev-0ubuntu1~ppa8) karmic; urgency=low * Upstream update: diff --git a/libdbusmenu-glib/menuitem.h b/libdbusmenu-glib/menuitem.h index fc9e410..aaafe17 100644 --- a/libdbusmenu-glib/menuitem.h +++ b/libdbusmenu-glib/menuitem.h @@ -62,6 +62,10 @@ G_BEGIN_DECLS #define DBUSMENU_MENUITEM_TOGGLE_CHECK "checkmark" #define DBUSMENU_MENUITEM_TOGGLE_RADIO "radio" +#define DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED "unchecked" +#define DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED "checked" +#define DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN "indeterminate" + /** DbusmenuMenuitem: diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 27ac4dc..4a8637a 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -153,9 +153,9 @@ process_toggle_type (DbusmenuMenuitem * mi, GtkMenuItem * gmi, const GValue * va if (value != NULL && G_VALUE_TYPE(value) == G_TYPE_STRING) { const gchar * strval = g_value_get_string(value); - if (!g_strcmp0(strval, "checkbox")) { + if (!g_strcmp0(strval, DBUSMENU_MENUITEM_TOGGLE_CHECK)) { type = GENERICMENUITEM_CHECK_TYPE_CHECKBOX; - } else if (!g_strcmp0(strval, "radio")) { + } else if (!g_strcmp0(strval, DBUSMENU_MENUITEM_TOGGLE_RADIO)) { type = GENERICMENUITEM_CHECK_TYPE_RADIO; } } @@ -176,9 +176,9 @@ process_toggle_checked (DbusmenuMenuitem * mi, GtkMenuItem * gmi, const GValue * if (value != NULL && G_VALUE_TYPE(value) == G_TYPE_STRING) { const gchar * strval = g_value_get_string(value); - if (!g_strcmp0(strval, "checked")) { + if (!g_strcmp0(strval, DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED)) { state = GENERICMENUITEM_STATE_CHECKED; - } else if (!g_strcmp0(strval, "indeterminate")) { + } else if (!g_strcmp0(strval, DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN)) { state = GENERICMENUITEM_STATE_INDETERMINATE; } } diff --git a/tests/test-gtk-label.json b/tests/test-gtk-label.json index 464dc2d..4bd666a 100644 --- a/tests/test-gtk-label.json +++ b/tests/test-gtk-label.json @@ -338,17 +338,17 @@ QmCC", }, {"id": 33, "label": "Check (empty)", - "toggle-type": "checkbox", + "toggle-type": "checkmark", "toggle-checked": "unchecked" }, {"id": 34, "label": "Check (checked)", - "toggle-type": "checkbox", + "toggle-type": "checkmark", "toggle-checked": "checked" }, {"id": 35, "label": "Check (?????)", - "toggle-type": "checkbox", + "toggle-type": "checkmark", "toggle-checked": "indeterminate" }, {"id": 36, |