From 405a6969a0b2409d5f013e8d2845945b51146eb9 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 14 Nov 2015 22:07:18 +0100 Subject: Fork from Ubuntu's indicator-session project. --- src/CMakeLists.txt | 8 +-- src/backend-dbus/CMakeLists.txt | 5 +- src/backend-dbus/actions.c | 19 ++--- .../com.canonical.indicators.webcredentials.xml | 82 ---------------------- .../org.ayatana.indicators.webcredentials.xml | 82 ++++++++++++++++++++++ src/service.c | 12 ++-- 6 files changed, 100 insertions(+), 108 deletions(-) delete mode 100644 src/backend-dbus/com.canonical.indicators.webcredentials.xml create mode 100644 src/backend-dbus/org.ayatana.indicators.webcredentials.xml (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9528f7d..fd9afe5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,6 @@ add_subdirectory (backend-dbus) -add_library (libindicatorsessionservice STATIC +add_library (libayatanaindicatorsessionservice STATIC actions.c actions.h guest.c @@ -14,16 +14,16 @@ add_library (libindicatorsessionservice STATIC include_directories(${SERVICE_INCLUDE_DIRS}) link_directories(${SERVICE_LIBRARY_DIRS}) -set (SERVICE_EXEC "indicator-session-service") +set (SERVICE_EXEC "ayatana-indicator-session-service") set_property (SOURCE main.c APPEND PROPERTY COMPILE_DEFINITIONS GETTEXT_PACKAGE="${GETTEXT_PACKAGE}" GNOMELOCALEDIR="@CMAKE_INSTALL_FULL_LOCALEDIR@") add_executable (${SERVICE_EXEC} main.c) -target_link_libraries (${SERVICE_EXEC} libindicatorsessionservice backenddbus ${SERVICE_LIBRARIES} ${GCOV_LIBS}) +target_link_libraries (${SERVICE_EXEC} libayatanaindicatorsessionservice backenddbus ${SERVICE_LIBRARIES} ${GCOV_LIBS}) install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}) # common properties -set_property (TARGET libindicatorsessionservice ${SERVICE_EXEC} +set_property (TARGET libayatanaindicatorsessionservice ${SERVICE_EXEC} APPEND_STRING PROPERTY COMPILE_FLAGS " -g ${CC_WARNING_ARGS} ${GCOV_FLAGS}") diff --git a/src/backend-dbus/CMakeLists.txt b/src/backend-dbus/CMakeLists.txt index 1fb9d7c..a08851b 100644 --- a/src/backend-dbus/CMakeLists.txt +++ b/src/backend-dbus/CMakeLists.txt @@ -8,8 +8,8 @@ add_gdbus_codegen (BACKEND_GENERATED_SOURCES dbus-display-manager ${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.DisplayManager.Seat.xml) add_gdbus_codegen (BACKEND_GENERATED_SOURCES dbus-webcredentials - com.canonical.indicators - ${CMAKE_CURRENT_SOURCE_DIR}/com.canonical.indicators.webcredentials.xml) + org.ayatana.indicators + ${CMAKE_CURRENT_SOURCE_DIR}/org.ayatana.indicators.webcredentials.xml) add_gdbus_codegen (BACKEND_GENERATED_SOURCES dbus-accounts org.freedesktop @@ -58,4 +58,3 @@ set_source_files_properties (${SOURCES} include_directories (${CMAKE_CURRENT_BINARY_DIR} ${SERVICE_INCLUDE_DIRS}) add_library (backenddbus STATIC ${SOURCES} ${BACKEND_GENERATED_SOURCES}) - diff --git a/src/backend-dbus/actions.c b/src/backend-dbus/actions.c index 0fcdc08..a958731 100644 --- a/src/backend-dbus/actions.c +++ b/src/backend-dbus/actions.c @@ -19,7 +19,6 @@ #include #include -#include #include "dbus-end-session-dialog.h" #include "dbus-login1-manager.h" @@ -863,9 +862,7 @@ have_unity_control_center (void) static void my_settings (IndicatorSessionActions * self G_GNUC_UNUSED) { - if (g_getenv ("MIR_SOCKET") != NULL) - url_dispatch_send("settings:///system", NULL, NULL); - else if (have_unity_control_center ()) + if (have_unity_control_center ()) run_outside_app ("unity-control-center"); else run_outside_app ("gnome-control-center"); @@ -874,9 +871,7 @@ my_settings (IndicatorSessionActions * self G_GNUC_UNUSED) static void my_online_accounts (IndicatorSessionActions * self G_GNUC_UNUSED) { - if (g_getenv ("MIR_SOCKET") != NULL) - url_dispatch_send("settings:///system/online-accounts", NULL, NULL); - else if (have_unity_control_center ()) + if (have_unity_control_center ()) run_outside_app ("unity-control-center credentials"); else run_outside_app ("gnome-control-center credentials"); @@ -885,9 +880,7 @@ my_online_accounts (IndicatorSessionActions * self G_GNUC_UNUSED) static void my_about (IndicatorSessionActions * self G_GNUC_UNUSED) { - if (g_getenv ("MIR_SOCKET") != NULL) - url_dispatch_send("settings:///system/about", NULL, NULL); - else if (have_unity_control_center ()) + if (have_unity_control_center ()) run_outside_app ("unity-control-center info"); else run_outside_app ("gnome-control-center info"); @@ -1091,7 +1084,7 @@ indicator_session_actions_dbus_init (IndicatorSessionActionsDbus * self) G_CALLBACK(indicator_session_actions_notify_can_switch), self); p->lockdown_settings = s; - s = g_settings_new ("com.canonical.indicator.session"); + s = g_settings_new ("org.ayatana.indicator.session"); g_signal_connect_swapped (s, "changed::suppress-logout-restart-shutdown", G_CALLBACK(indicator_session_actions_notify_can_prompt), self); g_signal_connect_swapped (s, "changed::suppress-logout-restart-shutdown", @@ -1128,8 +1121,8 @@ indicator_session_actions_dbus_init (IndicatorSessionActionsDbus * self) webcredentials_proxy_new_for_bus (G_BUS_TYPE_SESSION, G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START, - "com.canonical.indicators.webcredentials", - "/com/canonical/indicators/webcredentials", + "org.ayatana.indicators.webcredentials", + "/org/ayatana/indicators/webcredentials", p->cancellable, on_webcredentials_proxy_ready, self); diff --git a/src/backend-dbus/com.canonical.indicators.webcredentials.xml b/src/backend-dbus/com.canonical.indicators.webcredentials.xml deleted file mode 100644 index d215081..0000000 --- a/src/backend-dbus/com.canonical.indicators.webcredentials.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/backend-dbus/org.ayatana.indicators.webcredentials.xml b/src/backend-dbus/org.ayatana.indicators.webcredentials.xml new file mode 100644 index 0000000..d7c46b0 --- /dev/null +++ b/src/backend-dbus/org.ayatana.indicators.webcredentials.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/service.c b/src/service.c index d9bd8e1..e1a55a3 100644 --- a/src/service.c +++ b/src/service.c @@ -24,8 +24,8 @@ #include "recoverable-problem.h" #include "service.h" -#define BUS_NAME "com.canonical.indicator.session" -#define BUS_PATH "/com/canonical/indicator/session" +#define BUS_NAME "org.ayatana.indicator.session" +#define BUS_PATH "/org/ayatana/indicator/session" #define ICON_DEFAULT "system-devices-panel" #define ICON_INFO "system-devices-panel-information" @@ -691,7 +691,7 @@ create_switch_section (IndicatorSessionService * self, int profile) GMenuItem *item; item = g_menu_item_new (_("Guest Session"), "indicator.switch-to-guest"); - g_menu_item_set_attribute (item, "x-canonical-type", "s", "indicator.guest-menu-item"); + g_menu_item_set_attribute (item, "x-ayatana-type", "s", "indicator.guest-menu-item"); g_menu_append_item (menu, item); g_object_unref (item); @@ -739,7 +739,7 @@ create_switch_section (IndicatorSessionService * self, int profile) item = g_menu_item_new (label, NULL); g_menu_item_set_action_and_target (item, "indicator.switch-to-user", "s", u->user_name); - g_menu_item_set_attribute (item, "x-canonical-type", "s", "indicator.user-menu-item"); + g_menu_item_set_attribute (item, "x-ayatana-type", "s", "indicator.user-menu-item"); if ((serialized_icon = serialize_icon_file (u->icon_file))) { @@ -848,7 +848,7 @@ create_menu (IndicatorSessionService * self, int profile) /* add submenu to the header */ header = g_menu_item_new (NULL, "indicator._header"); - g_menu_item_set_attribute (header, "x-canonical-type", "s", "com.canonical.indicator.root"); + g_menu_item_set_attribute (header, "x-ayatana-type", "s", "org.ayatana.indicator.root"); g_menu_item_set_submenu (header, G_MENU_MODEL (submenu)); g_object_unref (submenu); @@ -1234,7 +1234,7 @@ indicator_session_service_init (IndicatorSessionService * self) p = G_TYPE_INSTANCE_GET_PRIVATE (self, INDICATOR_TYPE_SESSION_SERVICE, IndicatorSessionServicePrivate); - p->indicator_settings = g_settings_new ("com.canonical.indicator.session"); + p->indicator_settings = g_settings_new ("org.ayatana.indicator.session"); p->keybinding_settings = g_settings_new ("org.gnome.settings-daemon.plugins.media-keys"); self->priv = p; -- cgit v1.2.3