diff options
author | Anders Broman <anders.broman@ericsson.com> | 2011-08-30 10:25:58 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2011-08-30 10:25:58 +0000 |
commit | ad0533504336156dae75a46e5ed66b9779058050 (patch) | |
tree | 264e4de3c052466b49a56ccf87556e8e263234ac /gtk | |
parent | 61b150caf9e0275799507ee0fc9410733651303b (diff) |
I don't know...perhaps this will satisfy the OS X buildbot
svn path=/trunk/; revision=38794
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/main_menubar.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk/main_menubar.c b/gtk/main_menubar.c index 2f08bdf980..668fc48260 100644 --- a/gtk/main_menubar.c +++ b/gtk/main_menubar.c @@ -4329,12 +4329,12 @@ menu_auto_scroll_live_changed(gboolean auto_scroll_live_in) { #ifdef HAVE_LIBPCAP /* tell toolbar about it */ toolbar_auto_scroll_live_changed(auto_scroll_live_in); -#endif /*HAVE_LIBPCAP */ /* change auto scroll */ if(auto_scroll_live_in != auto_scroll_live) { auto_scroll_live = auto_scroll_live_in; } +#endif /*HAVE_LIBPCAP */ } @@ -4436,13 +4436,14 @@ menu_recent_read_finished(void) { menu_name_resolution_changed(); - menu = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/AutoScrollinLiveCapture"); +#ifdef HAVE_LIBPCAP + menu = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/AutoScrollinLiveCapture"); if(!menu){ g_warning("menu_recent_read_finished: No menu found, path= /Menubar/ViewMenu/AutoScrollinLiveCapture"); }else{ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), auto_scroll_live); } - +#endif main_widgets_rearrange(); /* don't change the time format, if we had a command line value */ |