diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-11-18 19:47:13 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-11-19 07:12:11 +0800 |
| commit | 5e6b2ce12834a5b9a39ebfda3347377a52d00fac (patch) | |
| tree | 7d8d783fad8a703018013482fe92b0e0cdce0c42 | |
| parent | 6d44631feaef9003a77b9854764549afee839a27 (diff) | |
| download | gsoc2013-empathy-5e6b2ce12834a5b9a39ebfda3347377a52d00fac.tar gsoc2013-empathy-5e6b2ce12834a5b9a39ebfda3347377a52d00fac.tar.gz gsoc2013-empathy-5e6b2ce12834a5b9a39ebfda3347377a52d00fac.tar.bz2 gsoc2013-empathy-5e6b2ce12834a5b9a39ebfda3347377a52d00fac.tar.lz gsoc2013-empathy-5e6b2ce12834a5b9a39ebfda3347377a52d00fac.tar.xz gsoc2013-empathy-5e6b2ce12834a5b9a39ebfda3347377a52d00fac.tar.zst gsoc2013-empathy-5e6b2ce12834a5b9a39ebfda3347377a52d00fac.zip | |
idle: make empathy_idle_get_status static
It's not used anymore and other components should use the account manager
directly.
| -rw-r--r-- | libempathy/empathy-idle.c | 36 | ||||
| -rw-r--r-- | libempathy/empathy-idle.h | 1 |
2 files changed, 18 insertions, 19 deletions
diff --git a/libempathy/empathy-idle.c b/libempathy/empathy-idle.c index 03b27a11a..14d7c4813 100644 --- a/libempathy/empathy-idle.c +++ b/libempathy/empathy-idle.c @@ -340,6 +340,24 @@ idle_constructor (GType type, return retval; } +static const gchar * +empathy_idle_get_status (EmpathyIdle *idle) +{ + EmpathyIdlePriv *priv; + + priv = GET_PRIV (idle); + + if (G_UNLIKELY (!priv->ready)) + g_critical (G_STRLOC ": %s called before AccountManager ready", + G_STRFUNC); + + if (!priv->status) { + return empathy_presence_get_default_message (priv->state); + } + + return priv->status; +} + static void idle_get_property (GObject *object, guint param_id, @@ -563,24 +581,6 @@ empathy_idle_set_state (EmpathyIdle *idle, empathy_idle_set_presence (idle, state, priv->status); } -const gchar * -empathy_idle_get_status (EmpathyIdle *idle) -{ - EmpathyIdlePriv *priv; - - priv = GET_PRIV (idle); - - if (G_UNLIKELY (!priv->ready)) - g_critical (G_STRLOC ": %s called before AccountManager ready", - G_STRFUNC); - - if (!priv->status) { - return empathy_presence_get_default_message (priv->state); - } - - return priv->status; -} - void empathy_idle_set_status (EmpathyIdle *idle, const gchar *status) diff --git a/libempathy/empathy-idle.h b/libempathy/empathy-idle.h index 105e1830c..687742c0f 100644 --- a/libempathy/empathy-idle.h +++ b/libempathy/empathy-idle.h @@ -52,7 +52,6 @@ EmpathyIdle *empathy_idle_dup_singleton (void); TpConnectionPresenceType empathy_idle_get_state (EmpathyIdle *idle); void empathy_idle_set_state (EmpathyIdle *idle, TpConnectionPresenceType state); -const gchar *empathy_idle_get_status (EmpathyIdle *idle); void empathy_idle_set_status (EmpathyIdle *idle, const gchar *status); void empathy_idle_set_presence (EmpathyIdle *idle, |