ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Ted Gould (ted)
Related merge proposals:
  https://code.launchpad.net/~ted/dbusmenu/check-consistency/+merge/16974
  proposed by: Ted Gould (ted)
  review: Approve - Cody Russell (bratsche)
------------------------------------------------------------
revno: 47 [merge]
committer: Ted Gould <ted@xxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-01-07 11:00:51 -0600
message:
  Fix inconsistency between the names of the check items.  Now everything uses the #defines.
modified:
  libdbusmenu-glib/menuitem.h
  libdbusmenu-gtk/client.c
  tests/test-gtk-label.json


--
lp:dbusmenu
https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk

Your team ayatana-commits is subscribed to branch lp:dbusmenu.
To unsubscribe from this branch go to https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk/+edit-subscription.

=== modified file 'libdbusmenu-glib/menuitem.h'
--- libdbusmenu-glib/menuitem.h	2009-12-15 17:50:59 +0000
+++ libdbusmenu-glib/menuitem.h	2010-01-07 16:49:35 +0000
@@ -62,6 +62,10 @@
 #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:
 

=== modified file 'libdbusmenu-gtk/client.c'
--- libdbusmenu-gtk/client.c	2009-12-17 22:43:32 +0000
+++ libdbusmenu-gtk/client.c	2010-01-07 16:53:27 +0000
@@ -153,9 +153,9 @@
 	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 @@
 	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;
 		}
 	}

=== modified file 'tests/test-gtk-label.json'
--- tests/test-gtk-label.json	2009-12-17 21:43:00 +0000
+++ tests/test-gtk-label.json	2010-01-07 16:40:45 +0000
@@ -338,17 +338,17 @@
 		 },
 	 	{"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,