diff options
| author | Ted Gould <ted@gould.cx> | 2010-01-13 14:06:20 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-01-13 14:06:20 -0600 |
| commit | c1d9e7dbdf75947ef9c02ef4782e979624376160 (patch) | |
| tree | 35bd0890cfae0a7d19b8e12bb71f523d889cf627 | |
| parent | df2c07b139f2810a59cef7219faf3e2f459b2ea2 (diff) | |
| parent | e67b856409825b020e2d71b510d05abc1cdef31c (diff) | |
| download | ayatana-indicator-application-c1d9e7dbdf75947ef9c02ef4782e979624376160.tar.gz ayatana-indicator-application-c1d9e7dbdf75947ef9c02ef4782e979624376160.tar.bz2 ayatana-indicator-application-c1d9e7dbdf75947ef9c02ef4782e979624376160.zip | |
* Upstream update
* More checking.
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/libappindicator/app-indicator.c | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index b7b150e..4571d08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-application (0.0.8-0ubuntu1~ppa2~fallback3) UNRELEASED; urgency=low + + * Upstream update + * More checking. + + -- Ted Gould <ted@ubuntu.com> Wed, 13 Jan 2010 14:06:06 -0600 + indicator-application (0.0.8-0ubuntu1~ppa2~fallback2) karmic; urgency=low * Upstream update diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index baa2159..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 @@ -682,7 +683,8 @@ dbus_owner_change (DBusGProxy * proxy, const gchar * name, const gchar * prev, c static void start_fallback_timer (AppIndicator * self, gboolean do_it_now) { - AppIndicatorPrivate * priv = APP_INDICATOR_GET_PRIVATE(self); + g_return_if_fail(IS_APP_INDICATOR(self)); + AppIndicatorPrivate * priv = APP_INDICATOR(self)->priv; if (priv->fallback_timer != 0) { /* The timer is set, let's just be happy with the one |