diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-08-26 18:19:08 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-08-26 18:19:08 +0800 |
| commit | 7bae092e57e57103fa543d66c0bb11ac3ba4d43d (patch) | |
| tree | 4d1cd497fd941f825add444cbd7ab66618c3f408 | |
| parent | 3e1f9c3f49a1b6b3e317d23958b5eaaf77c0b097 (diff) | |
| download | gsoc2013-empathy-7bae092e57e57103fa543d66c0bb11ac3ba4d43d.tar gsoc2013-empathy-7bae092e57e57103fa543d66c0bb11ac3ba4d43d.tar.gz gsoc2013-empathy-7bae092e57e57103fa543d66c0bb11ac3ba4d43d.tar.bz2 gsoc2013-empathy-7bae092e57e57103fa543d66c0bb11ac3ba4d43d.tar.lz gsoc2013-empathy-7bae092e57e57103fa543d66c0bb11ac3ba4d43d.tar.xz gsoc2013-empathy-7bae092e57e57103fa543d66c0bb11ac3ba4d43d.tar.zst gsoc2013-empathy-7bae092e57e57103fa543d66c0bb11ac3ba4d43d.zip | |
Move the 'Show previous conversation' menu entry
It used to be right in the middle of actions on the contact.
| -rw-r--r-- | libempathy-gtk/empathy-contact-menu.c | 14 | ||||
| -rw-r--r-- | 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 60e7052ea..030ab8290 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 eab28ec87..655806119 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) { |