diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-05-16 11:01:13 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-05-16 11:01:13 +0200 |
| commit | 4daacc47dc32c15352bf080062779982f308aaae (patch) | |
| tree | ac138458079c4579a0be618ef37f45e36c8e0667 /src | |
| parent | 7956f5b71602bcfaa03bcc153722ff5de51bc430 (diff) | |
| download | ayatana-ido-4daacc47dc32c15352bf080062779982f308aaae.tar.gz ayatana-ido-4daacc47dc32c15352bf080062779982f308aaae.tar.bz2 ayatana-ido-4daacc47dc32c15352bf080062779982f308aaae.zip | |
One step back... Mimick Canonical's API. Use their namespace for item attributes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/idoalarmmenuitem.c | 4 | ||||
| -rw-r--r-- | src/idoappointmentmenuitem.c | 6 | ||||
| -rw-r--r-- | src/idolocationmenuitem.c | 4 | ||||
| -rw-r--r-- | src/idoplaybackmenuitem.c | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/idoalarmmenuitem.c b/src/idoalarmmenuitem.c index eeb7a4f..817d6a8 100644 --- a/src/idoalarmmenuitem.c +++ b/src/idoalarmmenuitem.c @@ -69,7 +69,7 @@ ido_alarm_menu_item_new_from_model (GMenuItem * menu_item, parameters[n++] = p; } - if (g_menu_item_get_attribute (menu_item, "x-ayatanaindicator-time-format", "s", &str)) + if (g_menu_item_get_attribute (menu_item, "x-canonical-time-format", "s", &str)) { GParameter p = { "format", G_VALUE_INIT }; g_value_init (&p.value, G_TYPE_STRING); @@ -77,7 +77,7 @@ ido_alarm_menu_item_new_from_model (GMenuItem * menu_item, parameters[n++] = p; } - if (g_menu_item_get_attribute (menu_item, "x-ayatanaindicator-time", "x", &i64)) + if (g_menu_item_get_attribute (menu_item, "x-canonical-time", "x", &i64)) { GParameter p = { "date-time", G_VALUE_INIT }; g_value_init (&p.value, G_TYPE_DATE_TIME); diff --git a/src/idoappointmentmenuitem.c b/src/idoappointmentmenuitem.c index 832f0d7..0d6a3d2 100644 --- a/src/idoappointmentmenuitem.c +++ b/src/idoappointmentmenuitem.c @@ -103,7 +103,7 @@ ido_appointment_menu_item_new_from_model (GMenuItem * menu_item, parameters[n++] = p; } - if (g_menu_item_get_attribute (menu_item, "x-ayatanaindicator-color", "s", &str)) + if (g_menu_item_get_attribute (menu_item, "x-canonical-color", "s", &str)) { GParameter p = { "icon", G_VALUE_INIT }; g_value_init (&p.value, G_TYPE_OBJECT); @@ -112,7 +112,7 @@ ido_appointment_menu_item_new_from_model (GMenuItem * menu_item, g_free (str); } - if (g_menu_item_get_attribute (menu_item, "x-ayatanaindicator-time-format", "s", &str)) + if (g_menu_item_get_attribute (menu_item, "x-canonical-time-format", "s", &str)) { GParameter p = { "format", G_VALUE_INIT }; g_value_init (&p.value, G_TYPE_STRING); @@ -120,7 +120,7 @@ ido_appointment_menu_item_new_from_model (GMenuItem * menu_item, parameters[n++] = p; } - if (g_menu_item_get_attribute (menu_item, "x-ayatanaindicator-time", "x", &i64)) + if (g_menu_item_get_attribute (menu_item, "x-canonical-time", "x", &i64)) { GParameter p = { "date-time", G_VALUE_INIT }; g_value_init (&p.value, G_TYPE_DATE_TIME); diff --git a/src/idolocationmenuitem.c b/src/idolocationmenuitem.c index 9b13345..335422a 100644 --- a/src/idolocationmenuitem.c +++ b/src/idolocationmenuitem.c @@ -314,7 +314,7 @@ ido_location_menu_item_new_from_model (GMenuItem * menu_item, parameters[n++] = p; } - if (g_menu_item_get_attribute (menu_item, "x-ayatanaindicator-timezone", "s", &str)) + if (g_menu_item_get_attribute (menu_item, "x-canonical-timezone", "s", &str)) { GParameter p = { "timezone", G_VALUE_INIT }; g_value_init (&p.value, G_TYPE_STRING); @@ -322,7 +322,7 @@ ido_location_menu_item_new_from_model (GMenuItem * menu_item, parameters[n++] = p; } - if (g_menu_item_get_attribute (menu_item, "x-ayatanaindicator-time-format", "s", &str)) + if (g_menu_item_get_attribute (menu_item, "x-canonical-time-format", "s", &str)) { GParameter p = { "format", G_VALUE_INIT }; g_value_init (&p.value, G_TYPE_STRING); diff --git a/src/idoplaybackmenuitem.c b/src/idoplaybackmenuitem.c index dfb3b7b..d45acd0 100644 --- a/src/idoplaybackmenuitem.c +++ b/src/idoplaybackmenuitem.c @@ -457,9 +457,9 @@ ido_playback_menu_item_new_from_model (GMenuItem *item, g_signal_connect (actions, "action-added", G_CALLBACK (ido_playback_menu_item_action_added), widget); g_signal_connect (actions, "action-removed", G_CALLBACK (ido_playback_menu_item_action_removed), widget); - g_menu_item_get_attribute (item, "x-ayatanaindicator-play-action", "s", &widget->button_actions[BUTTON_PLAYPAUSE]); - g_menu_item_get_attribute (item, "x-ayatanaindicator-next-action", "s", &widget->button_actions[BUTTON_NEXT]); - g_menu_item_get_attribute (item, "x-ayatanaindicator-previous-action", "s", &widget->button_actions[BUTTON_PREVIOUS]); + g_menu_item_get_attribute (item, "x-canonical-play-action", "s", &widget->button_actions[BUTTON_PLAYPAUSE]); + g_menu_item_get_attribute (item, "x-canonical-next-action", "s", &widget->button_actions[BUTTON_NEXT]); + g_menu_item_get_attribute (item, "x-canonical-previous-action", "s", &widget->button_actions[BUTTON_PREVIOUS]); play_action = widget->button_actions[BUTTON_PLAYPAUSE]; if (play_action && g_action_group_has_action (actions, play_action)) |