diff options
Diffstat (limited to 'service')
| -rw-r--r-- | service/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | service/service.c | 42 |
2 files changed, 25 insertions, 25 deletions
diff --git a/service/CMakeLists.txt b/service/CMakeLists.txt index 7e336d5..5bf7fd6 100644 --- a/service/CMakeLists.txt +++ b/service/CMakeLists.txt @@ -14,9 +14,9 @@ service-iface.c add_gdbus_codegen( OUTFILES SERVICE_GENERATED_SOURCES NAME service-iface -PREFIX com.canonical.Unity.Greeter.Broadcast. +PREFIX org.ayatana.Desktop.Greeter.Broadcast. NAMESPACE ServiceIface -SERVICE_XML ${CMAKE_CURRENT_SOURCE_DIR}/../data/com.canonical.Unity.Greeter.Broadcast.xml +SERVICE_XML ${CMAKE_CURRENT_SOURCE_DIR}/../data/org.ayatana.Desktop.Greeter.Broadcast.xml ) add_library(service-generated STATIC ${SERVICE_GENERATED_SOURCES}) @@ -37,7 +37,7 @@ include_directories( add_executable(service-exec service.c) -set_target_properties(service-exec PROPERTIES OUTPUT_NAME "unity-greeter-session-broadcast-service") +set_target_properties(service-exec PROPERTIES OUTPUT_NAME "ayatana-greeter-session-broadcast-service") target_link_libraries(service-exec service-generated @@ -50,5 +50,5 @@ ${GIO2_LIBRARIES} install( TARGETS service-exec - RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/unity-greeter-session-broadcast" + RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/ayatana-greeter-session-broadcast" ) diff --git a/service/service.c b/service/service.c index 88f0ffa..7d2751c 100644 --- a/service/service.c +++ b/service/service.c @@ -20,68 +20,68 @@ #include "service-iface.h" static gboolean -on_handle_request_url_start (ServiceIfaceComCanonicalUnityGreeterBroadcast *object, +on_handle_request_url_start (ServiceIfaceOrgAyatanaDesktopGreeterBroadcast *object, GDBusMethodInvocation *invocation, const gchar *arg_username, const gchar *arg_url) { /* Simply pass the request on */ - service_iface_com_canonical_unity_greeter_broadcast_emit_start_url (object, + service_iface_org_ayatana_desktop_greeter_broadcast_emit_start_url (object, arg_username, arg_url); - service_iface_com_canonical_unity_greeter_broadcast_complete_request_url_start (object, + service_iface_org_ayatana_desktop_greeter_broadcast_complete_request_url_start (object, invocation); return TRUE; } static gboolean -on_handle_request_home_shown (ServiceIfaceComCanonicalUnityGreeterBroadcast *object, +on_handle_request_home_shown (ServiceIfaceOrgAyatanaDesktopGreeterBroadcast *object, GDBusMethodInvocation *invocation, const gchar *arg_username) { /* Simply pass the request on */ - service_iface_com_canonical_unity_greeter_broadcast_emit_show_home (object, + service_iface_org_ayatana_desktop_greeter_broadcast_emit_show_home (object, arg_username); - service_iface_com_canonical_unity_greeter_broadcast_complete_request_home_shown (object, + service_iface_org_ayatana_desktop_greeter_broadcast_complete_request_home_shown (object, invocation); return TRUE; } static gboolean -on_handle_request_sound_play_pause (ServiceIfaceComCanonicalUnityGreeterBroadcast *object, +on_handle_request_sound_play_pause (ServiceIfaceOrgAyatanaDesktopGreeterBroadcast *object, GDBusMethodInvocation *invocation, const gchar *arg_username) { /* Simply pass the request on */ - service_iface_com_canonical_unity_greeter_broadcast_emit_sound_play_pause (object, + service_iface_org_ayatana_desktop_greeter_broadcast_emit_sound_play_pause (object, arg_username); - service_iface_com_canonical_unity_greeter_broadcast_complete_request_sound_play_pause (object, + service_iface_org_ayatana_desktop_greeter_broadcast_complete_request_sound_play_pause (object, invocation); return TRUE; } static gboolean -on_handle_request_sound_next (ServiceIfaceComCanonicalUnityGreeterBroadcast *object, +on_handle_request_sound_next (ServiceIfaceOrgAyatanaDesktopGreeterBroadcast *object, GDBusMethodInvocation *invocation, const gchar *arg_username) { /* Simply pass the request on */ - service_iface_com_canonical_unity_greeter_broadcast_emit_sound_next (object, + service_iface_org_ayatana_desktop_greeter_broadcast_emit_sound_next (object, arg_username); - service_iface_com_canonical_unity_greeter_broadcast_complete_request_sound_next (object, + service_iface_org_ayatana_desktop_greeter_broadcast_complete_request_sound_next (object, invocation); return TRUE; } static gboolean -on_handle_request_sound_prev (ServiceIfaceComCanonicalUnityGreeterBroadcast *object, +on_handle_request_sound_prev (ServiceIfaceOrgAyatanaDesktopGreeterBroadcast *object, GDBusMethodInvocation *invocation, const gchar *arg_username) { /* Simply pass the request on */ - service_iface_com_canonical_unity_greeter_broadcast_emit_sound_prev (object, + service_iface_org_ayatana_desktop_greeter_broadcast_emit_sound_prev (object, arg_username); - service_iface_com_canonical_unity_greeter_broadcast_complete_request_sound_prev (object, + service_iface_org_ayatana_desktop_greeter_broadcast_complete_request_sound_prev (object, invocation); return TRUE; } @@ -92,13 +92,13 @@ on_bus_acquired (GDBusConnection *connection, gpointer user_data) { GError *error = NULL; - ServiceIfaceComCanonicalUnityGreeterBroadcast *interface; + ServiceIfaceOrgAyatanaDesktopGreeterBroadcast *interface; - interface = (ServiceIfaceComCanonicalUnityGreeterBroadcast *)user_data; + interface = (ServiceIfaceOrgAyatanaDesktopGreeterBroadcast *)user_data; if (!g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (interface), connection, - "/com/canonical/Unity/Greeter/Broadcast", + "/org/ayatana/Desktop/Greeter/Broadcast", &error)) { g_error ("Unable to export interface: %s, exiting", error->message); @@ -118,9 +118,9 @@ main (int argc, char * argv[]) { guint owner_id; GMainLoop *loop; - ServiceIfaceComCanonicalUnityGreeterBroadcast *interface; + ServiceIfaceOrgAyatanaDesktopGreeterBroadcast *interface; - interface = service_iface_com_canonical_unity_greeter_broadcast_skeleton_new (); + interface = service_iface_org_ayatana_desktop_greeter_broadcast_skeleton_new (); /* Application Launching */ g_signal_connect (interface, @@ -147,7 +147,7 @@ main (int argc, char * argv[]) NULL); owner_id = g_bus_own_name (G_BUS_TYPE_SYSTEM, - "com.canonical.Unity.Greeter.Broadcast", + "org.ayatana.Desktop.Greeter.Broadcast", G_BUS_NAME_OWNER_FLAGS_NONE, on_bus_acquired, NULL, |