diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2007-08-09 17:33:14 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2007-08-09 17:33:14 +0800 |
| commit | 6ea315bb4bd85abbc4a7180d7cbca5b3eba92411 (patch) | |
| tree | 8013682155c9f51096835ec11ae964e861975f3d | |
| parent | 19be685ee72af7024847e6db5eb503a42bab9093 (diff) | |
| download | gsoc2013-empathy-6ea315bb4bd85abbc4a7180d7cbca5b3eba92411.tar gsoc2013-empathy-6ea315bb4bd85abbc4a7180d7cbca5b3eba92411.tar.gz gsoc2013-empathy-6ea315bb4bd85abbc4a7180d7cbca5b3eba92411.tar.bz2 gsoc2013-empathy-6ea315bb4bd85abbc4a7180d7cbca5b3eba92411.tar.lz gsoc2013-empathy-6ea315bb4bd85abbc4a7180d7cbca5b3eba92411.tar.xz gsoc2013-empathy-6ea315bb4bd85abbc4a7180d7cbca5b3eba92411.tar.zst gsoc2013-empathy-6ea315bb4bd85abbc4a7180d7cbca5b3eba92411.zip | |
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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libempathy/empathy-idle.c | 9 | ||||
| -rw-r--r-- | libempathy/empathy-presence.c | 10 |
4 files changed, 11 insertions, 17 deletions
@@ -1,5 +1,12 @@ 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: * libempathy-gtk/empathy-preferences.glade: Useless spell checker option. Fixes bug #459164 (Cosimo Cecchi). diff --git a/configure.ac b/configure.ac index a612d4231..e438ba15b 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 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; |