aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-01-13 14:05:33 -0600
committerTed Gould <ted@gould.cx>2010-01-13 14:05:33 -0600
commite67b856409825b020e2d71b510d05abc1cdef31c (patch)
tree924706f44a3eed0f3807108d116b24392250412b /src
parent303db3c924690a134dcc6c0159f3a9dfc5a761fa (diff)
downloadlibayatana-appindicator-e67b856409825b020e2d71b510d05abc1cdef31c.tar.gz
libayatana-appindicator-e67b856409825b020e2d71b510d05abc1cdef31c.tar.bz2
libayatana-appindicator-e67b856409825b020e2d71b510d05abc1cdef31c.zip
Checking more for whether we have an APP_INDICATOR object
Diffstat (limited to 'src')
-rw-r--r--src/libappindicator/app-indicator.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index a098170..e581829 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -608,7 +608,8 @@ watcher_proxy_destroyed (GObject * object, gpointer data)
static void
register_service_cb (DBusGProxy * proxy, GError * error, gpointer data)
{
- AppIndicatorPrivate * priv = APP_INDICATOR_GET_PRIVATE(data);
+ g_return_if_fail(IS_APP_INDICATOR(data));
+ AppIndicatorPrivate * priv = APP_INDICATOR(data)->priv;
if (error != NULL) {
/* They didn't respond, ewww. Not sure what they could
@@ -683,8 +684,7 @@ static void
start_fallback_timer (AppIndicator * self, gboolean do_it_now)
{
g_return_if_fail(IS_APP_INDICATOR(self));
-
- AppIndicatorPrivate * priv = APP_INDICATOR_GET_PRIVATE(self);
+ AppIndicatorPrivate * priv = APP_INDICATOR(self)->priv;
if (priv->fallback_timer != 0) {
/* The timer is set, let's just be happy with the one