From 6ea315bb4bd85abbc4a7180d7cbca5b3eba92411 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Thu, 9 Aug 2007 09:33:14 +0000 Subject: [PATCH] Remove workaround for mc-enum-types.h not being installed by MC and bump 2007-08-09 Xavier Claessens * 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. svn path=/trunk/; revision=239 --- ChangeLog | 7 +++++++ configure.ac | 2 +- libempathy/empathy-idle.c | 9 +-------- libempathy/empathy-presence.c | 10 ++-------- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 69683489..6fc0bf63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-08-09 Xavier Claessens + + * 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. + 2007-08-09 Xavier Claessens * libempathy-gtk/empathy-preferences.c: diff --git a/configure.ac b/configure.ac index a612d423..e438ba15 100644 --- a/configure.ac +++ b/configure.ac @@ -49,7 +49,7 @@ GTK_REQUIRED=2.10.0 GCONF_REQUIRED=1.2.0 LIBGLADE_REQUIRED=2.0.0 TELEPATHY_REQUIRED=0.0.51 -MISSION_CONTROL_REQUIRED=4.27 +MISSION_CONTROL_REQUIRED=4.33 IDT_COMPILE_WARNINGS diff --git a/libempathy/empathy-idle.c b/libempathy/empathy-idle.c index efe67ddd..4c7344e9 100644 --- a/libempathy/empathy-idle.c +++ b/libempathy/empathy-idle.c @@ -28,19 +28,12 @@ #include #include +#include #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 136dce36..42c7f936 100644 --- a/libempathy/empathy-presence.c +++ b/libempathy/empathy-presence.c @@ -26,17 +26,11 @@ #include +#include + #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; -- 2.39.2