diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-05-23 00:07:55 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-05-23 00:07:55 +0800 |
| commit | 866aa89a1f3fac72f8ef48f076dccf7b0e4c59d0 (patch) | |
| tree | 9f2226485fb86c7432adf297f255f4217e10b998 | |
| parent | 02ce3c9a8c3baff0c53a548cde8b959e6ec5c9b8 (diff) | |
| download | gsoc2013-empathy-866aa89a1f3fac72f8ef48f076dccf7b0e4c59d0.tar gsoc2013-empathy-866aa89a1f3fac72f8ef48f076dccf7b0e4c59d0.tar.gz gsoc2013-empathy-866aa89a1f3fac72f8ef48f076dccf7b0e4c59d0.tar.bz2 gsoc2013-empathy-866aa89a1f3fac72f8ef48f076dccf7b0e4c59d0.tar.lz gsoc2013-empathy-866aa89a1f3fac72f8ef48f076dccf7b0e4c59d0.tar.xz gsoc2013-empathy-866aa89a1f3fac72f8ef48f076dccf7b0e4c59d0.tar.zst gsoc2013-empathy-866aa89a1f3fac72f8ef48f076dccf7b0e4c59d0.zip | |
move 'View Previous Conversations' menu entry to View
| -rw-r--r-- | src/empathy-main-window.c | 10 | ||||
| -rw-r--r-- | src/empathy-main-window.ui | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index cef3732b1..d453fed44 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -93,7 +93,7 @@ typedef struct { GtkWidget *errors_vbox; GtkUIManager *ui_manager; - GtkAction *chat_history; + GtkAction *view_history; GtkAction *room_join_favorites; GtkWidget *room_menu; GtkWidget *room_separator; @@ -663,7 +663,7 @@ main_window_chat_quit_cb (GtkAction *action, } static void -main_window_chat_history_cb (GtkAction *action, +main_window_view_history_cb (GtkAction *action, EmpathyMainWindow *window) { empathy_log_window_show (NULL, NULL, FALSE, GTK_WINDOW (window->window)); @@ -993,7 +993,7 @@ main_window_account_created_or_deleted_cb (EmpathyAccountManager *manager, McAccount *account, EmpathyMainWindow *window) { - gtk_action_set_sensitive (window->chat_history, + gtk_action_set_sensitive (window->view_history, empathy_account_manager_get_count (manager) > 0); } @@ -1120,7 +1120,7 @@ empathy_main_window_show (void) "errors_vbox", &window->errors_vbox, "ui_manager", &window->ui_manager, "view_show_offline", &show_offline_widget, - "chat_history", &window->chat_history, + "view_history", &window->view_history, "room_join_favorites", &window->room_join_favorites, "presence_toolbar", &window->presence_toolbar, "roster_scrolledwindow", &sw, @@ -1132,7 +1132,7 @@ empathy_main_window_show (void) "main_window", "configure_event", main_window_configure_event_cb, "chat_quit", "activate", main_window_chat_quit_cb, "chat_new_message", "activate", main_window_chat_new_message_cb, - "chat_history", "activate", main_window_chat_history_cb, + "view_history", "activate", main_window_view_history_cb, "room_join_new", "activate", main_window_room_join_new_cb, "room_join_favorites", "activate", main_window_room_join_favorites_cb, "room_manage_favorites", "activate", main_window_room_manage_favorites_cb, diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui index bf9ebbca4..14660b75c 100644 --- a/src/empathy-main-window.ui +++ b/src/empathy-main-window.ui @@ -19,9 +19,9 @@ <accelerator key="N" modifiers="GDK_CONTROL_MASK"/> </child> <child> - <object class="GtkAction" id="chat_history"> + <object class="GtkAction" id="view_history"> <property name="icon-name">document-open-recent</property> - <property name="name">chat_history</property> + <property name="name">view_history</property> <property name="label" translatable="yes">_View Previous Conversations</property> </object> <accelerator key="F3" modifiers=""/> @@ -144,7 +144,6 @@ <menubar name="menubar"> <menu action="chat"> <menuitem action="chat_new_message"/> - <menuitem action="chat_history"/> <separator/> <menuitem action="chat_add_contact"/> <separator/> @@ -161,6 +160,7 @@ <menu action="view"> <menuitem action="view_show_offline"/> <separator/> + <menuitem action="view_history"/> <menuitem action="view_show_ft_manager"/> </menu> <menu action="room"> |