aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--src/libappindicator/app-indicator.c8
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;