[empathy: 2/3] Remove dead map view component



commit 0fd15cbdf2f7c33f4841f8347fbc990a6beb8c36
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Wed May 16 16:52:12 2012 +1000

    Remove dead map view component

 src/Makefile.am             |   14 -
 src/empathy-map-view.c      |  556 -------------------------------------------
 src/empathy-map-view.h      |   56 -----
 src/empathy-map-view.ui     |   89 -------
 src/empathy-roster-window.c |   12 -
 5 files changed, 0 insertions(+), 727 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index f511b40..ef7af74 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-roster-window.c b/src/empathy-roster-window.c
index 5d98981..afe3a4e 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 },



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]