diff options
| author | Ted Gould <ted@gould.cx> | 2010-01-13 13:31:41 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-01-13 13:31:41 -0600 |
| commit | b7f9aafb435d266740886fea7aec735def0a41eb (patch) | |
| tree | 55034ad72999310d0298304a837be95fc0d3165d | |
| parent | 519e03cf8628111e9740dd45b160f1fc961666c7 (diff) | |
| parent | 60236935d5da0be2de0833cded25ad9361305a43 (diff) | |
| download | ayatana-indicator-application-b7f9aafb435d266740886fea7aec735def0a41eb.tar.gz ayatana-indicator-application-b7f9aafb435d266740886fea7aec735def0a41eb.tar.bz2 ayatana-indicator-application-b7f9aafb435d266740886fea7aec735def0a41eb.zip | |
* Upstream update
* Checking fallback function params
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/libappindicator/app-indicator.c | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index d1be23e..a6eb32c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-application (0.0.8-0ubuntu1~ppa2~fallback2) UNRELEASED; urgency=low + + * Upstream update + * Checking fallback function params + + -- Ted Gould <ted@ubuntu.com> Wed, 13 Jan 2010 13:31:20 -0600 + indicator-application (0.0.8-0ubuntu1~ppa2~fallback1) karmic; urgency=low * Upstream update diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index a3ad1ee..baa2159 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -716,7 +716,9 @@ start_fallback_timer (AppIndicator * self, gboolean do_it_now) static gboolean fallback_timer_expire (gpointer data) { - AppIndicatorPrivate * priv = APP_INDICATOR_GET_PRIVATE(data); + g_return_val_if_fail(IS_APP_INDICATOR(data), FALSE); + + AppIndicatorPrivate * priv = APP_INDICATOR(data)->priv; AppIndicatorClass * class = APP_INDICATOR_GET_CLASS(data); if (priv->status_icon == NULL) { @@ -727,7 +729,9 @@ fallback_timer_expire (gpointer data) if (class->unfallback != NULL) { class->unfallback(APP_INDICATOR(data), priv->status_icon); priv->status_icon = NULL; - } + } else { + g_warning("Can't 'unfallback' and I have an allocated status_icon. Might be a memory leak!"); + } } priv->fallback_timer = 0; |