Index: libempathy-gtk/empathy-main-window.c
===================================================================
--- libempathy-gtk/empathy-main-window.c	(revisione 239)
+++ libempathy-gtk/empathy-main-window.c	(copia locale)
@@ -82,8 +82,6 @@ typedef struct {
 	GtkWidget              *room_menu;
 	GtkWidget              *room_sep;
 	GtkWidget              *room_join_favorites;
-	GtkWidget              *edit_context;
-	GtkWidget              *edit_context_separator;
 
 	/* Throbber */
 	GtkWidget              *throbber;
@@ -131,9 +129,6 @@ static void     main_window_chat_add_con
 								EmpathyMainWindow               *window);
 static void     main_window_chat_show_offline_cb               (GtkCheckMenuItem                *item,
 								EmpathyMainWindow               *window);
-static gboolean main_window_edit_button_press_event_cb         (GtkWidget                       *widget,
-								GdkEventButton                  *event,
-								EmpathyMainWindow               *window);
 static void     main_window_edit_accounts_cb                   (GtkWidget                       *widget,
 								EmpathyMainWindow               *window);
 static void     main_window_edit_personal_information_cb       (GtkWidget                       *widget,
@@ -209,8 +204,6 @@ empathy_main_window_show (void)
 				       "room", &window->room,
 				       "room_sep", &window->room_sep,
 				       "room_join_favorites", &window->room_join_favorites,
-				       "edit_context", &window->edit_context,
-				       "edit_context_separator", &window->edit_context_separator,
 				       "presence_toolbar", &window->presence_toolbar,
 				       "roster_scrolledwindow", &sw,
 				       NULL);
@@ -227,7 +220,6 @@ empathy_main_window_show (void)
 			      "room_manage_favorites", "activate", main_window_room_manage_favorites_cb,
 			      "chat_add_contact", "activate", main_window_chat_add_contact_cb,
 			      "chat_show_offline", "toggled", main_window_chat_show_offline_cb,
-			      "edit", "button-press-event", main_window_edit_button_press_event_cb,
 			      "edit_accounts", "activate", main_window_edit_accounts_cb,
 			      "edit_personal_information", "activate", main_window_edit_personal_information_cb,
 			      "edit_preferences", "activate", main_window_edit_preferences_cb,
@@ -248,9 +240,6 @@ empathy_main_window_show (void)
 	/* Set up menu */
 	main_window_favorite_chatroom_menu_setup (window);
 
-	gtk_widget_hide (window->edit_context);
-	gtk_widget_hide (window->edit_context_separator);
-
 	/* Set up presence chooser */
 	window->presence_chooser = empathy_presence_chooser_new ();
 	gtk_widget_show (window->presence_chooser);
@@ -590,67 +579,6 @@ main_window_chat_show_offline_cb (GtkChe
 	//empathy_sound_set_enabled (TRUE);
 }
 
-static gboolean
-main_window_edit_button_press_event_cb (GtkWidget         *widget,
-					GdkEventButton    *event,
-					EmpathyMainWindow *window)
-{
-	EmpathyContact *contact;
-	gchar         *group;
-
-	if (!event->button == 1) {
-		return FALSE;
-	}
-
-	group = empathy_contact_list_view_get_selected_group (window->list_view);
-	if (group) {
-		GtkMenuItem *item;
-		GtkWidget   *label;
-		GtkWidget   *submenu;
-
-		item = GTK_MENU_ITEM (window->edit_context);
-		label = gtk_bin_get_child (GTK_BIN (item));
-		gtk_label_set_text (GTK_LABEL (label), _("Group"));
-
-		gtk_widget_show (window->edit_context);
-		gtk_widget_show (window->edit_context_separator);
-
-		submenu = empathy_contact_list_view_get_group_menu (window->list_view);
-		gtk_menu_item_set_submenu (item, submenu);
-
-		g_free (group);
-
-		return FALSE;
-	}
-
-	contact = empathy_contact_list_view_get_selected (window->list_view);
-	if (contact) {
-		GtkMenuItem *item;
-		GtkWidget   *label;
-		GtkWidget   *submenu;
-
-		item = GTK_MENU_ITEM (window->edit_context);
-		label = gtk_bin_get_child (GTK_BIN (item));
-		gtk_label_set_text (GTK_LABEL (label), _("Contact"));
-
-		gtk_widget_show (window->edit_context);
-		gtk_widget_show (window->edit_context_separator);
-
-		submenu = empathy_contact_list_view_get_contact_menu (window->list_view,
-								     contact);
-		gtk_menu_item_set_submenu (item, submenu);
-
-		g_object_unref (contact);
-
-		return FALSE;
-	}
-
-	gtk_widget_hide (window->edit_context);
-	gtk_widget_hide (window->edit_context_separator);
-
-	return FALSE;
-}
-
 static void
 main_window_edit_accounts_cb (GtkWidget         *widget,
 			      EmpathyMainWindow *window)
Index: libempathy-gtk/empathy-main-window.glade
===================================================================
--- libempathy-gtk/empathy-main-window.glade	(revisione 239)
+++ libempathy-gtk/empathy-main-window.glade	(copia locale)
@@ -240,20 +240,6 @@
 		<widget class="GtkMenu" id="edit_menu">
 
 		  <child>
-		    <widget class="GtkMenuItem" id="edit_context">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Context</property>
-		      <property name="use_underline">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="edit_context_separator">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
 		    <widget class="GtkMenuItem" id="edit_accounts">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Accounts</property>
