diff options
| author | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2007-08-09 17:33:14 +0800 |
|---|---|---|
| committer | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2007-08-09 17:33:14 +0800 |
| commit | 6f913b4100e85c63d75443d8c328e9f9013216db (patch) | |
| tree | 8013682155c9f51096835ec11ae964e861975f3d /libempathy | |
| parent | edafb806d6f8bce89234da84db8913b4ed206292 (diff) | |
| download | gsoc2013-empathy-6f913b4100e85c63d75443d8c328e9f9013216db.tar gsoc2013-empathy-6f913b4100e85c63d75443d8c328e9f9013216db.tar.gz gsoc2013-empathy-6f913b4100e85c63d75443d8c328e9f9013216db.tar.bz2 gsoc2013-empathy-6f913b4100e85c63d75443d8c328e9f9013216db.tar.lz gsoc2013-empathy-6f913b4100e85c63d75443d8c328e9f9013216db.tar.xz gsoc2013-empathy-6f913b4100e85c63d75443d8c328e9f9013216db.tar.zst gsoc2013-empathy-6f913b4100e85c63d75443d8c328e9f9013216db.zip | |
2007-08-09 Xavier Claessens <xclaesse@gmail.com>
* libempathy/empathy-presence.c:
* libempathy/empathy-idle.c:
* configure.ac: Remove workaround for mc-enum-types.h not being
installed by MC and bump MC minimal version to 4.33.
git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@239 4ee84921-47dd-4033-b63a-18d7a039a3e4
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-idle.c | 9 | ||||
| -rw-r--r-- | libempathy/empathy-presence.c | 10 |
2 files changed, 3 insertions, 16 deletions
diff --git a/libempathy/empathy-idle.c b/libempathy/empathy-idle.c index efe67ddd8..4c7344e9b 100644 --- a/libempathy/empathy-idle.c +++ b/libempathy/empathy-idle.c @@ -28,19 +28,12 @@ #include <dbus/dbus-glib.h> #include <libtelepathy/tp-helpers.h> +#include <libmissioncontrol/mc-enum-types.h> #include "empathy-idle.h" #include "empathy-utils.h" #include "empathy-debug.h" -/* FIXME mission-control does not install libmissioncontrol/mc-enum-types.h so - * we have to define MC_TYPE_PRESENCE here. See sf.net bug #1768235, - * https://sf.net/tracker/?func=detail&atid=932444&aid=1768235&group_id=190214 */ -#ifndef MC_TYPE_PRESENCE -GType mc_presence_get_type (void) G_GNUC_CONST; -#define MC_TYPE_PRESENCE (mc_presence_get_type()) -#endif - #define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ EMPATHY_TYPE_IDLE, EmpathyIdlePriv)) diff --git a/libempathy/empathy-presence.c b/libempathy/empathy-presence.c index 136dce36a..42c7f936b 100644 --- a/libempathy/empathy-presence.c +++ b/libempathy/empathy-presence.c @@ -26,17 +26,11 @@ #include <glib/gi18n.h> +#include <libmissioncontrol/mc-enum-types.h> + #include "empathy-presence.h" #include "empathy-time.h" -/* FIXME mission-control does not install libmissioncontrol/mc-enum-types.h so - * we have to define MC_TYPE_PRESENCE here. See sf.net bug #1768235, - * https://sf.net/tracker/?func=detail&atid=932444&aid=1768235&group_id=190214 */ -#ifndef MC_TYPE_PRESENCE -GType mc_presence_get_type (void) G_GNUC_CONST; -#define MC_TYPE_PRESENCE (mc_presence_get_type()) -#endif - #define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_PRESENCE, EmpathyPresencePriv)) typedef struct _EmpathyPresencePriv EmpathyPresencePriv; |