aboutsummaryrefslogtreecommitdiff
path: root/libindicator/indicator-service-manager.c
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-11-04 08:14:17 -0600
committerTed Gould <ted@canonical.com>2009-11-04 08:14:17 -0600
commit61e1ae1b8072ae134487dc66537daefbef477199 (patch)
tree12ca6fee3cd1df9869623be69ea7316b6ee0fb75 /libindicator/indicator-service-manager.c
parentff0cc74b338c431bfef836aa4e0fc337e48d0296 (diff)
parentc547687a407d935654aa71f7afa1e4392e50d5c5 (diff)
downloadlibayatana-indicator-61e1ae1b8072ae134487dc66537daefbef477199.tar.gz
libayatana-indicator-61e1ae1b8072ae134487dc66537daefbef477199.tar.bz2
libayatana-indicator-61e1ae1b8072ae134487dc66537daefbef477199.zip
Updating to trunk
Diffstat (limited to 'libindicator/indicator-service-manager.c')
-rw-r--r--libindicator/indicator-service-manager.c6
1 files changed, 3 insertions, 3 deletions
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;
}