From 5b2dcab7aad9e2920bedc3ef28c34c661d70ce71 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 30 Nov 2009 09:58:53 -0600 Subject: Changing file names, and some fallouts from that. --- src/application-service-appstore.c | 14 +++++++------- src/application-service-watcher.c | 2 +- src/application-service-watcher.h | 2 +- src/application-service.c | 4 ++-- src/indicator-application.c | 12 ++++++------ .../application-indicator-enum-types.c.in | 2 +- src/libapplicationindicator/application-indicator.c | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index bdf8ffb..4e3beda 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -3,15 +3,15 @@ #endif #include -#include "custom-service-appstore.h" -#include "custom-service-marshal.h" +#include "application-service-appstore.h" +#include "application-service-marshal.h" #include "dbus-properties-client.h" #include "dbus-shared.h" /* DBus Prototypes */ -static gboolean _custom_service_server_get_applications (CustomServiceAppstore * appstore, GArray ** apps); +static gboolean _application_service_server_get_applications (CustomServiceAppstore * appstore, GArray ** apps); -#include "custom-service-server.h" +#include "application-service-server.h" #define NOTIFICATION_ITEM_PROP_ID "Id" #define NOTIFICATION_ITEM_PROP_CATEGORY "Category" @@ -71,7 +71,7 @@ custom_service_appstore_class_init (CustomServiceAppstoreClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (CustomServiceAppstore, application_added), NULL, NULL, - _custom_service_marshal_VOID__STRING_INT_STRING_STRING, + _application_service_marshal_VOID__STRING_INT_STRING_STRING, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_NONE); signals[APPLICATION_REMOVED] = g_signal_new ("application-removed", G_TYPE_FROM_CLASS(klass), @@ -83,7 +83,7 @@ custom_service_appstore_class_init (CustomServiceAppstoreClass *klass) dbus_g_object_type_install_info(CUSTOM_SERVICE_APPSTORE_TYPE, - &dbus_glib__custom_service_server_object_info); + &dbus_glib__application_service_server_object_info); return; } @@ -292,7 +292,7 @@ custom_service_appstore_application_remove (CustomServiceAppstore * appstore, co /* DBus Interface */ static gboolean -_custom_service_server_get_applications (CustomServiceAppstore * appstore, GArray ** apps) +_application_service_server_get_applications (CustomServiceAppstore * appstore, GArray ** apps) { return FALSE; diff --git a/src/application-service-watcher.c b/src/application-service-watcher.c index 7cc15ee..a5e1817 100644 --- a/src/application-service-watcher.c +++ b/src/application-service-watcher.c @@ -4,7 +4,7 @@ #include #include -#include "custom-service-watcher.h" +#include "application-service-watcher.h" #include "dbus-shared.h" static gboolean _notification_watcher_server_register_service (CustomServiceWatcher * appwatcher, const gchar * service, DBusGMethodInvocation * method); diff --git a/src/application-service-watcher.h b/src/application-service-watcher.h index 1a037be..c431a59 100644 --- a/src/application-service-watcher.h +++ b/src/application-service-watcher.h @@ -4,7 +4,7 @@ #include #include -#include "custom-service-appstore.h" +#include "application-service-appstore.h" G_BEGIN_DECLS diff --git a/src/application-service.c b/src/application-service.c index 5bd9b96..6d5f44d 100644 --- a/src/application-service.c +++ b/src/application-service.c @@ -1,8 +1,8 @@ #include "libindicator/indicator-service.h" #include "notification-item-client.h" -#include "custom-service-appstore.h" -#include "custom-service-watcher.h" +#include "application-service-appstore.h" +#include "application-service-watcher.h" #include "dbus-shared.h" /* The base main loop */ diff --git a/src/indicator-application.c b/src/indicator-application.c index da89c30..e52eaa0 100644 --- a/src/indicator-application.c +++ b/src/indicator-application.c @@ -15,8 +15,8 @@ /* Local Stuff */ #include "dbus-shared.h" -#include "custom-service-client.h" -#include "custom-service-marshal.h" +#include "application-service-client.h" +#include "application-service-marshal.h" #define INDICATOR_CUSTOM_TYPE (indicator_custom_get_type ()) #define INDICATOR_CUSTOM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_CUSTOM_TYPE, IndicatorCustom)) @@ -88,7 +88,7 @@ indicator_custom_class_init (IndicatorCustomClass *klass) io_class->get_entries = get_entries; - dbus_g_object_register_marshaller(_custom_service_marshal_VOID__STRING_INT_STRING_STRING, + dbus_g_object_register_marshaller(_application_service_marshal_VOID__STRING_INT_STRING_STRING, G_TYPE_NONE, G_TYPE_STRING, G_TYPE_INT, @@ -209,9 +209,9 @@ connected (IndicatorServiceManager * sm, gboolean connected, IndicatorCustom * c /* Query it for existing applications */ g_debug("Request current apps"); - org_ayatana_indicator_custom_service_get_applications_async(priv->service_proxy, - get_applications, - custom); + org_ayatana_indicator_application_service_get_applications_async(priv->service_proxy, + get_applications, + custom); return; } diff --git a/src/libapplicationindicator/application-indicator-enum-types.c.in b/src/libapplicationindicator/application-indicator-enum-types.c.in index 51512f6..39d44ab 100644 --- a/src/libapplicationindicator/application-indicator-enum-types.c.in +++ b/src/libapplicationindicator/application-indicator-enum-types.c.in @@ -1,5 +1,5 @@ /*** BEGIN file-header ***/ -#include "libcustomindicator/custom-indicator-enum-types.h" +#include "libapplicationindicator/application-indicator-enum-types.h" /*** END file-header ***/ diff --git a/src/libapplicationindicator/application-indicator.c b/src/libapplicationindicator/application-indicator.c index 8d6633a..979791d 100644 --- a/src/libapplicationindicator/application-indicator.c +++ b/src/libapplicationindicator/application-indicator.c @@ -5,8 +5,8 @@ #include #include -#include "libcustomindicator/custom-indicator.h" -#include "libcustomindicator/custom-indicator-enum-types.h" +#include "libapplicationindicator/application-indicator.h" +#include "libapplicationindicator/application-indicator-enum-types.h" #include "notification-item-server.h" #include "notification-watcher-client.h" @@ -618,7 +618,7 @@ check_connect (CustomIndicator * self) return; } - org_ayatana_indicator_custom_NotificationWatcher_register_service_async(priv->watcher_proxy, "/need/a/path", register_service_cb, self); + org_ayatana_indicator_application_NotificationWatcher_register_service_async(priv->watcher_proxy, "/need/a/path", register_service_cb, self); return; } -- cgit v1.2.3