... as per the XXX comment removed from tshark.c this was a mess to keep the linker
happy... I couldn't!
I did this without even understanding whether calling main_window_update was realy
necessary in most cases. I guess nothing or more specific update cbs would be best.
svn path=/trunk/; revision=50188
Building C object ui/gtk/CMakeFiles/gtkui.dir/print_dlg.c.o
/home/jmayer/work/wireshark/svn/trunk/ui/gtk/print_dlg.c: In function ‘print_cmd_toggle_detail’:
/home/jmayer/work/wireshark/svn/trunk/ui/gtk/print_dlg.c:910:38: error: variable ‘col_headings_cb’ set but not used [-Werror=unused-but-set-variable]
GtkWidget *print_bt, *summary_cb, *col_headings_cb, *details_cb;
^
cc1: all warnings being treated as errors
No idea wether the fix is correct. Compile tested only.
svn path=/trunk/; revision=50047
as the "where to put the packet data" argument.
This lets more of the libwiretap code be common between the read and
seek-read code paths, and also allows for more flexibility in the "fill
in the data" path - we can expand the buffer as needed in both cases.
svn path=/trunk/; revision=49949
Fix crash if you cancel the Flow Graph window while the Graph Analysis window
is still open: close the Graph Analysis window when the user cancels the Flow
Graph window.
From me: do the same thing for the window-delete case.
svn path=/trunk/; revision=49908
Wireshark crashes when analyzing Telephony->VoIP Calls from the pcap file attached.
From me :
Some packets is detect to be T38 and ->stop_fd is not initialize
#Backport 1.10 and 1.8
svn path=/trunk/; revision=49804
register itself in that group, and get rid of its hardcoded menu item.
Also, as the H.225 counter is registering itself, get rid of its
hardcoded menu item.
svn path=/trunk/; revision=49662
names, to avoid confusion. (Action names are not, in fact, paths; we're
just using path syntax for them as a convention.)
svn path=/trunk/; revision=49659
use it o register the MAC and RLC statistics dialogues. Get rid of the
explicit menu items for them, as they now show up in the menu as a
result of the tap registering itself.
svn path=/trunk/; revision=49658
capture menu items, rather than hiding them at run time.
For the capture menu items, translate the GtkAction callback calling
sequence to the normal widget callback calling sequence with individual
routines for each action, rather than a generic translator.
svn path=/trunk/; revision=49649
statistics menu.
Have the CAMEL counter register itself in that menu, rather than having
main_menubar.c create the menu item for it.
svn path=/trunk/; revision=49641
Dialog (wants to) pop up noting no associations, but sctp_set_filter() wants to press on assuming there is an association. Added NULL check to prevent assumption.
svn path=/trunk/; revision=49610
items hardcoded into ui/gtk/main_menubar.c
Get rid of more stuff implying that the code for adding menu items is
used only by Lua, as it's also used by register_param_stat().
Add the items to the menu list sorted by the menu item name shown to the
user.
Get rid of some const declarations that are lies.
Use the label given for a menu item as the label in the menu, rather
than parsing it from a token.
svn path=/trunk/; revision=49552
is in this epan_dissect_t contain the field whose name is passed as an
argument" routine in libwireshark, and use it where we used
packet_is_ssl(). (We should check to see if anything *else* could use
it.)
svn path=/trunk/; revision=49530
code prior to this built on other buildbots *and* on my 10.6 VM, so I
don't know what the GCC on the buildbots is getting wrong....
svn path=/trunk/; revision=49505
it into a separate capture_session structure. capture_opts should
contain only user-specified option information (and stuff directly
derived from it, such as the "capturing from a pipe" flag).
svn path=/trunk/; revision=49493
"Stream" should be changed to "Follow Stream" in the "Sample" textbox and
"Colors" dropdown menu of the "Font and Colors" dialog: This is needed to
draw a distinction between the coloring of packets produced by the
"Follow TCP|UDP|SSL Stream" command and the non-colorized output of
the 'tcp.stream == n' filter.
svn path=/trunk/; revision=49488
When a TCP segment contains the end of two or more SSL PDUs, the TCP reassembly
code passes that segment up to the SSL dissector multiple times--one for each
SSL PDU. The SSL dissector queues the packet for SSL tap listeners each time it
is invoked. Therefore a single packet can be processed by SSL tap listeners
multiple times. But the tap data that the SSL dissector sends to its tap
listeners is a linked list of all PDUs in the packet.
The SSL tap listener responsible for populating the Follow SSL Stream dialog
did not account for the possibility of seeing a packet multiple times. As a
result, it would process the entire linked list of PDUs each time it received a
packet, and that would result in some SSL PDUs showing up two or more times in
the dialog.
This patch fixes the described bug. It also implements a few slight
improvements in closely related code. See bugzilla for details.
svn path=/trunk/; revision=49387
Change "Edit" to "Rename" and add icons to "Manage Profiles..." and "Switch
to...". Update the associated widget, routine, and variable names in order
to facilitate future maintenance.
svn path=/trunk/; revision=49361
the file selection dialog.
Call gtk_file_chooser_set_do_overwrite_confirmation() in
file_selection_new() for FILE_SELECTION_SAVE file selection dialogs,
rather than doing it in the individual callers of file_selection_new().
Use gtk_dialog_set_alternative_button_order() in file_selection_new() to
set the alternative button order, rather than using #ifdefs.
Use file_selection_new() and file_selection_run() in the graph analysis
code. (We should clean up other code that uses file_selection_new() to
use file_selection_run(), and clean up other code that uses
gtk_file_chooser_dialog_new() to use file_selection_new() and
file_selection_run().)
svn path=/trunk/; revision=49308
bit simpler.
Don't bother popping up a window saying "you dragged more than one file,
so we're merging"; presumably that's what they had in mind when they
dragged multiple files. (If that's not what they had in mind, the
window should at least offer a choice to cancel.)
svn path=/trunk/; revision=49293
- tag length is wrong if proto name was a multiple of 4 bytes
- tag length is wrong in case no IP address is available in packet_info structwhile tag is requested
- endianness issue when dumping the port number
- overlapping tag IPv4 Dst address and IPv6 Src address
- do not call dissector when it is not found
- typo errors
Enhancements:
- add a subtree for tag content
- display IPv6 Src/Dst address
svn path=/trunk/; revision=49232
[ 82%] Building C object ui/gtk/CMakeFiles/gtkui.dir/filter_dlg.c.o
/home/jmayer/work/wireshark/svn/trunk/ui/gtk/filter_dlg.c: In function ‘color_filter_te’:
/home/jmayer/work/wireshark/svn/trunk/ui/gtk/filter_dlg.c:1258:5: error: enum conversion when passing argument 2 of ‘gtk_widget_modify_bg’ is invalid in C++ [-Werror=c++-compat]
gtk_widget_modify_bg(w, GTK_STATE_FLAG_NORMAL, &bg);
^
In file included from /usr/include/gtk-3.0/gtk/gtkaction.h:38:0,
from /usr/include/gtk-3.0/gtk/gtkactiongroup.h:38,
from /usr/include/gtk-3.0/gtk/gtkapplication.h:29,
from /usr/include/gtk-3.0/gtk/gtkwindow.h:35,
from /usr/include/gtk-3.0/gtk/gtkdialog.h:35,
from /usr/include/gtk-3.0/gtk/gtkaboutdialog.h:32,
from /usr/include/gtk-3.0/gtk/gtk.h:33,
from /home/jmayer/work/wireshark/svn/trunk/ui/gtk/filter_dlg.c:29:
/usr/include/gtk-3.0/gtk/gtkwidget.h:813:13: note: expected ‘GtkStateType’ but argument is of type ‘int’
void gtk_widget_modify_bg (GtkWidget *widget,
^
/home/jmayer/work/wireshark/svn/trunk/ui/gtk/filter_dlg.c:1258:5: error: passing argument 3 of ‘gtk_widget_modify_bg’ from incompatible pointer type [-Werror]
gtk_widget_modify_bg(w, GTK_STATE_FLAG_NORMAL, &bg);
^
In file included from /usr/include/gtk-3.0/gtk/gtkaction.h:38:0,
from /usr/include/gtk-3.0/gtk/gtkactiongroup.h:38,
from /usr/include/gtk-3.0/gtk/gtkapplication.h:29,
from /usr/include/gtk-3.0/gtk/gtkwindow.h:35,
from /usr/include/gtk-3.0/gtk/gtkdialog.h:35,
from /usr/include/gtk-3.0/gtk/gtkaboutdialog.h:32,
from /usr/include/gtk-3.0/gtk/gtk.h:33,
from /home/jmayer/work/wireshark/svn/trunk/ui/gtk/filter_dlg.c:29:
/usr/include/gtk-3.0/gtk/gtkwidget.h:813:13: note: expected ‘const struct GdkColor *’ but argument is of type ‘struct GdkRGBA *’
void gtk_widget_modify_bg (GtkWidget *widget,
^
cc1: all warnings being treated as errors
make[2]: *** [ui/gtk/CMakeFiles/gtkui.dir/filter_dlg.c.o] Error 1
Also note that
https://developer.gnome.org/gtk3/3.6/GtkWidget.html#gtk-widget-modify-bg
states:
gtk_widget_modify_bg has been deprecated since version 3.0 and should not be used in newly-written code. Use gtk_widget_override_background_color() instead
Of course we are not the only ones who have problems with that replacement:
http://gtk.10911.n7.nabble.com/button-background-color-in-gtk3-td14268.html
which ends with a sort of ugly solution without the deprecated function.
svn path=/trunk/; revision=49169
this triggered the g_assert(linktype) in create_and_fill_model()
the assert is not necessary as both gtk_list_store_set() and g_free()
can handle NULL parameters
remove the assert and add set linktype to "unknown" if the interface
has no linktype
svn path=/trunk/; revision=49071
with enhanced versions from Elliott.
Switch the interface configuration icon to the "gear" version. This
matches the gear in the capture icon.
svn path=/trunk/; revision=49059
than the standard error.
In Wireshark on Windows, create a console before doing so and destroy it
before exiting. Don't do that in TShark or dumpcap, as those are
console-mode programs on Windows.
This should fix bug 8609 and still allow "wireshark -D" and "wireshark
-L" to work when the standard output isn't redirected.
svn path=/trunk/; revision=49025
This is a start to fixing bug 7471 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7471) and is being committed to get the new ABI/API in before the 1.10 release.
What remains is the "GUI portion" (GTK+qt) to indicate to users which UAT entries are invalid.
svn path=/trunk/; revision=48960
"Cast scrolling values to gdoubles, not gfloats - GtkAdjustment have
always taken doubles that I've been able to find, and casting to floats
causes loss of precision and weird bugs when the values get enormous."
svn path=/trunk/; revision=48930
always taken doubles that I've been able to find, and casting to floats
causes loss of precision and weird bugs when the values get enormous.
Should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8460
svn path=/trunk/; revision=48893
IO graph was misbehaving if the packets covered too much real time.
It's still ungodly slow, but at least it seems to work.
svn path=/trunk/; revision=48882
wsiconcap. Make the capture stop icon red. Replace wsiconcap with an
earlier version which has gears instead of a record button.
svn path=/trunk/; revision=48818
that directory since 2001 and reading from that directory was only left in for
backwards compatibility with versions prior to r4702. I think it's now safe
to remove that backwards compatibility.
This eliminates the last argument of get_persconffile_path().
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8437
svn path=/trunk/; revision=48797
it more obvious (particularly at 16x16 pixels) that it and the "start
capture" icons work like media controls.
Update compress-pngs to match the latest version of pngcrush and
recompress our PNGs. Add a "clean-pixmaps" target to ui/gtk/Makefile.am
to make it easier to rebuild our pixbuf includes.
svn path=/trunk/; revision=48776
makes the TDMoE dissector call the LAPD bitstream dissector on the D-Channel. As a result, LAPD calls Q.931, and you can actually see call setup and tear down, instead of just a hex dump.
It adds a preference for which channel the D-Channel is.
It patches the LAPD code to fix a few bugs, not pass the checksum to Q.931 (who isn't expecting it), to register the lapd-bitstream dissector, and to mark packets with aborts or resets.
also storing more data on the lapd_byte_state_t.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8374
svn path=/trunk/; revision=48743
indicates. (Note: "unsaved data" is more than just "unsaved changes";
it could also mean "temporary file that hasn't been saved anywhere".)
svn path=/trunk/; revision=48709
a save can be done ("can" in the sense of "there's something to
save" and in the sense of "we can write that something out");
a "save as" can be done (in the sense of "we can write what we
have out");
there's unsaved data to save (which might be unsaved changes or
might be a temporary file full of packets);
and use them as appropriate. This means that the "unsaved data"
indicator in the UI will be turned on for temporary files full of
packets as well as for files with unsaved changes; that's what we want.
svn path=/trunk/; revision=48693
per-packet comments, don't let the user add/edit/delete per-packet
comments - they can comment all they want, but once Wireshark closes the
file, those comments will be gone.
svn path=/trunk/; revision=48692
supports writing files with a given set of encapsulations and comment
types. Use it, rather than asking for a list of file formats that
support the given set of encapsulation and comment types and checking
whether we got back such a list, or duplicating its logic.
Having file.c use it means that nobody's using
wtap_dump_can_write_encaps() any more; get rid of it. Instead, have a
private routine that checks whether a given file format supports a given
set of encapsulations *and* comment types, and use that internally.
svn path=/trunk/; revision=48690
For each capture file type, have a bitset of comment types supported by
that capture file type.
Add a Wiretap routine that, for a given file type, returns the bitset of
comment types it supports.
Have wtap_get_savable_file_types() take a bitset of comment types that
need to be supported by the file types it returns.
Replace cf_has_comments() with a routine that returns a bitset of
capture file comment types in the capture file.
Use those routines in the capture file dialogs; don't wire in the notion
that pcap-NG supports all comment types and no other file formats
support any comment types. (That's currently true, but we don't want to
wire that in as being forever true.)
svn path=/trunk/; revision=48689
set_titlebar_for_capture_in_progress(); make the call directly, to make
it a bit clearer when it needs to be called (which helps us do the
equivalent in the Qt version).
svn path=/trunk/; revision=48687
ui/gtk/main_titlebar.c, with set_titlebar_for_capture_file() for either
no capture file or an opened capture file and
set_titlebar_for_capture_in_progress() for an in-progress capture.
svn path=/trunk/; revision=48683
it affects more than just the file name, it also affects whatever "you
have unsaved changes" indicator the UI provides.
Put a comment in the Qt code as a reminder of how to set the "you have
unsaved changes" indicator.
svn path=/trunk/; revision=48680
Hex Dump", to clarify that it's not some sort of "generic" import
function, just one that can read a hex dump file. ("Import from Hex
Dump Text" is another possibility.) Use that string in the dialog title
as well.
svn path=/trunk/; revision=48665
was done using textual search+replace, not anything syntax-aware, so presumably
it got most comments as well (except where there were typos).
Use a consistent coding style, and make proper use of the WS_DLL_* defines.
Group the functions appropriately in the header.
I ended up getting rid of most of the explanatory comments since many of them
duplicated what was in the value_string.c file (and were out of sync with the
recent updates I made to those in r48633). Presumably most of the comments
should be in the .h file not the .c file, but there's enough churn ahead that
it's not worth fixing yet.
Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8467
svn path=/trunk/; revision=48634
filter *after* initially reading the file so that we get the expected multi-
pass behaviour and forward-looking filters (like response_in) work properly.
svn path=/trunk/; revision=48615
too small, so add corrected ones. Add SVG versions of the new toolbar
icons. Use consistent naming for alternate icons. Remove some
no-longer-used XPMs. Add a script to compress PNGs using various
utilities and run it. Regenerate the pixbuf includes using the smaller
PNGs.
svn path=/trunk/; revision=48591
We call capture_dlg_prep() and do_file_close() in wrong order. capture_dlg_prep() clears global options for currently running capture and then we get an assertation fail in capture_input_new_packets().
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8526
svn path=/trunk/; revision=48581
Use the PNG versions of the new application icons.
Remove the XPM versions of the Wireshark application and capture icons.
To paraphrase Zoidberg, XPMs are bad and we should feel bad. Remove
xpm_to_widget_from_parent (which we weren't using and likely won't use
in the future).
Replace wiki_24.xpm (which was a GNOME or GTK+ stock icon IIRC) with the
16x16 and 24x24 versions emblem-web.png from GNOME icon theme 2.30.3.
This version was used specifically because it's GPLv2 and later versions
are GPLv3.
Update image/README.
svn path=/trunk/; revision=48565
GDK_WINDOW_TYPE_HINT_MENU, use GDK_WINDOW_TYPE_HINT_DIALOG.
GDK_WINDOW_TYPE_HINT_MENU, at least on OS X with quartz-wm, causes the
combo box for the interface type not to work, so
GDK_WINDOW_TYPE_HINT_MENU breaks things.
GDK_WINDOW_TYPE_HINT_DIALOG, at least on OS X with quartz-wm, causes the
minimize and whatevertheheckthegreenbuttondoesize buttons to be clear
and inactive, so maybe GDK_WINDOW_TYPE_HINT_DIALOG does something
approximating the right thing.
svn path=/trunk/; revision=48545
The "Advanced Wireless / Remote Capture Settings" is not on the top of Dialog
Make "Advanced Wireless / Remote Capture Settings " Dialog modal too
svn path=/trunk/; revision=48482
window when double-clicking with a modifier key held. The original suggestion
was CTRL, but GTK didn't like that, so ALT was suggested as an alternative,
but I think SHIFT makes more sense, since that's what browsers use (shift+click)
to open links in a new window.
svn path=/trunk/; revision=48470
was walking through the woods one day taking a basket full of emergency
zombie apocalypse supplies to her grandmother. It was raining." This can
make the interface list dialog really wide, so elide the interface text.
Elide the description as well.
Try to make the interface list resize sanely. This doesn't appear to
work for Gtk2.
svn path=/trunk/; revision=48467
doesn't work well in some cases. Switch to window_get_geometry() +
gtk_window_set_default_size(). (We use gtk_widget_get_preferred_size()
elsewhere but fetches what appeares the minimum width of the top-level
window on my machine instead of the actual width.)
Use a macro to define the initial conversation and endpoint dialog
heigth and increase its value. Use best-guess dialog metrics and UTF8
entities in a few more spots.
Add a comment about alignment not working quite right in Gtk3.
svn path=/trunk/; revision=48459
Add item to context menu of frame references to open the referenced frame in a
new window. Very useful when the referenced frame is hidden by a filter.
From me:
- modelines
- simplify some of the logic
svn path=/trunk/; revision=48451
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10408
Note: The following parts of the patch had been previously done:
asn1/snmp/packet-snmp-template.c
epan/dissectors/packet-snmp.c
epan/dissectors/packet-x11.c
svn path=/trunk/; revision=48448
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10404
Note: The following parts of the patch had been previously done:
asn1/snmp/packet-snmp-template.c
epan/dissectors/packet-snmp.c
epan/dissectors/packet-x11.c
Also; hostlist_table.c: code under '#ifdef HAVE_GEOIP'
didn't compile and needed a few additional patches.
svn path=/trunk/; revision=48447
Windows, and OS X HIGs. Use it in the capture options dialog. The
capture options dialog is a bit taller now and could probably use a bit
more tweaking.
In the capture options, conversation, and endpoint dialogs use our
best-guess dialog spacing and pad out some areas.
svn path=/trunk/; revision=48445
Needed to convert use of old IEEE802.11 preference strings to UAT. Since UAT is self-contained within its own file, the entire preference file doesn't need to be rewritten/saved when UAT values are changed.
svn path=/trunk/; revision=48308
(Fix: prevent vertical expand/fill of grid widget in certain cases).
(This stuff in GTK3 about "parents inheriting expand/fill properties from children"
is driving me crazy).
svn path=/trunk/; revision=48280
Improves 'expand' handling for both Gtk2 & Gtk3;
Adapted (with additions by me) from a proposed patch by Peter Hatina (Bug #8315).
Also:
1. Don't use gtk_widget_set_size() in several cases when a single use of
gtk_window_set_default_size() for the "Manage Interfaces" window is sufficient.
2. Add an XXX comment as to a specific call to 'gtk_window_destroy_with_parent'
actually being a no-op on Windows.
svn path=/trunk/; revision=48237
Added functionality:
- SMB2 support for Export->Objects->SMB
- support for SMB_COM_CREATE, SMB_COM_OPEN, SMB_COM_READ and SMB_COM_WRITE commands
- Ability to choose between File Id and full file name as identifier for file re-building. Implemented as an option under Edit->Preferences->Protocols->SMB and Edit->Preferences->Protocols->SMB2.
Other minor changes and fixes:
- Full filename in file
- Inclusion of IP of SMB server when treeid name (i.e. hostname) is not known
- UTF-8 filenames encoding before passing them to Export Object Window
- Re-written insert_chunk function of export_object_smb.c to make it easier to debug
- Fixed of an error in insert_chunk function of export_object_smb.c (the verification of next free_chunk was always skipped after deleting one free_chunk).
- Removed duplicated code by inserting the function feed_eo_smb in packet-smb.c and packet-smb2.c
- Changed the label of Export->Objects->SMB menu into Export->Objects->SMB/SMB2
svn path=/trunk/; revision=48210
(Part of suggested patch for WIreshark 1.8 applied to trunk instead)
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8315
From me: Add an XXX xomment about how, on Windows, closing the top_level
Wireshark window while the capture_interfaces dialog window is open
will leave the associated dumpcap process running.
svn path=/trunk/; revision=48122
Also: Add an XXX comment re one effect of the
fact that, on Windows, dlg_window_new() does *not*
set the newly created dialog window as 'transient for'
the Wireshark top_level window.
svn path=/trunk/; revision=48106
- For each choice (marked/ignored fg/bg) always show orig color as "prev color";
- Improve spacing between widgets.
Also;
- Add a few explanatory comments;
- Add editor modelines;
- Cleanup whitespace/long-lines/formatting.
svn path=/trunk/; revision=48012
- Significantly simplify & rework code;
- Use GtkColorChooser instead of GtkColorSelection if GTK 3.4 or newer.
- Minor UI cleanup (default buttons & etc)
- Fix crash which occurred in the (existing) GTK3 related code.
- Fix some other relatively minor bugs (including some minor memory leaks);
- Remove some old, commented-out code;
- Use a more consistent naming scheme for certain variables.
svn path=/trunk/; revision=47958
1. Allow to DecodeBy payload over AVCTP
2. Fix L2CAP CID payload recognize after disc
3. Removed unneeded _U_
4. Fall back to control channel in AVRCP
5. Fix time-tracking for passthrough and capability AVRCP commands
From Michal Labedzki, bug 8367 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8367)
svn path=/trunk/; revision=47810
(at the moment, the edit window remains open even if the file is closed or
changed, this allows effectively to overwrite a file's capture commment with
the capture comment of a previously used file)
svn path=/trunk/; revision=47779
is running" mutex. Have the NSIS installer check for this mutex and ask
the user to close Wireshark if it's found. While not perfect this makes
the WinSparkle update process much less annoying.
svn path=/trunk/; revision=47758
preferences (currently hidden) to disable updates, set the update
frequency, and set the update "channel" (stable vs development). Add a
"Help" menu item to manually check for updates.
svn path=/trunk/; revision=47748
gtk_selection_data_set() takes an int, rather than a size_t, as its last
argument, so cast away that bit of "ZOMG ARENT SIZE_T AND INT THE SAME
SIZE!!!!!!!111ONE!!!!!"
svn path=/trunk/; revision=47628
routine (prefs_register_directory_preference). Add PREF_FILENAME and
PREF_DIRNAME support to the Qt module preferences. Change a couple of
preferences to directory names.
Clean up some names and default settings.
svn path=/trunk/; revision=47573
Add comments noting that
- We might want to do something different when the bookmark button is
pressed.
- The display filters (dfilters file) and gui.filter_expressions
preferences should be merged.
- Many buttons on Qt4 + OS X + unifiedTitleAndToolBarOnMac makes the
main window really wide.
Add a qstring_strdup convenience routine. Add "disabled" display filter
edit icons. Fix up whitespace and descriptions in a couple of places.
svn path=/trunk/; revision=47522
Luis Ontanon