Replace x-canonical attributes

4 files changed, 28 insertions, 28 deletions

diff --git a/src/idoalarmmenuitem.c b/src/idoalarmmenuitem.c
index c9cfcd9..25c3f33 100644
--- a/src/idoalarmmenuitem.c
+++ b/src/idoalarmmenuitem.c
@@ -5,16 +5,16 @@
  *   Charles Kerr <charles.kerr@canonical.com>
  *   Ted Gould <ted@canonical.com>
  *
- * This program is free software: you can redistribute it and/or modify it 
- * under the terms of the GNU General Public License version 3, as published 
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
  * by the Free Software Foundation.
  *
- * This program is distributed in the hope that it will be useful, but 
- * WITHOUT ANY WARRANTY; without even the implied warranties of 
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
  * PURPOSE.  See the GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along 
+ * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -72,7 +72,7 @@ ido_alarm_menu_item_new_from_model (GMenuItem    * menu_item,
       n++;
     }
 
-  if (g_menu_item_get_attribute (menu_item, "x-canonical-time-format", "s", &str))
+  if (g_menu_item_get_attribute (menu_item, "x-ayatana-time-format", "s", &str))
     {
       names[n] = "format";
       g_value_init (&values[n], G_TYPE_STRING);
@@ -80,7 +80,7 @@ ido_alarm_menu_item_new_from_model (GMenuItem    * menu_item,
       n++;
     }
 
-  if (g_menu_item_get_attribute (menu_item, "x-canonical-time", "x", &i64))
+  if (g_menu_item_get_attribute (menu_item, "x-ayatana-time", "x", &i64))
     {
       names[n] = "date-time";
       g_value_init (&values[n], G_TYPE_DATE_TIME);
diff --git a/src/idoappointmentmenuitem.c b/src/idoappointmentmenuitem.c
index 1b537ed..9dc26a1 100644
--- a/src/idoappointmentmenuitem.c
+++ b/src/idoappointmentmenuitem.c
@@ -5,16 +5,16 @@
  *   Charles Kerr <charles.kerr@canonical.com>
  *   Ted Gould <ted@canonical.com>
  *
- * This program is free software: you can redistribute it and/or modify it 
- * under the terms of the GNU General Public License version 3, as published 
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
  * by the Free Software Foundation.
  *
- * This program is distributed in the hope that it will be useful, but 
- * WITHOUT ANY WARRANTY; without even the implied warranties of 
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
  * PURPOSE.  See the GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along 
+ * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -106,7 +106,7 @@ ido_appointment_menu_item_new_from_model (GMenuItem    * menu_item,
       n++;
     }
 
-  if (g_menu_item_get_attribute (menu_item, "x-canonical-color", "s", &str))
+  if (g_menu_item_get_attribute (menu_item, "x-ayatana-color", "s", &str))
     {
       names[n] = "icon";
       g_value_init (&values[n], G_TYPE_OBJECT);
@@ -115,7 +115,7 @@ ido_appointment_menu_item_new_from_model (GMenuItem    * menu_item,
       n++;
     }
 
-  if (g_menu_item_get_attribute (menu_item, "x-canonical-time-format", "s", &str))
+  if (g_menu_item_get_attribute (menu_item, "x-ayatana-time-format", "s", &str))
     {
       names[n] = "format";
       g_value_init (&values[n], G_TYPE_STRING);
@@ -123,7 +123,7 @@ ido_appointment_menu_item_new_from_model (GMenuItem    * menu_item,
       n++;
     }
 
-  if (g_menu_item_get_attribute (menu_item, "x-canonical-time", "x", &i64))
+  if (g_menu_item_get_attribute (menu_item, "x-ayatana-time", "x", &i64))
     {
       names[n] = "date-time";
       g_value_init (&values[n], G_TYPE_DATE_TIME);
diff --git a/src/idolocationmenuitem.c b/src/idolocationmenuitem.c
index 4361e50..983126b 100644
--- a/src/idolocationmenuitem.c
+++ b/src/idolocationmenuitem.c
@@ -4,16 +4,16 @@
  * Authors:
  *   Charles Kerr <charles.kerr@canonical.com>
  *
- * This program is free software: you can redistribute it and/or modify it 
- * under the terms of the GNU General Public License version 3, as published 
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
  * by the Free Software Foundation.
  *
- * This program is distributed in the hope that it will be useful, but 
- * WITHOUT ANY WARRANTY; without even the implied warranties of 
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
  * PURPOSE.  See the GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along 
+ * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -313,7 +313,7 @@ ido_location_menu_item_new_from_model (GMenuItem    * menu_item,
       n++;
     }
 
-  if (g_menu_item_get_attribute (menu_item, "x-canonical-timezone", "s", &str))
+  if (g_menu_item_get_attribute (menu_item, "x-ayatana-timezone", "s", &str))
     {
       names[n] = "timezone";
       g_value_init (&values[n], G_TYPE_STRING);
@@ -321,7 +321,7 @@ ido_location_menu_item_new_from_model (GMenuItem    * menu_item,
       n++;
     }
 
-  if (g_menu_item_get_attribute (menu_item, "x-canonical-time-format", "s", &str))
+  if (g_menu_item_get_attribute (menu_item, "x-ayatana-time-format", "s", &str))
     {
       names[n] = "format";
       g_value_init (&values[n], G_TYPE_STRING);
diff --git a/src/idoplaybackmenuitem.c b/src/idoplaybackmenuitem.c
index 06ac8af..4c90442 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-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]);
+  g_menu_item_get_attribute (item, "x-ayatana-play-action", "s", &widget->button_actions[BUTTON_PLAYPAUSE]);
+  g_menu_item_get_attribute (item, "x-ayatana-next-action", "s", &widget->button_actions[BUTTON_NEXT]);
+  g_menu_item_get_attribute (item, "x-ayatana-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))