use login1's terminology 'power off', 'reboot'

3 files changed, 22 insertions, 22 deletions

diff --git a/src/actions.c b/src/actions.c
index 788f418..babc285 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -103,8 +103,8 @@ indicator_session_actions_class_init (IndicatorSessionActionsClass * klass)
   klass->logout = NULL;
   klass->suspend = NULL;
   klass->hibernate = NULL;
-  klass->restart = NULL;
-  klass->shutdown = NULL;
+  klass->reboot = NULL;
+  klass->power_off = NULL;
   klass->switch_to_screensaver = NULL;
   klass->switch_to_greeter = NULL;
   klass->switch_to_guest = NULL;
@@ -246,11 +246,11 @@ indicator_session_actions_logout (IndicatorSessionActions * self)
 }
 
 void
-indicator_session_actions_shutdown (IndicatorSessionActions * self)
+indicator_session_actions_power_off (IndicatorSessionActions * self)
 {
   g_return_if_fail (INDICATOR_IS_SESSION_ACTIONS (self));
 
-  INDICATOR_SESSION_ACTIONS_GET_CLASS (self)->shutdown (self);
+  INDICATOR_SESSION_ACTIONS_GET_CLASS (self)->power_off (self);
 }
 
 void
@@ -270,11 +270,11 @@ indicator_session_actions_about (IndicatorSessionActions * self)
 }
 
 void
-indicator_session_actions_restart (IndicatorSessionActions * self)
+indicator_session_actions_reboot (IndicatorSessionActions * self)
 {
   g_return_if_fail (INDICATOR_IS_SESSION_ACTIONS (self));
 
-  INDICATOR_SESSION_ACTIONS_GET_CLASS (self)->restart (self);
+  INDICATOR_SESSION_ACTIONS_GET_CLASS (self)->reboot (self);
 }
 
 void
diff --git a/src/actions.h b/src/actions.h
index e0d0ec5..bba6045 100644
--- a/src/actions.h
+++ b/src/actions.h
@@ -71,8 +71,8 @@ struct _IndicatorSessionActionsClass
   void  (*suspend)                     (IndicatorSessionActions * self);
   void  (*hibernate)                   (IndicatorSessionActions * self);
   void  (*logout)                      (IndicatorSessionActions * self);
-  void  (*restart)                     (IndicatorSessionActions * self);
-  void  (*shutdown)                    (IndicatorSessionActions * self);
+  void  (*reboot)                      (IndicatorSessionActions * self);
+  void  (*power_off)                   (IndicatorSessionActions * self);
   void  (*help)                        (IndicatorSessionActions * self);
   void  (*about)                       (IndicatorSessionActions * self);
   void  (*settings)                    (IndicatorSessionActions * self);
@@ -111,8 +111,8 @@ void indicator_session_actions_lock                            (IndicatorSession
 void indicator_session_actions_suspend                         (IndicatorSessionActions * self);
 void indicator_session_actions_hibernate                       (IndicatorSessionActions * self);
 void indicator_session_actions_logout                          (IndicatorSessionActions * self);
-void indicator_session_actions_restart                         (IndicatorSessionActions * self);
-void indicator_session_actions_shutdown                        (IndicatorSessionActions * self);
+void indicator_session_actions_reboot                          (IndicatorSessionActions * self);
+void indicator_session_actions_power_off                       (IndicatorSessionActions * self);
 
 void indicator_session_actions_help                            (IndicatorSessionActions * self);
 void indicator_session_actions_about                           (IndicatorSessionActions * self);
diff --git a/src/service.c b/src/service.c
index ede3a9f..e41cca6 100644
--- a/src/service.c
+++ b/src/service.c
@@ -542,13 +542,13 @@ create_session_section (IndicatorSessionService * self)
   if (!g_settings_get_boolean (s, "suppress-restart-menuitem"))
     {
       const char * label = ellipsis ? _("Restart\342\200\246") : _("Restart");
-      g_menu_append (menu, label, "indicator.restart");
+      g_menu_append (menu, label, "indicator.reboot");
     }
 
   if (!g_settings_get_boolean (s, "suppress-shutdown-menuitem"))
     {
       const char * label = ellipsis ? _("Shutdown\342\200\246") : _("Shutdown");
-      g_menu_append (menu, label, "indicator.shutdown");
+      g_menu_append (menu, label, "indicator.power-off");
     }
 
   return G_MENU_MODEL (menu);
@@ -661,19 +661,19 @@ on_hibernate_activated (GSimpleAction * a      G_GNUC_UNUSED,
 }
 
 static void
-on_restart_activated (GSimpleAction * action G_GNUC_UNUSED,
-                      GVariant      * param  G_GNUC_UNUSED,
-                      gpointer        gself)
+on_reboot_activated (GSimpleAction * action G_GNUC_UNUSED,
+                     GVariant      * param  G_GNUC_UNUSED,
+                     gpointer        gself)
 {
-  indicator_session_actions_restart (get_backend_actions(gself));
+  indicator_session_actions_reboot (get_backend_actions(gself));
 }
 
 static void
-on_shutdown_activated (GSimpleAction * a     G_GNUC_UNUSED,
-                       GVariant      * param G_GNUC_UNUSED,
-                       gpointer        gself)
+on_power_off_activated (GSimpleAction * a     G_GNUC_UNUSED,
+                        GVariant      * param G_GNUC_UNUSED,
+                        gpointer        gself)
 {
-  indicator_session_actions_shutdown (get_backend_actions(gself));
+  indicator_session_actions_power_off (get_backend_actions(gself));
 }
 
 static void
@@ -724,8 +724,8 @@ init_gactions (IndicatorSessionService * self)
     { "logout",                 on_logout_activated       },
     { "suspend",                on_suspend_activated      },
     { "hibernate",              on_hibernate_activated    },
-    { "restart",                on_restart_activated      },
-    { "shutdown",               on_shutdown_activated     },
+    { "reboot",                 on_reboot_activated       },
+    { "power-off",              on_power_off_activated    },
     { "switch-to-screensaver",  on_screensaver_activated  },
     { "switch-to-greeter",      on_greeter_activated      }
   };