]> git.0d.be Git - empathy.git/commitdiff
Move the 'Show previous conversation' menu entry
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 26 Aug 2011 10:19:08 +0000 (12:19 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 26 Aug 2011 10:19:08 +0000 (12:19 +0200)
It used to be right in the middle of actions on the contact.

libempathy-gtk/empathy-contact-menu.c
libempathy-gtk/empathy-individual-menu.c

index 60e7052ea3711e7974ee177910c31afec838f94c..030ab8290fd3b25373917a01b9597b0036444639 100644 (file)
@@ -86,13 +86,6 @@ empathy_contact_menu_new (EmpathyContact             *contact,
                gtk_widget_show (item);
        }
 
-       /* Log */
-       if (features & EMPATHY_CONTACT_FEATURE_LOG) {
-               item = empathy_contact_log_menu_item_new (contact);
-               gtk_menu_shell_append (shell, item);
-               gtk_widget_show (item);
-       }
-
        /* Invite */
        item = empathy_contact_invite_menu_item_new (contact);
        gtk_menu_shell_append (shell, item);
@@ -128,6 +121,13 @@ empathy_contact_menu_new (EmpathyContact             *contact,
                gtk_widget_show (item);
        }
 
+       /* Log */
+       if (features & EMPATHY_CONTACT_FEATURE_LOG) {
+               item = empathy_contact_log_menu_item_new (contact);
+               gtk_menu_shell_append (shell, item);
+               gtk_widget_show (item);
+       }
+
        /* Info */
        if (features & EMPATHY_CONTACT_FEATURE_INFO) {
                item = empathy_contact_info_menu_item_new (contact);
index eab28ec876c163a7b6c84b5f105165697bc0c62e..6558061190f59708e360a37138d60a8236930d85 100644 (file)
@@ -285,14 +285,6 @@ constructed (GObject *object)
       gtk_widget_show (item);
     }
 
-  /* Log */
-  if (features & EMPATHY_INDIVIDUAL_FEATURE_LOG)
-    {
-      item = empathy_individual_log_menu_item_new (individual, NULL);
-      gtk_menu_shell_append (shell, item);
-      gtk_widget_show (item);
-    }
-
   /* Invite */
   item = empathy_individual_invite_menu_item_new (individual, NULL);
   gtk_menu_shell_append (shell, item);
@@ -344,6 +336,14 @@ constructed (GObject *object)
       gtk_widget_show (item);
     }
 
+  /* Log */
+  if (features & EMPATHY_INDIVIDUAL_FEATURE_LOG)
+    {
+      item = empathy_individual_log_menu_item_new (individual, NULL);
+      gtk_menu_shell_append (shell, item);
+      gtk_widget_show (item);
+    }
+
   /* Info */
   if (features & EMPATHY_INDIVIDUAL_FEATURE_INFO)
     {