Skip to content
  • Gerald Combs's avatar
    417bdf8e
    Copy over revisions from the trunk: · 417bdf8e
    Gerald Combs authored
      ------------------------------------------------------------------------
      r43343 | tuexen | 2012-06-18 14:50:59 -0700 (Mon, 18 Jun 2012) | 2 lines
      Changed paths:
         M /trunk/dumpcap.c
    
      Fix compilation on FreeBSD.
      ------------------------------------------------------------------------
      r43345 | etxrab | 2012-06-18 23:08:58 -0700 (Mon, 18 Jun 2012) | 12 lines
      Changed paths:
         M /trunk/ui/gtk/capture_if_dlg.c
    
      From Pontus Fuchs:
      If there are many interfaces the button bar is not visible
      unless you manually resize the dialog. On a normal Linux PC
      you can easily reach 15-20 interfaces due to USB monitor.
    
      Add a vbox so that you get a scrollbar for the interface table
      instead of on the window. This way the button bar is always
      visible.
    
      Also increase the default height to handle 20 interfaces.
    
      https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7379
      ------------------------------------------------------------------------
      r43362 | darkjames | 2012-06-19 07:25:50 -0700 (Tue, 19 Jun 2012) | 4 lines
      Changed paths:
         M /trunk/epan/dissectors/packet-gsm_sms.c
    
      Fix bug #7378: Wireshark 1.8.0rc1: gsm_a_dtap SMS 7-bit default alphabet regression w.r.t. 1.6.8
    
      proto_item_add_string() can be only used with ASCII strings.
      ------------------------------------------------------------------------
      r43367 | etxrab | 2012-06-19 07:49:12 -0700 (Tue, 19 Jun 2012) | 2 lines
      Changed paths:
         M /trunk/ui/gtk/CMakeLists.txt
         M /trunk/ui/gtk/main_menubar.c
    
      Get rid of the remnats of NEW_MENU_CODE.
      It's probably not a good idea to read the menu bar code from file as it causes problems with permissions when Wireshark is run fom build dir.
      ------------------------------------------------------------------------
      r43368 | etxrab | 2012-06-19 07:54:11 -0700 (Tue, 19 Jun 2012) | 1 line
      Changed paths:
         M /trunk/Makefile.am
         M /trunk/packaging/nsis/wireshark.nsi
    
      Don't install main-menubar-ui.xml
      ------------------------------------------------------------------------
      r43370 | morriss | 2012-06-19 08:39:52 -0700 (Tue, 19 Jun 2012) | 9 lines
      Changed paths:
         M /trunk/Makefile.am
         M /trunk/debian/rules
         M /trunk/doc/Makefile.am
    
      Don't install idl2wrs except in Debian's special wireshark-dev package.
    
      (Normal Wireshark installations can't be used to develop dissectors so there's
      no need to install it or its man page.)
    
      http://www.wireshark.org/lists/wireshark-dev/201206/msg00073.html
    
      (The Debian changes are untested.)
      ------------------------------------------------------------------------
      r43371 | gerald | 2012-06-19 08:44:10 -0700 (Tue, 19 Jun 2012) | 2 lines
      Changed paths:
         M /trunk/doc/tshark.pod
         M /trunk/doc/wireshark-filter.pod
    
      Remove what appears to be an errant vi/vim command and add a newline.
      ------------------------------------------------------------------------
      r43377 | morriss | 2012-06-19 10:32:49 -0700 (Tue, 19 Jun 2012) | 1 line
      Changed paths:
         M /trunk/packaging/macosx/Scripts/cli-postinstall.sh
         M /trunk/packaging/macosx/osx-app.sh
         M /trunk/packaging/nsis/Makefile.nmake
    
      Followup to r43370: don't install idl2wrs or its man page.
      ------------------------------------------------------------------------
    
    svn path=/trunk-1.8/; revision=43378
    417bdf8e
    Copy over revisions from the trunk:
    Gerald Combs authored
      ------------------------------------------------------------------------
      r43343 | tuexen | 2012-06-18 14:50:59 -0700 (Mon, 18 Jun 2012) | 2 lines
      Changed paths:
         M /trunk/dumpcap.c
    
      Fix compilation on FreeBSD.
      ------------------------------------------------------------------------
      r43345 | etxrab | 2012-06-18 23:08:58 -0700 (Mon, 18 Jun 2012) | 12 lines
      Changed paths:
         M /trunk/ui/gtk/capture_if_dlg.c
    
      From Pontus Fuchs:
      If there are many interfaces the button bar is not visible
      unless you manually resize the dialog. On a normal Linux PC
      you can easily reach 15-20 interfaces due to USB monitor.
    
      Add a vbox so that you get a scrollbar for the interface table
      instead of on the window. This way the button bar is always
      visible.
    
      Also increase the default height to handle 20 interfaces.
    
      https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7379
      ------------------------------------------------------------------------
      r43362 | darkjames | 2012-06-19 07:25:50 -0700 (Tue, 19 Jun 2012) | 4 lines
      Changed paths:
         M /trunk/epan/dissectors/packet-gsm_sms.c
    
      Fix bug #7378: Wireshark 1.8.0rc1: gsm_a_dtap SMS 7-bit default alphabet regression w.r.t. 1.6.8
    
      proto_item_add_string() can be only used with ASCII strings.
      ------------------------------------------------------------------------
      r43367 | etxrab | 2012-06-19 07:49:12 -0700 (Tue, 19 Jun 2012) | 2 lines
      Changed paths:
         M /trunk/ui/gtk/CMakeLists.txt
         M /trunk/ui/gtk/main_menubar.c
    
      Get rid of the remnats of NEW_MENU_CODE.
      It's probably not a good idea to read the menu bar code from file as it causes problems with permissions when Wireshark is run fom build dir.
      ------------------------------------------------------------------------
      r43368 | etxrab | 2012-06-19 07:54:11 -0700 (Tue, 19 Jun 2012) | 1 line
      Changed paths:
         M /trunk/Makefile.am
         M /trunk/packaging/nsis/wireshark.nsi
    
      Don't install main-menubar-ui.xml
      ------------------------------------------------------------------------
      r43370 | morriss | 2012-06-19 08:39:52 -0700 (Tue, 19 Jun 2012) | 9 lines
      Changed paths:
         M /trunk/Makefile.am
         M /trunk/debian/rules
         M /trunk/doc/Makefile.am
    
      Don't install idl2wrs except in Debian's special wireshark-dev package.
    
      (Normal Wireshark installations can't be used to develop dissectors so there's
      no need to install it or its man page.)
    
      http://www.wireshark.org/lists/wireshark-dev/201206/msg00073.html
    
      (The Debian changes are untested.)
      ------------------------------------------------------------------------
      r43371 | gerald | 2012-06-19 08:44:10 -0700 (Tue, 19 Jun 2012) | 2 lines
      Changed paths:
         M /trunk/doc/tshark.pod
         M /trunk/doc/wireshark-filter.pod
    
      Remove what appears to be an errant vi/vim command and add a newline.
      ------------------------------------------------------------------------
      r43377 | morriss | 2012-06-19 10:32:49 -0700 (Tue, 19 Jun 2012) | 1 line
      Changed paths:
         M /trunk/packaging/macosx/Scripts/cli-postinstall.sh
         M /trunk/packaging/macosx/osx-app.sh
         M /trunk/packaging/nsis/Makefile.nmake
    
      Followup to r43370: don't install idl2wrs or its man page.
      ------------------------------------------------------------------------
    
    svn path=/trunk-1.8/; revision=43378
Loading