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