diff options
| author | Ted Gould <ted@canonical.com> | 2009-11-04 08:14:17 -0600 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-11-04 08:14:17 -0600 |
| commit | 61e1ae1b8072ae134487dc66537daefbef477199 (patch) | |
| tree | 12ca6fee3cd1df9869623be69ea7316b6ee0fb75 | |
| parent | ff0cc74b338c431bfef836aa4e0fc337e48d0296 (diff) | |
| parent | c547687a407d935654aa71f7afa1e4392e50d5c5 (diff) | |
| download | libayatana-indicator-61e1ae1b8072ae134487dc66537daefbef477199.tar.gz libayatana-indicator-61e1ae1b8072ae134487dc66537daefbef477199.tar.bz2 libayatana-indicator-61e1ae1b8072ae134487dc66537daefbef477199.zip | |
Updating to trunk
| -rw-r--r-- | libindicator/indicator-object.c | 8 | ||||
| -rw-r--r-- | libindicator/indicator-object.h | 3 | ||||
| -rw-r--r-- | libindicator/indicator-service-manager.c | 6 | ||||
| -rw-r--r-- | libindicator/indicator-service.c | 4 |
4 files changed, 12 insertions, 9 deletions
diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index ed9214c..0554b48 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -1,5 +1,6 @@ /* -An interface for indicators to link to for creation. +An object to represent loadable indicator modules to make loading +them easy and objectified. Copyright 2009 Canonical Ltd. @@ -33,7 +34,8 @@ License along with this library. If not, see @icon: The icon representing this indicator or #NULL if none. @menu: The menu representing this indicator or #NULL if none. - Private data for the object. + Structure to define the memory for the private area + of the object instance. */ typedef struct _IndicatorObjectPrivate IndicatorObjectPrivate; struct _IndicatorObjectPrivate { @@ -67,7 +69,7 @@ indicator_object_class_init (IndicatorObjectClass *klass) return; } -/* Inititalize an instance */ +/* Initialize an instance */ static void indicator_object_init (IndicatorObject *self) { diff --git a/libindicator/indicator-object.h b/libindicator/indicator-object.h index ea3f52e..1d2a065 100644 --- a/libindicator/indicator-object.h +++ b/libindicator/indicator-object.h @@ -1,5 +1,6 @@ /* -An interface for indicators to link to for creation. +An object to represent loadable indicator modules to make loading +them easy and objectified. Copyright 2009 Canonical Ltd. diff --git a/libindicator/indicator-service-manager.c b/libindicator/indicator-service-manager.c index 656472d..4eaed23 100644 --- a/libindicator/indicator-service-manager.c +++ b/libindicator/indicator-service-manager.c @@ -232,7 +232,7 @@ get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspe } static void -watch_cb (DBusGProxy * proxy, gint version, GError * error, gpointer user_data) +watch_cb (DBusGProxy * proxy, gint service_version, GError * error, gpointer user_data) { IndicatorServiceManagerPrivate * priv = INDICATOR_SERVICE_MANAGER_GET_PRIVATE(user_data); @@ -242,8 +242,8 @@ watch_cb (DBusGProxy * proxy, gint version, GError * error, gpointer user_data) return; } - if (version != INDICATOR_SERVICE_VERSION) { - g_warning("Service is using a different version of the service interface. Expecting %d and got %d.", INDICATOR_SERVICE_VERSION, version); + if (service_version != INDICATOR_SERVICE_VERSION) { + g_warning("Service is using a different version of the service interface. Expecting %d and got %d.", INDICATOR_SERVICE_VERSION, service_version); return; } diff --git a/libindicator/indicator-service.c b/libindicator/indicator-service.c index ff0bd03..69422c5 100644 --- a/libindicator/indicator-service.c +++ b/libindicator/indicator-service.c @@ -209,7 +209,7 @@ set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec priv->name = g_value_dup_string(value); try_and_get_name(self); } else { - g_warning("Name is a string bud."); + g_warning("Name property requires a string value."); } break; /* *********************** */ @@ -236,7 +236,7 @@ get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspe if (G_VALUE_HOLDS_STRING(value)) { g_value_set_string(value, priv->name); } else { - g_warning("Name is a string bud."); + g_warning("Name property requires a string value."); } break; /* *********************** */ |