[empathy] Move "Clear" to end of context menu

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 0866484ffb1b3185ecc290f3d903a161f7fd458f
Author: twoscomplement <skylerhawthorne gmail com>
Date:   Fri Sep 6 22:13:48 2013 -0700

    Move "Clear" to end of context menu
    
    Having the "Clear" option at the top of the menu is user-unfriendly, as
    it is easy to click it accidentally, thereby inadvertently clearing
    their chat history. This moves the Clear option to the end of the
    right-click context menu, as well as in the toolbar options.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=641337

 libempathy-gtk/empathy-webkit-utils.c |    4 ++--
 src/empathy-chat-window.ui            |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/libempathy-gtk/empathy-webkit-utils.c b/libempathy-gtk/empathy-webkit-utils.c
index 90dc28c..e119a7e 100644
--- a/libempathy-gtk/empathy-webkit-utils.c
+++ b/libempathy-gtk/empathy-webkit-utils.c
@@ -263,10 +263,10 @@ empathy_webkit_create_context_menu (WebKitWebView *view,
   if (flags & EMPATHY_WEBKIT_MENU_CLEAR)
     {
       item = gtk_separator_menu_item_new ();
-      gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), item);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 
       item = gtk_image_menu_item_new_from_stock (GTK_STOCK_CLEAR, NULL);
-      gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), item);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 
       g_signal_connect_swapped (item, "activate",
           G_CALLBACK (empathy_theme_adium_clear),
diff --git a/src/empathy-chat-window.ui b/src/empathy-chat-window.ui
index 4901978..88d4e87 100644
--- a/src/empathy-chat-window.ui
+++ b/src/empathy-chat-window.ui
@@ -185,12 +185,12 @@
           <menuitem action="menu_conv_join_chat"/>
           <menuitem action="menu_conv_leave_chat"/>
           <separator/>
-          <menuitem action="menu_conv_clear"/>
           <menuitem action="menu_conv_insert_smiley"/>
           <menuitem action="menu_conv_favorite"/>
           <menuitem action="menu_conv_always_urgent"/>
           <menuitem action="menu_conv_toggle_contacts"/>
           <menuitem action="menu_conv_invite_participant"/>
+          <menuitem action="menu_conv_clear"/>
           <separator/>
           <menuitem action="menu_conv_close"/>
         </menu>