Remove workaround for mc-enum-types.h not being installed by MC and bump

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.

svn path=/trunk/; revision=239

diff --git a/ChangeLog b/ChangeLog
index 69683489dcb44df72a01591a361dee7deafb61da..6fc0bf6354ca65749c07d257c91515014f523246 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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.
+
 2007-08-09 Xavier Claessens  <xclaesse@gmail.com>
 
        * libempathy-gtk/empathy-preferences.c:

diff --git a/configure.ac b/configure.ac
index a612d4231c42046d028d23301b2bf01d3054bebf..e438ba15b970b1bf230b18ed854e7c282cacb7b9 100644 (file)
--- 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 efe67ddd8a5a2d77af2af212595eac7025fb51c0..4c7344e9b804ebc9680a9d09b7d8ae2ac2af5def 100644 (file)
--- 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 136dce36a862e0a8b42722615a5d3e3972e9684b..42c7f936b726aa97a179cb2c0559553e537d264d 100644 (file)
--- 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;