diff options
author | Ted Gould <ted@gould.cx> | 2009-12-22 14:35:29 -0600 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2009-12-22 14:35:29 -0600 |
commit | 580cf67b9db257743ab9e55d5a11e885d4a59640 (patch) | |
tree | 23495670b7b883211be21534fd87e24325a5b73e /src/status-service.c | |
parent | 11bc39c130e72f311c5923a5265f48d3fb08be50 (diff) | |
parent | 59b9b829bf71787d4a05ad73a34762da047fd6b6 (diff) | |
download | ayatana-indicator-session-580cf67b9db257743ab9e55d5a11e885d4a59640.tar.gz ayatana-indicator-session-580cf67b9db257743ab9e55d5a11e885d4a59640.tar.bz2 ayatana-indicator-session-580cf67b9db257743ab9e55d5a11e885d4a59640.zip |
Merging in changes needed for the new libdbusmenu.
Diffstat (limited to 'src/status-service.c')
-rw-r--r-- | src/status-service.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/status-service.c b/src/status-service.c index e3a9684..c07b875 100644 --- a/src/status-service.c +++ b/src/status-service.c @@ -107,7 +107,7 @@ status_update (void) { StatusProviderStatus i; for (i = STATUS_PROVIDER_STATUS_ONLINE; i < STATUS_PROVIDER_STATUS_LAST; i++) { if (status_menuitems[i] == NULL) continue; - dbusmenu_menuitem_property_set(status_menuitems[i], DBUSMENU_MENUITEM_PROP_SENSITIVE, "false"); + dbusmenu_menuitem_property_set_bool(status_menuitems[i], DBUSMENU_MENUITEM_PROP_SENSITIVE, FALSE); } } @@ -117,7 +117,7 @@ status_update (void) { StatusProviderStatus i; for (i = STATUS_PROVIDER_STATUS_ONLINE; i < STATUS_PROVIDER_STATUS_LAST; i++) { if (status_menuitems[i] == NULL) continue; - dbusmenu_menuitem_property_set(status_menuitems[i], DBUSMENU_MENUITEM_PROP_SENSITIVE, "true"); + dbusmenu_menuitem_property_set_bool(status_menuitems[i], DBUSMENU_MENUITEM_PROP_SENSITIVE, TRUE); } } } @@ -171,7 +171,7 @@ build_user_item (DbusmenuMenuitem * root) if (name[0] != '\0') { DbusmenuMenuitem * useritem = dbusmenu_menuitem_new(); dbusmenu_menuitem_property_set(useritem, DBUSMENU_MENUITEM_PROP_LABEL, name); - dbusmenu_menuitem_property_set(useritem, DBUSMENU_MENUITEM_PROP_SENSITIVE, "false"); + dbusmenu_menuitem_property_set_bool(useritem, DBUSMENU_MENUITEM_PROP_SENSITIVE, FALSE); dbusmenu_menuitem_child_append(root, useritem); } @@ -205,11 +205,10 @@ build_menu (gpointer data) status_menuitems[i] = dbusmenu_menuitem_new(); - dbusmenu_menuitem_property_set(status_menuitems[i], "type", DBUSMENU_CLIENT_TYPES_IMAGE); dbusmenu_menuitem_property_set(status_menuitems[i], DBUSMENU_MENUITEM_PROP_LABEL, _(status_strings[i])); dbusmenu_menuitem_property_set(status_menuitems[i], DBUSMENU_MENUITEM_PROP_ICON, status_icons[i]); if (global_status == STATUS_PROVIDER_STATUS_DISCONNECTED) { - dbusmenu_menuitem_property_set(status_menuitems[i], DBUSMENU_MENUITEM_PROP_SENSITIVE, "false"); + dbusmenu_menuitem_property_set_bool(status_menuitems[i], DBUSMENU_MENUITEM_PROP_SENSITIVE, FALSE); } g_signal_connect(G_OBJECT(status_menuitems[i]), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(status_menu_click), GINT_TO_POINTER(i)); |