From c08b3c637c60fb9469715995bd3c276f0a4dd081 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 30 May 2017 09:33:18 +0200 Subject: Rename PROMPT_WITH_UNITY to PROMPT_WITH_AYATANA, meaning the org.ayatana.Desktop DBus session bus. --- src/backend-dbus/actions.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/backend-dbus') diff --git a/src/backend-dbus/actions.c b/src/backend-dbus/actions.c index 96af7b3..a48d04f 100644 --- a/src/backend-dbus/actions.c +++ b/src/backend-dbus/actions.c @@ -89,7 +89,7 @@ typedef enum { PROMPT_NONE, PROMPT_WITH_ZENITY, - PROMPT_WITH_UNITY + PROMPT_WITH_AYATANA } prompt_status_t; @@ -107,7 +107,7 @@ get_prompt_status (IndicatorSessionActionsDbus * self) GDBusProxy * proxy = G_DBUS_PROXY (p->end_session_dialog); char * name = g_dbus_proxy_get_name_owner (proxy); if (name != NULL) - prompt = PROMPT_WITH_UNITY; + prompt = PROMPT_WITH_AYATANA; g_free (name); } @@ -394,7 +394,7 @@ my_can_reboot (IndicatorSessionActions * actions) /* Shutdown and Restart are the same dialog prompt in Unity, so disable the redundant 'Restart' menuitem in that mode */ if (!g_settings_get_boolean (p->indicator_settings, "suppress-shutdown-menuitem")) - if (get_prompt_status(self) == PROMPT_WITH_UNITY) + if (get_prompt_status(self) == PROMPT_WITH_AYATANA) return FALSE; return TRUE; @@ -722,7 +722,7 @@ my_logout (IndicatorSessionActions * actions) switch (get_prompt_status (self)) { - case PROMPT_WITH_UNITY: + case PROMPT_WITH_AYATANA: show_desktop_end_session_dialog (self, END_SESSION_TYPE_LOGOUT); break; @@ -759,7 +759,7 @@ my_reboot (IndicatorSessionActions * actions) switch (get_prompt_status (self)) { - case PROMPT_WITH_UNITY: + case PROMPT_WITH_AYATANA: show_desktop_end_session_dialog (self, END_SESSION_TYPE_REBOOT); break; @@ -786,7 +786,7 @@ my_power_off (IndicatorSessionActions * actions) switch (get_prompt_status (self)) { - case PROMPT_WITH_UNITY: + case PROMPT_WITH_AYATANA: /* NB: TYPE_REBOOT instead of TYPE_SHUTDOWN because the latter adds lock & logout options in Unity... */ show_desktop_end_session_dialog (self, END_SESSION_TYPE_REBOOT); -- cgit v1.2.3