From dd5905100adb747872156560c4437643195a263c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Jan 2010 10:40:45 -0600 Subject: Switching the test to 'checkmark' --- tests/test-gtk-label.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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, -- cgit v1.2.3 From c561e59d23bd1a06aa4a1b384c18833e05cbcffb Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Jan 2010 10:49:22 -0600 Subject: Using #defines for the type of box --- libdbusmenu-gtk/client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 27ac4dc..aba98f4 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; } } -- cgit v1.2.3 From b55ffff099bd5e808d6f8b25dc8dec902f9d3663 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Jan 2010 10:49:35 -0600 Subject: Adding #defines for the state of the box --- libdbusmenu-glib/menuitem.h | 4 ++++ 1 file changed, 4 insertions(+) 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: -- cgit v1.2.3 From 52eae1022d9bd79f24b2c85c63b40ce6d51c0389 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Jan 2010 10:53:27 -0600 Subject: Using the state defines for the check state. --- libdbusmenu-gtk/client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index aba98f4..4a8637a 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -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; } } -- cgit v1.2.3