diff options
author | Anders Broman <anders.broman@ericsson.com> | 2010-10-04 11:21:01 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2010-10-04 11:21:01 +0000 |
commit | 5ecf33cbc67a86021a0fbf85338ce84273662b25 (patch) | |
tree | a7383df4ca33935dcab199b9487869e68e29a2af /gtk/menus.c | |
parent | ac7c3787b57eb772741d5e22d362a6b29a516c6f (diff) |
(GUIManager)set time display format(makes file load work again).
svn path=/trunk/; revision=34364
Diffstat (limited to 'gtk/menus.c')
-rw-r--r-- | gtk/menus.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gtk/menus.c b/gtk/menus.c index 1dffde9485..c13139102c 100644 --- a/gtk/menus.c +++ b/gtk/menus.c @@ -5366,7 +5366,7 @@ menu_recent_read_finished(void) { } break; case(TS_EPOCH): - menu = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/TimeDisplayFormat/TimeDisplayFormat/SecondsSinceEpoch"); + menu = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/TimeDisplayFormat/SecondsSinceEpoch"); if(!menu){ g_warning("menu_recent_read_finished: No menu found, path= /Menubar/ViewMenu/TimeDisplayFormat/SecondsSinceEpoch"); } @@ -5473,10 +5473,16 @@ menu_recent_read_finished(void) { recent.gui_seconds_format = timestamp_get_seconds_type(); } #ifdef MAIN_MENU_USE_UIMANAGER - /* XXX Fix me */ + menu = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/TimeDisplayFormat/DisplaySecondsWithHoursAndMinutes"); + if(!menu){ + g_warning("menu_recent_read_finished: No menu found, path= /Menubar/ViewMenu/TimeDisplayFormat/DisplaySecondsWithHoursAndMinutes"); + } + #else menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Time Display Format/Display Seconds with hours and minutes"); +#endif /* MAIN_MENU_USE_UIMANAGER */ + switch (recent.gui_seconds_format) { case TS_SECONDS_DEFAULT: recent.gui_seconds_format = -1; @@ -5493,7 +5499,6 @@ menu_recent_read_finished(void) { default: g_assert_not_reached(); } -#endif /* MAIN_MENU_USE_UIMANAGER */ menu_colorize_changed(recent.packet_list_colorize); #ifdef MENUS_USE_UIMANAGER |