Merge branch 'remove-cc-plugin'

diff --combined configure.ac
index fa43c0603601d020732937c4565c87200009187c,f9a89cf30b77ec42a76691f2923d5b0b5f0343cc..3a5dc72e30e7c8b91bd363765d20f05601425753
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -3,8 -3,8 +3,8 @@@ m4_define(empathy_released, 0
  
  m4_define([empathy_major_version], [3])
  m4_define([empathy_minor_version], [1])
 -m4_define([empathy_micro_version], [90])
 -m4_define([empathy_nano_version], [1])
 +m4_define([empathy_micro_version], [91])
 +m4_define([empathy_nano_version], [0])
  
  dnl Display the nano_version only if it's not '0'
  m4_define([empathy_base_version],
@@@ -57,7 -57,6 +57,6 @@@ LIBCHAMPLAIN_GTK_REQUIRED=0.7.
  LIBCHAMPLAIN_REQUIRED=0.9
  NAUTILUS_SENDTO_REQUIRED=2.90.0
  NETWORK_MANAGER_REQUIRED=0.7.0
- GNOME_CONTROL_CENTER_REQUIRED=2.31.4
  
  # Use --enable-maintainer-mode to disable deprecated symbols,
  # disable single include and enable GSEAL. If this is not a released empathy,
@@@ -579,74 -578,6 +578,35 @@@ f
  
  AM_CONDITIONAL(HAVE_NST, test "x$have_nst" = "xyes")
  
- # -----------------------------------------------------------
- # new, single-window control center
- # -----------------------------------------------------------
- AC_ARG_ENABLE(control_center_embedding,
-               AS_HELP_STRING([--enable-control-center-embedding=@<:@no/yes/auto@:>@],
-                              [Enable support for single-window control center]),
-                              , enable_control_center_embedding=auto)
- 
- if test "x$enable_control_center_embedding" != "xno"; then
- 
-    PKG_CHECK_MODULES(CONTROL_CENTER_EMBEDDING, [libgnome-control-center >= GNOME_CONTROL_CENTER_REQUIRED],
-         have_control_center_embedding="yes", have_control_center_embedding="no")
- 
-    if test "x$have_control_center_embedding" = "xyes"; then
-       AC_DEFINE(HAVE_CONTROL_CENTER_EMBEDDING, 1, [Define if you have the single-window control center])
- 
-       AC_MSG_CHECKING([gnome-control-center extension dir])
-       CONTROL_CENTER_EXTENSIONDIR=`$PKG_CONFIG --variable=extensiondir libgnome-control-center`
-       if test "x$CONTROL_CENTER_EXTENSIONDIR" = "x"; then
-           AC_MSG_ERROR([Could not determine extensiondir])
-       else
-           AC_MSG_RESULT([$CONTROL_CENTER_EXTENSIONDIR])
-       fi
-       AC_SUBST(CONTROL_CENTER_EXTENSIONDIR)
-    fi
- else
-    have_control_center_embedding="no"
- fi
- 
- if test "x$enable_control_center_embedding" = "xyes" -a "x$have_control_center_embedding" != "xyes"; then
-    AC_MSG_ERROR([Could not find single-window control center dependencies:
- 
- $CONTROL_CENTER_EMBEDDING_PKG_ERRORS])
- fi
- 
- AM_CONDITIONAL(HAVE_CONTROL_CENTER_EMBEDDING, test "x$have_control_center_embedding" = "xyes")
- AC_SUBST(CONTROL_CENTER_EMBEDDING_CFLAGS)
- AC_SUBST(CONTROL_CENTER_EMBEDDING_LIBS)
- 
 +# -----------------------------------------------------------
 +# goa-mc-plugin
 +# -----------------------------------------------------------
 +AC_ARG_ENABLE(goa,
 +              AS_HELP_STRING([--enable-goa=@<:@no/yes/auto@:>@],
 +                             [build GOA MC plugin]), ,
 +                             enable_goa=auto)
 +
 +if test "x$enable_goa" != "xno"; then
 +   PKG_CHECK_MODULES(GOA,
 +    [
 +       mission-control-plugins
 +       goa-1.0
 +    ], have_goa="yes", have_goa="no")
 +
 +   AC_MSG_CHECKING([Mission Control plugins dir])
 +   MISSION_CONTROL_PLUGINS_DIR=`pkg-config --variable=plugindir mission-control-plugins`
 +
 +   AC_SUBST(MISSION_CONTROL_PLUGINS_DIR)
 +else
 +   have_goa=no
 +fi
 +
 +if test "x$enable_goa" = "xyes" -a "x$have_goa" != "xyes"; then
 +   AC_MSG_ERROR([Could not find GOA dependencies.])
 +fi
 +
 +AM_CONDITIONAL(HAVE_GOA, test "x$have_goa" = "xyes")
 +
  # Optional dependency for avatar selection
  AC_ARG_WITH([cheese],
              AS_HELP_STRING([--with-cheese],
@@@ -693,7 -624,6 +653,7 @@@ AC_CONFIG_FILES(
     libempathy-gtk/Makefile
     src/Makefile
     nautilus-sendto-plugin/Makefile
 +   goa-mc-plugin/Makefile
     help/Makefile
     tests/Makefile
     tests/interactive/Makefile
@@@ -717,7 -647,6 +677,6 @@@ Configure summary
        Location awareness (Geoclue):  ${have_geoclue}
        Geocode support (Geocode)...:  ${have_geocode}
        Meego widgets...............:  ${have_meego}
-       Control center embedding....:  ${have_control_center_embedding}
        Cheese webcam support ......:  ${have_cheese}
        Camera monitoring...........:  ${have_gudev}
  
@@@ -727,7 -656,6 +686,7 @@@
  
      Extras:
        Nautilus-sendto plugin......:  ${have_nst}
 +      GOA MC plugin...............:  ${have_goa}
        Salut E-D-S support.........:  ${with_eds}
        Exp. Call channel handler...:  ${have_call}
        Exp. Call log support.......:  ${have_call_logs}