[empathy] Move the 'Show previous conversation' menu entry
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Move the 'Show previous conversation' menu entry
- Date: Fri, 26 Aug 2011 10:22:24 +0000 (UTC)
commit 7bae092e57e57103fa543d66c0bb11ac3ba4d43d
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Fri Aug 26 12:19:08 2011 +0200
Move the 'Show previous conversation' menu entry
It used to be right in the middle of actions on the contact.
libempathy-gtk/empathy-contact-menu.c | 14 +++++++-------
libempathy-gtk/empathy-individual-menu.c | 16 ++++++++--------
2 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c
index 60e7052..030ab82 100644
--- a/libempathy-gtk/empathy-contact-menu.c
+++ b/libempathy-gtk/empathy-contact-menu.c
@@ -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);
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index eab28ec..6558061 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -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)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]