Remove dead map view component

5 files changed, 0 insertions, 727 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index f511b402a..ef7af74fa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -181,20 +181,6 @@ EXTRA_DIST =			\
 	$(autostart_DATA)	\
 	$(ui_DATA)
 
-if HAVE_LIBCHAMPLAIN
-empathy_handwritten_source += 				\
-	empathy-map-view.c			\
-	empathy-map-view.h
-
-ui_DATA += 					\
-	empathy-map-view.ui
-else
-EXTRA_DIST +=					\
-	empathy-map-view.c			\
-	empathy-map-view.h			\
-	empathy-map-view.ui
-endif
-
 dist_man_MANS =			\
 	empathy.1 \
 	empathy-accounts.1
diff --git a/src/empathy-map-view.c b/src/empathy-map-view.c
deleted file mode 100644
index 9ab82c091..000000000
--- a/src/empathy-map-view.c
+++ /dev/null
@@ -1,556 +0,0 @@
-/*
- * Copyright (C) 2008, 2009 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
- */
-
-#include <config.h>
-
-#include <sys/stat.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <gdk/gdkkeysyms.h>
-
-#include <champlain/champlain.h>
-#include <champlain-gtk/champlain-gtk.h>
-#include <clutter-gtk/clutter-gtk.h>
-#include <telepathy-glib/util.h>
-
-#include <libempathy/empathy-contact.h>
-#include <libempathy/empathy-connection-aggregator.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-location.h>
-
-#include <libempathy-gtk/empathy-individual-menu.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
-#include "empathy-map-view.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_LOCATION
-#include <libempathy/empathy-debug.h>
-
-G_DEFINE_TYPE (EmpathyMapView, empathy_map_view, GTK_TYPE_WINDOW);
-
-#define GET_PRIV(self) ((EmpathyMapViewPriv *)((EmpathyMapView *) self)->priv)
-
-struct _EmpathyMapViewPriv {
-  EmpathyConnectionAggregator *aggregator;
-
-  GtkWidget *zoom_in;
-  GtkWidget *zoom_out;
-  GtkWidget *throbber;
-  ChamplainView *map_view;
-  ChamplainMarkerLayer *layer;
-  guint timeout_id;
-  /* reffed (EmpathyContact *) => borrowed (ChamplainMarker *) */
-  GHashTable *markers;
-  gulong members_changed_id;
-
-  /* TpContact -> EmpathyContact */
-  GHashTable *contacts;
-};
-
-static void
-map_view_state_changed (ChamplainView *view,
-    GParamSpec *gobject,
-    EmpathyMapView *self)
-{
-  ChamplainState state;
-  EmpathyMapViewPriv *priv = GET_PRIV (self);
-
-  g_object_get (G_OBJECT (view), "state", &state, NULL);
-  if (state == CHAMPLAIN_STATE_LOADING)
-    {
-      gtk_spinner_start (GTK_SPINNER (priv->throbber));
-      gtk_widget_show (priv->throbber);
-    }
-  else
-    {
-      gtk_spinner_stop (GTK_SPINNER (priv->throbber));
-      gtk_widget_hide (priv->throbber);
-    }
-}
-
-static gboolean
-contact_has_location (EmpathyContact *contact)
-{
-  GHashTable *location;
-
-  location = empathy_contact_get_location (contact);
-
-  if (location == NULL || g_hash_table_size (location) == 0)
-    return FALSE;
-
-  return TRUE;
-}
-
-static ClutterActor * create_marker (EmpathyMapView *window,
-    EmpathyContact *contact);
-
-static void
-map_view_update_contact_position (EmpathyMapView *self,
-    EmpathyContact *contact)
-{
-  EmpathyMapViewPriv *priv = GET_PRIV (self);
-  gdouble lon, lat;
-  GValue *value;
-  GHashTable *location;
-  ClutterActor *marker;
-  gboolean has_location;
-
-  has_location = contact_has_location (contact);
-
-  marker = g_hash_table_lookup (priv->markers, contact);
-  if (marker == NULL)
-    {
-      if (!has_location)
-        return;
-
-      marker = create_marker (self, contact);
-    }
-  else if (!has_location)
-    {
-      champlain_marker_animate_out (CHAMPLAIN_MARKER (marker));
-      return;
-    }
-
-  location = empathy_contact_get_location (contact);
-
-  value = g_hash_table_lookup (location, EMPATHY_LOCATION_LAT);
-  if (value == NULL)
-    {
-      clutter_actor_hide (marker);
-      return;
-    }
-  lat = g_value_get_double (value);
-
-  value = g_hash_table_lookup (location, EMPATHY_LOCATION_LON);
-  if (value == NULL)
-    {
-      clutter_actor_hide (marker);
-      return;
-    }
-  lon = g_value_get_double (value);
-
-  champlain_location_set_location (CHAMPLAIN_LOCATION (marker), lat, lon);
-  champlain_marker_animate_in (CHAMPLAIN_MARKER (marker));
-}
-
-static void
-map_view_contact_location_notify (EmpathyContact *contact,
-    GParamSpec *arg1,
-    EmpathyMapView *self)
-{
-  map_view_update_contact_position (self, contact);
-}
-
-static void
-map_view_zoom_in_cb (GtkWidget *widget,
-    EmpathyMapView *self)
-{
-  EmpathyMapViewPriv *priv = GET_PRIV (self);
-
-  champlain_view_zoom_in (priv->map_view);
-}
-
-static void
-map_view_zoom_out_cb (GtkWidget *widget,
-    EmpathyMapView *self)
-{
-  EmpathyMapViewPriv *priv = GET_PRIV (self);
-
-  champlain_view_zoom_out (priv->map_view);
-}
-
-static void
-map_view_zoom_fit_cb (GtkWidget *widget,
-    EmpathyMapView *self)
-{
-  EmpathyMapViewPriv *priv = GET_PRIV (self);
-
-  champlain_view_ensure_layers_visible (priv->map_view, TRUE);
-}
-
-static gboolean
-marker_clicked_cb (ChamplainMarker *marker,
-    ClutterButtonEvent *event,
-    EmpathyMapView *self)
-{
-  GtkWidget *menu;
-  EmpathyContact *contact;
-  TpContact *tp_contact;
-  FolksIndividual *individual;
-
-  if (event->button != 3)
-    return FALSE;
-
-  contact = g_object_get_data (G_OBJECT (marker), "contact");
-  if (contact == NULL)
-    return FALSE;
-
-  tp_contact = empathy_contact_get_tp_contact (contact);
-  if (tp_contact == NULL)
-    return FALSE;
-
-  individual = empathy_create_individual_from_tp_contact (tp_contact);
-  if (individual == NULL)
-    return FALSE;
-
-  menu = empathy_individual_menu_new (individual,
-      EMPATHY_INDIVIDUAL_FEATURE_CHAT |
-      EMPATHY_INDIVIDUAL_FEATURE_CALL |
-      EMPATHY_INDIVIDUAL_FEATURE_LOG |
-      EMPATHY_INDIVIDUAL_FEATURE_INFO, NULL);
-
-  if (menu == NULL)
-    goto out;
-
-  gtk_menu_attach_to_widget (GTK_MENU (menu), GTK_WIDGET (self), NULL);
-
-  gtk_widget_show (menu);
-  gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
-      event->button, event->time);
-
-out:
-  g_object_unref (individual);
-  return FALSE;
-}
-
-static void
-map_view_contacts_update_label (ClutterActor *marker)
-{
-  const gchar *name;
-  gchar *date;
-  gchar *label;
-  GValue *gtime;
-  gint64 loctime;
-  GHashTable *location;
-  EmpathyContact *contact;
-
-  contact = g_object_get_data (G_OBJECT (marker), "contact");
-  location = empathy_contact_get_location (contact);
-  name = empathy_contact_get_alias (contact);
-  gtime = g_hash_table_lookup (location, EMPATHY_LOCATION_TIMESTAMP);
-
-  if (gtime != NULL)
-    {
-      GDateTime *now, *d;
-      GTimeSpan delta;
-
-      loctime = g_value_get_int64 (gtime);
-      date = empathy_time_to_string_relative (loctime);
-      label = g_strconcat ("<b>", name, "</b>\n<small>", date, "</small>", NULL);
-      g_free (date);
-
-      now = g_date_time_new_now_utc ();
-      d = g_date_time_new_from_unix_utc (loctime);
-      delta = g_date_time_difference (now, d);
-
-      /* if location is older than a week */
-      if (delta > G_TIME_SPAN_DAY * 7)
-        clutter_actor_set_opacity (marker, 0.75 * 255);
-
-      g_date_time_unref (now);
-      g_date_time_unref (d);
-    }
-  else
-    {
-      label = g_strconcat ("<b>", name, "</b>\n", NULL);
-    }
-
-  champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-  champlain_label_set_text (CHAMPLAIN_LABEL (marker), label);
-
-  g_free (label);
-}
-
-static ClutterActor *
-create_marker (EmpathyMapView *self,
-    EmpathyContact *contact)
-{
-  EmpathyMapViewPriv *priv = GET_PRIV (self);
-  ClutterActor *marker;
-  GdkPixbuf *avatar;
-  ClutterActor *texture = NULL;
-
-  avatar = empathy_pixbuf_avatar_from_contact_scaled (contact, 32, 32);
-  if (avatar != NULL)
-    {
-      texture = gtk_clutter_texture_new ();
-
-      gtk_clutter_texture_set_from_pixbuf (GTK_CLUTTER_TEXTURE (texture),
-          avatar, NULL);
-
-      g_object_unref (avatar);
-    }
-
-  marker = champlain_label_new_with_image (texture);
-
-  g_object_set_data_full (G_OBJECT (marker), "contact",
-      g_object_ref (contact), g_object_unref);
-
-  g_hash_table_insert (priv->markers, g_object_ref (contact), marker);
-
-  map_view_contacts_update_label (marker);
-
-  clutter_actor_set_reactive (CLUTTER_ACTOR (marker), TRUE);
-  g_signal_connect (marker, "button-release-event",
-      G_CALLBACK (marker_clicked_cb), self);
-
-  champlain_marker_layer_add_marker (priv->layer, CHAMPLAIN_MARKER (marker));
-
-  DEBUG ("Create marker for %s", empathy_contact_get_id (contact));
-
-  tp_clear_object (&texture);
-  return marker;
-}
-
-static gboolean
-map_view_key_press_cb (GtkWidget *widget,
-    GdkEventKey *event,
-    gpointer user_data)
-{
-  if ((event->state & GDK_CONTROL_MASK && event->keyval == GDK_KEY_w)
-      || event->keyval == GDK_KEY_Escape)
-    {
-      gtk_widget_destroy (widget);
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
-static gboolean
-map_view_tick (EmpathyMapView *self)
-{
-  EmpathyMapViewPriv *priv = GET_PRIV (self);
-  GList *marker, *l;
-
-  marker = champlain_marker_layer_get_markers (priv->layer);
-
-  for (l = marker; l != NULL; l = g_list_next (l))
-    map_view_contacts_update_label (l->data);
-
-  g_list_free (marker);
-  return TRUE;
-}
-
-static void
-contact_list_changed_cb (EmpathyConnectionAggregator *aggregator,
-    GPtrArray *added,
-    GPtrArray *removed,
-    EmpathyMapView *self)
-{
-  EmpathyMapViewPriv *priv = GET_PRIV (self);
-  guint i;
-
-  for (i = 0; i < added->len; i++)
-    {
-      TpContact *tp_contact = g_ptr_array_index (added, i);
-      EmpathyContact *contact;
-
-      if (g_hash_table_lookup (priv->contacts, tp_contact) != NULL)
-        continue;
-
-      contact = empathy_contact_dup_from_tp_contact (tp_contact);
-
-      tp_g_signal_connect_object (contact, "notify::location",
-          G_CALLBACK (map_view_contact_location_notify), self, 0);
-
-      map_view_update_contact_position (self, contact);
-
-      /* Pass ownership to the hash table */
-      g_hash_table_insert (priv->contacts, g_object_ref (tp_contact),
-          contact);
-    }
-
-  for (i = 0; i < removed->len; i++)
-    {
-      TpContact *tp_contact = g_ptr_array_index (removed, i);
-      EmpathyContact *contact;
-      ClutterActor *marker;
-
-      contact = g_hash_table_lookup (priv->contacts, tp_contact);
-      if (contact == NULL)
-        continue;
-
-      marker = g_hash_table_lookup (priv->markers, contact);
-      if (marker != NULL)
-        {
-          clutter_actor_destroy (marker);
-          g_hash_table_remove (priv->markers, contact);
-        }
-
-      g_signal_handlers_disconnect_by_func (contact,
-          map_view_contact_location_notify, self);
-
-      g_hash_table_remove (priv->contacts, tp_contact);
-    }
-}
-
-static GObject *
-empathy_map_view_constructor (GType type,
-    guint n_construct_params,
-    GObjectConstructParam *construct_params)
-{
-  static GObject *window = NULL;
-
-  if (window != NULL)
-    return window;
-
-  window = G_OBJECT_CLASS (empathy_map_view_parent_class)->constructor (
-      type, n_construct_params, construct_params);
-
-  g_object_add_weak_pointer (window, (gpointer) &window);
-
-  return window;
-}
-
-static void
-empathy_map_view_finalize (GObject *object)
-{
-  EmpathyMapViewPriv *priv = GET_PRIV (object);
-  GHashTableIter iter;
-  gpointer contact;
-
-  g_source_remove (priv->timeout_id);
-
-  g_hash_table_iter_init (&iter, priv->markers);
-  while (g_hash_table_iter_next (&iter, &contact, NULL))
-    g_signal_handlers_disconnect_by_func (contact,
-        map_view_contact_location_notify, object);
-
-  g_hash_table_unref (priv->markers);
-  g_object_unref (priv->aggregator);
-  g_object_unref (priv->layer);
-  g_hash_table_unref (priv->contacts);
-
-  G_OBJECT_CLASS (empathy_map_view_parent_class)->finalize (object);
-}
-
-static void
-empathy_map_view_class_init (EmpathyMapViewClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->constructor = empathy_map_view_constructor;
-  object_class->finalize = empathy_map_view_finalize;
-
-  g_type_class_add_private (object_class, sizeof (EmpathyMapViewPriv));
-}
-
-static void
-empathy_map_view_init (EmpathyMapView *self)
-{
-  EmpathyMapViewPriv *priv;
-  GtkBuilder *gui;
-  GtkWidget *sw;
-  GtkWidget *embed;
-  GtkWidget *throbber_holder;
-  gchar *filename;
-  GPtrArray *contacts, *empty;
-  GtkWidget *main_vbox;
-
-  priv = self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      EMPATHY_TYPE_MAP_VIEW, EmpathyMapViewPriv);
-
-  gtk_window_set_title (GTK_WINDOW (self), _("Contact Map View"));
-  gtk_window_set_role (GTK_WINDOW (self), "map_view");
-  gtk_window_set_default_size (GTK_WINDOW (self), 512, 384);
-  gtk_window_set_position (GTK_WINDOW (self), GTK_WIN_POS_CENTER);
-
-  /* Set up interface */
-  filename = empathy_file_lookup ("empathy-map-view.ui", "src");
-  gui = empathy_builder_get_file (filename,
-     "main_vbox", &main_vbox,
-     "zoom_in", &priv->zoom_in,
-     "zoom_out", &priv->zoom_out,
-     "map_scrolledwindow", &sw,
-     "throbber", &throbber_holder,
-     NULL);
-  g_free (filename);
-
-  gtk_container_add (GTK_CONTAINER (self), main_vbox);
-
-  empathy_builder_connect (gui, self,
-      "zoom_in", "clicked", map_view_zoom_in_cb,
-      "zoom_out", "clicked", map_view_zoom_out_cb,
-      "zoom_fit", "clicked", map_view_zoom_fit_cb,
-      NULL);
-
-  g_signal_connect (self, "key-press-event",
-      G_CALLBACK (map_view_key_press_cb), self);
-
-  g_object_unref (gui);
-
-  priv->throbber = gtk_spinner_new ();
-  gtk_widget_set_size_request (priv->throbber, 16, 16);
-  gtk_container_add (GTK_CONTAINER (throbber_holder), priv->throbber);
-
-  /* Set up map view */
-  embed = gtk_champlain_embed_new ();
-  priv->map_view = gtk_champlain_embed_get_view (GTK_CHAMPLAIN_EMBED (embed));
-  g_object_set (G_OBJECT (priv->map_view),
-     "zoom-level", 1,
-     "kinetic-mode", TRUE,
-     NULL);
-  champlain_view_center_on (priv->map_view, 36, 0);
-
-  gtk_container_add (GTK_CONTAINER (sw), embed);
-  gtk_widget_show_all (embed);
-
-  priv->layer = g_object_ref (champlain_marker_layer_new ());
-  champlain_view_add_layer (priv->map_view, CHAMPLAIN_LAYER (priv->layer));
-
-  g_signal_connect (priv->map_view, "notify::state",
-      G_CALLBACK (map_view_state_changed), self);
-
-  /* Set up contact list. */
-  priv->markers = g_hash_table_new_full (NULL, NULL,
-      (GDestroyNotify) g_object_unref, NULL);
-
-  priv->aggregator = empathy_connection_aggregator_dup_singleton ();
-  priv->contacts = g_hash_table_new_full (NULL, NULL, g_object_unref,
-      g_object_unref);
-
-  tp_g_signal_connect_object (priv->aggregator, "contact-list-changed",
-      G_CALLBACK (contact_list_changed_cb), self, 0);
-
-  contacts = empathy_connection_aggregator_dup_all_contacts (priv->aggregator);
-  empty = g_ptr_array_new ();
-
-  contact_list_changed_cb (priv->aggregator, contacts, empty, self);
-
-  g_ptr_array_unref (contacts);
-  g_ptr_array_unref (empty);
-
-  /* Set up time updating loop */
-  priv->timeout_id = g_timeout_add_seconds (5,
-      (GSourceFunc) map_view_tick, self);
-}
-
-GtkWidget *
-empathy_map_view_show (void)
-{
-  GtkWidget *window;
-
-  window = g_object_new (EMPATHY_TYPE_MAP_VIEW, NULL);
-  gtk_widget_show_all (window);
-  empathy_window_present (GTK_WINDOW (window));
-
-  return window;
-}
diff --git a/src/empathy-map-view.h b/src/empathy-map-view.h
deleted file mode 100644
index 3184b8c9e..000000000
--- a/src/empathy-map-view.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2008 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
- */
-
-#ifndef __EMPATHY_MAP_VIEW_H__
-#define __EMPATHY_MAP_VIEW_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define EMPATHY_TYPE_MAP_VIEW         (empathy_map_view_get_type ())
-#define EMPATHY_MAP_VIEW(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_MAP_VIEW, EmpathyMapView))
-#define EMPATHY_MAP_VIEW_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), EMPATHY_TYPE_MAP_VIEW, EmpathyMapViewClass))
-#define EMPATHY_IS_MAP_VIEW(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_MAP_VIEW))
-#define EMPATHY_IS_MAP_VIEW_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_MAP_VIEW))
-#define EMPATHY_MAP_VIEW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_MAP_VIEW, EmpathyMapViewClass))
-
-typedef struct _EmpathyMapView EmpathyMapView;
-typedef struct _EmpathyMapViewClass EmpathyMapViewClass;
-typedef struct _EmpathyMapViewPriv EmpathyMapViewPriv;
-
-struct _EmpathyMapView
-{
-  GtkWindow parent;
-  gpointer priv;
-};
-
-struct _EmpathyMapViewClass
-{
-  GtkWindowClass parent_class;
-};
-
-GType empathy_map_view_get_type (void);
-
-GtkWidget *empathy_map_view_show (void);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_MAP_VIEW_H__ */
diff --git a/src/empathy-map-view.ui b/src/empathy-map-view.ui
deleted file mode 100644
index 715de8fa4..000000000
--- a/src/empathy-map-view.ui
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkVBox" id="main_vbox">
-    <property name="visible">True</property>
-    <child>
-      <object class="GtkToolbar" id="toolbar">
-        <property name="visible">True</property>
-        <child>
-          <object class="GtkToolButton" id="zoom_in">
-            <property name="visible">True</property>
-            <property name="stock_id">gtk-zoom-in</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToolButton" id="zoom_out">
-            <property name="visible">True</property>
-            <property name="stock_id">gtk-zoom-out</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToolButton" id="zoom_fit">
-            <property name="visible">True</property>
-            <property name="stock_id">gtk-zoom-fit</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToolItem" id="toolbutton1">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkAlignment" id="alignment1">
-                <property name="visible">True</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToolItem" id="throbber">
-            <property name="visible">True</property>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkFrame" id="map_scrolledwindow">
-        <property name="visible">True</property>
-        <property name="resize_mode">queue</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">in</property>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-      <packing>
-        <property name="position">1</property>
-      </packing>
-    </child>
-  </object>
-</interface>
diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index 5d9898153..afe3a4e60 100644
--- a/src/empathy-roster-window.c
+++ b/src/empathy-roster-window.c
@@ -67,7 +67,6 @@
 #include "empathy-about-dialog.h"
 #include "empathy-debug-window.h"
 #include "empathy-new-chatroom-dialog.h"
-#include "empathy-map-view.h"
 #include "empathy-chatrooms-window.h"
 #include "empathy-event-manager.h"
 #include "empathy-ft-manager.h"
@@ -1368,16 +1367,6 @@ roster_window_edit_search_contacts_cb (GSimpleAction *action,
 }
 
 static void
-roster_window_view_show_map_cb (GSimpleAction *action,
-    GVariant *parameter,
-    gpointer user_data)
-{
-#ifdef HAVE_LIBCHAMPLAIN
-  empathy_map_view_show ();
-#endif
-}
-
-static void
 join_chatroom (EmpathyChatroom *chatroom,
     gint64 timestamp)
 {
@@ -2027,7 +2016,6 @@ static GActionEntry menubar_entries[] = {
 
   { "view_history", roster_window_view_history_cb, NULL, NULL, NULL },
   { "view_show_ft_manager", roster_window_view_show_ft_manager, NULL, NULL, NULL },
-  { "view_show_map", roster_window_view_show_map_cb, NULL, NULL, NULL },
 
   { "room_join_new", roster_window_room_join_new_cb, NULL, NULL, NULL },
   { "room_join_favorites", roster_window_room_join_favorites_cb, NULL, NULL, NULL },