diff -rup xchat-gnome-0.10.orig/data/xchat-gnome-ui.xml xchat-gnome-0.10/data/xchat-gnome-ui.xml --- xchat-gnome-0.10.orig/data/xchat-gnome-ui.xml 2006-03-19 22:32:59.000000000 +0100 +++ xchat-gnome-0.10/data/xchat-gnome-ui.xml 2006-03-19 22:53:47.000000000 +0100 @@ -12,7 +12,6 @@ - @@ -34,7 +33,6 @@ - @@ -83,7 +81,6 @@ - @@ -94,7 +91,6 @@ - diff -rup xchat-gnome-0.10.orig/src/fe-gnome/main-window.c xchat-gnome-0.10/src/fe-gnome/main-window.c --- xchat-gnome-0.10.orig/src/fe-gnome/main-window.c 2006-03-19 22:32:59.000000000 +0100 +++ xchat-gnome-0.10/src/fe-gnome/main-window.c 2006-03-19 23:06:38.000000000 +0100 @@ -63,7 +63,6 @@ static void on_irc_quit_activate (GtkAct static void on_edit_cut_activate (GtkAction *action, gpointer data); static void on_edit_copy_activate (GtkAction *action, gpointer data); static void on_edit_paste_activate (GtkAction *action, gpointer data); -static void on_edit_clear_activate (GtkAction *action, gpointer data); static void on_edit_preferences_activate (GtkAction *action, gpointer data); static void on_network_information_activate (GtkAction *action, gpointer data); static void on_network_reconnect_activate (GtkAction *action, gpointer data); @@ -74,7 +73,6 @@ static void on_discussion_save_activate static void on_discussion_leave_activate (GtkAction *action, gpointer data); static void on_discussion_close_activate (GtkAction *action, gpointer data); static void on_discussion_find_activate (GtkAction *action, gpointer data); -static void on_discussion_clear_window_activate (GtkAction *action, gpointer data); static void on_discussion_bans_activate (GtkAction *action, gpointer data); static void on_discussion_topic_change_activate (GtkButton *widget, gpointer data); static void on_discussion_users_activate (GtkAction *action, gpointer data); @@ -115,7 +113,6 @@ static GtkActionEntry action_entries [] { "EditCut", GTK_STOCK_CUT, N_("Cu_t"), "X", NULL, G_CALLBACK (on_edit_cut_activate) }, { "EditCopy", GTK_STOCK_COPY, N_("_Copy"), "C", NULL, G_CALLBACK (on_edit_copy_activate) }, { "EditPaste", GTK_STOCK_PASTE, N_("_Paste"), "V", NULL, G_CALLBACK (on_edit_paste_activate) }, - { "EditClear", GTK_STOCK_CLEAR, N_("C_lear"), "", NULL, G_CALLBACK (on_edit_clear_activate) }, { "EditPreferences", GTK_STOCK_PREFERENCES, N_("Prefere_nces"), "", NULL, G_CALLBACK (on_edit_preferences_activate) }, /* Network menu */ @@ -130,7 +127,6 @@ static GtkActionEntry action_entries [] { "DiscussionLeave", GTK_STOCK_QUIT, N_("_Leave"), "", NULL, G_CALLBACK (on_discussion_leave_activate) }, { "DiscussionClose", GTK_STOCK_CLOSE, N_("Cl_ose"), "W", NULL, G_CALLBACK (on_discussion_close_activate) }, { "DiscussionFind", GTK_STOCK_FIND, N_("_Find"), "F", NULL, G_CALLBACK (on_discussion_find_activate) }, - { "DiscussionClearWindow", GTK_STOCK_CLEAR, N_("_Clear Window"), "L", NULL, G_CALLBACK (on_discussion_clear_window_activate) }, { "DiscussionChangeTopic", GTK_STOCK_REFRESH, N_("Change _Topic"), "T", NULL, G_CALLBACK (on_discussion_topic_change_activate) }, { "DiscussionBans", GTK_STOCK_DIALOG_WARNING, N_("_Bans..."), "B", NULL, G_CALLBACK (on_discussion_bans_activate) }, { "DiscussionUsers", NULL, N_("_Users"), "U", NULL, G_CALLBACK (on_discussion_users_activate) }, @@ -395,12 +391,6 @@ on_edit_paste_activate (GtkAction *actio } static void -on_edit_clear_activate (GtkAction *action, gpointer data) -{ - gtk_editable_delete_selection(GTK_EDITABLE(gui.text_entry)); -} - -static void on_edit_preferences_activate (GtkAction *action, gpointer data) { PreferencesDialog *dialog; @@ -525,12 +515,6 @@ on_discussion_find_activate (GtkAction * } static void -on_discussion_clear_window_activate (GtkAction *action, gpointer data) -{ - conversation_panel_clear (CONVERSATION_PANEL (gui.conversation_panel), gui.current_session); -} - -static void on_discussion_bans_activate (GtkAction *action, gpointer data) { /* FIXME: implement */ Les fichiers binaires xchat-gnome-0.10.orig/src/fe-gnome/.main-window.c.swp et xchat-gnome-0.10/src/fe-gnome/.main-window.c.swp sont différents. diff -rup xchat-gnome-0.10.orig/src/fe-gnome/navigation-tree.c xchat-gnome-0.10/src/fe-gnome/navigation-tree.c --- xchat-gnome-0.10.orig/src/fe-gnome/navigation-tree.c 2006-03-19 22:32:59.000000000 +0100 +++ xchat-gnome-0.10/src/fe-gnome/navigation-tree.c 2006-03-19 22:53:47.000000000 +0100 @@ -69,7 +69,6 @@ static void on_server_channel_list static void on_save (GtkAction *action, gpointer data); static void on_close (GtkAction *action, gpointer data); static void on_find (GtkAction *action, gpointer data); -static void on_clear (GtkAction *action, gpointer data); static void on_channel_leave (GtkAction *action, gpointer data); static void on_channel_bans (GtkAction *action, gpointer data); static void on_server_autoconnect (GtkAction *action, gpointer data); @@ -88,14 +87,12 @@ static GtkActionEntry action_entries[] = {"ChannelLeave", GTK_STOCK_QUIT, N_("_Leave"), "", NULL, G_CALLBACK (on_channel_leave)}, {"ChannelClose", GTK_STOCK_CLOSE, N_("_Close"), "", NULL, G_CALLBACK (on_close)}, {"ChannelFind", GTK_STOCK_FIND, N_("_Find..."), "", NULL, G_CALLBACK (on_find)}, - {"ChannelClear", GTK_STOCK_CLEAR, N_("C_lear"), "", NULL, G_CALLBACK (on_clear)}, {"ChannelBans", GTK_STOCK_DIALOG_WARNING, N_("_Bans..."), "", NULL, G_CALLBACK (on_channel_bans)}, /* Dialog context menu */ {"DialogSave", GTK_STOCK_SAVE, N_("_Save Transcript"), "", NULL, G_CALLBACK (on_save)}, {"DialogClose", GTK_STOCK_CLOSE, N_("_Close"), "", NULL, G_CALLBACK (on_close)}, {"DialogFind", GTK_STOCK_FIND, N_("_Find..."), "", NULL, G_CALLBACK (on_find)}, - {"DialogClear", GTK_STOCK_CLEAR, N_("C_lear"), "", NULL, G_CALLBACK (on_clear)}, }; static GtkToggleActionEntry toggle_action_entries[] = { @@ -1617,16 +1614,6 @@ on_find (GtkAction * action, gpointer da } static void -on_clear (GtkAction * action, gpointer data) -{ - session *s; - - s = navigation_tree_get_selected_session (NULL); - if (s) - conversation_panel_clear (CONVERSATION_PANEL (gui.conversation_panel), s); -} - -static void on_channel_leave (GtkAction * action, gpointer data) { GtkTreeView *treeview;