Commit Graph

48 Commits

Author SHA1 Message Date
Jeff Morriss 0c17bfd3a8 From Eric Hall to fix bug 1289:
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1289

Rename 'svnversion' to 'wireshark_svnversion' to resolve a symbol conflict with
GTK 2.10.6 (hmm, shouldn't GTK not be exporting that symbol or at least naming
it so as to prevent such collisions? Well, so should we, so...)

From Andreas Fink: change #ifdef for size_t in airdcap_interop.h to fix
compile on MacOS X.


svn path=/trunk/; revision=20726
2007-02-06 02:27:59 +00:00
Gerald Combs 1e6ce19f79 Recent versions of GTK+ have added a "gtk-label-select-on-focus"
property, which selects the entire contents of a label when it comes
into focus.  This property annoyingly defaults to TRUE, which meant that
the labels in simple dialogs and the about box would unexpectedly show
up selected.

Work around this by setting the focus on the "OK" button in the about
dialog and the first button specified in simple dialogs.

svn path=/trunk/; revision=20507
2007-01-20 02:05:49 +00:00
Guy Harris 44c0624bd9 Add a WIRESHARK_RUN_FROM_BUILD_DIRECTORY environment variable on UN*X;
if set, and if the program isn't running with additional privileges,
it'll treat the directory in which the program is found as the data
directory.

If, on Windows, the version-number subdirectory of {data
directory}\plugins doesn't exist (which is assumed to mean that the
program is being run from the build directory), or if, on UN*X,
WIRESHARK_RUN_FROM_BUILD_DIRECTORY is set, the plugin directory is the
"plugins" subdirectory of the data directory, and all subdirectories of
that directory are scanned for plugins, as the "plugins" subdirectory of
the build directory contains subdirectories for the plugins; this means
that if we're running from the build directory, we'll find the plugins
we built in the build tree.

When generating the wireshark-filter man page, run tshark with
WIRESHARK_RUN_FROM_BUILD_DIRECTORY set, so it uses the plugins from the
build to generate the list of filters.

svn path=/trunk/; revision=20261
2007-01-02 06:49:40 +00:00
Gerald Combs ff8422a3e4 From Giorgio Tino: Add support for version 2.0 of the AirPcap driver,
which has an updated API for WEP key handling.

svn path=/trunk/; revision=19736
2006-10-30 06:34:31 +00:00
Ulf Lamping e26475108a the text in the about box license page was hard to read because of line breaks at the wrong places.
set the minimum size of the widget to 600 pixels - this is working well on my machine. If anyone has problems even with this width (e.g. because of using a larger font) we might increase the size even further.

Of course, this increases the overall size of the about dialog, but the other tabs seem to be working well with it.

svn path=/trunk/; revision=19652
2006-10-21 12:06:26 +00:00
Jaap Keuter 4f5a48c4f6 Adding license tab to about dialog
svn path=/trunk/; revision=19601
2006-10-19 06:29:13 +00:00
Ulf Lamping 3b815838f3 "Wireshark - Network Protocol Analyzer" -> "Network Protocol Analyzer", as the name Wireshark is already in the logo (it wasn't in the former "E" logo)
svn path=/trunk/; revision=18322
2006-06-02 17:23:31 +00:00
Gerald Combs 76103f44f2 Add a new splash image.
svn path=/trunk/; revision=18294
2006-05-31 22:51:38 +00:00
Anders Broman 05448fcc3d Ethereal->Wireshark
svn path=/trunk/; revision=18232
2006-05-28 17:19:08 +00:00
Guy Harris 92552c2d76 Get rid of a bunch of "Ethereal"s and "ethereal"s in comments, GUI
strings, and function names.

svn path=/trunk/; revision=18205
2006-05-22 07:29:40 +00:00
Ronnie Sahlberg 89f022b12b name change
svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
Guy Harris 0dfbc73cbe Handle the case where we *can't* determine the pathname in which to find
programs, by reporting it with a dialog box that at least attempts to
indicate what the problem is, and by giving up early on running dumpcap.

svn path=/trunk/; revision=18051
2006-05-01 06:51:14 +00:00
Guy Harris 84aef00bad Move the file selection dialog routines to file_dlg.c, and give it a
header file.

#if 0 out some includes; if none of the builds have a problem with
that, I'll remove them.

svn path=/trunk/; revision=18036
2006-04-30 01:47:58 +00:00
Guy Harris b8136fbfa9 Add a routine to attempt to get the absolute pathname of the executable
file, strip off the last component to get the pathname of the directory
containing the executable file, and save it for future use.  On Windows,
you can get that from the OS, but, on UN*X, you have to look at argv[0]
and derive the absolute path from that (argv[0] is not guaranteed to be
an absolute path, or even a path at all).  (In addition, if you're
running from the build directory, you might have to strip off a ".libs/"
added to argv[0] as an artifact of the libtoolizing script.)

Use that in the About dialog, and use it to construct the path of
dumpcap.

Don't put quotes into the path of dumpcap; you don't have to quote
strings with spaces in them when handing them to execvp and, in fact,
you *mustn't* quote them, as the quotes will be treated as part of the
pathname.

svn path=/trunk/; revision=17267
2006-02-12 03:15:29 +00:00
Guy Harris c9b702ba1a Provide not only copyright information, but a GPL blurb, in all the
version/usage messages.

Put newlines at the end of various version strings.

svn path=/trunk/; revision=16870
2005-12-21 08:59:52 +00:00
Jörg Mayer 0edcc8920e - Declare some functions static
- Add plugins_dlg.h
- Include .h files in their respective .c files
- Include .h and remove extern declarations in .c files
- set eol-style and keywords on gui_utils.[hc]

svn path=/trunk/; revision=15471
2005-08-20 14:02:00 +00:00
Ulf Lamping eafbbbcabb renamed ui_util.c/.h to gui_utils.c/.h to prevent confusion with identical named ui_util.h in / dir
svn path=/trunk/; revision=15465
2005-08-20 12:09:48 +00:00
Jörg Mayer 0f9ffd6923 Move SVNVERSION handling into version_info. That way, we won't have
to recompile tethereal.o etc each time the svn version has changed,
relinking is sufficient.

I'm not sure what to do about mergecap, as it currently doesn't link
against version_info, so it's "overhead" either way.

svn path=/trunk/; revision=15371
2005-08-16 06:45:17 +00:00
Jörg Mayer 4e1f4b18ab More char -> const char warning fixes.
Removed (very few) casts that only change the warning message
  but don't remove it (with gcc-4).

svn path=/trunk/; revision=15227
2005-08-05 20:59:08 +00:00
Ulf Lamping 59bd32fe87 We've "just reached" 2005, extend the copyright notice by the "new" year ...
svn path=/trunk/; revision=13459
2005-02-21 19:51:13 +00:00
Gerald Combs ed604bc5fc Make the version and library information in the about box copy-and-paste-able
under GTK+ 2.x.

svn path=/trunk/; revision=12943
2005-01-03 19:58:04 +00:00
Guy Harris 6e622fd24e "gtk_entry_get_text()" returns a "const char *" - assign the result to
one.

"get_basename()" doesn't modify its argument, and its callers don't
modify the substring pointed to by the result, so make it take a "const
char *" as an argument and return a "const char *". 

"find_last_pathname_separator()" doesn't modify its argument, so make it
a "const char *" - but some of its callers pass a non-"const" "char *"
and modify the result, so don't make its return value a "const char *".
And, as none of its callers are outside "filesystem.c", make it static.

In "about_folders_page_new()", have separate variables for pathnames
returned as "const char *" (which are cached by the routine that returns
them, so you can't modify them - and can't free them, so get rid of the
commented-out "g_free()" calls for them) and pathnames returned as "char
*" (which are allocated anew for each call, and can be modified, but
have to be freed).

Clean up white space.

svn path=/trunk/; revision=12881
2004-12-31 00:26:36 +00:00
Ulf Lamping 6cd11f14ef first steps towards using the User's Guide as Ethereal's help system
svn path=/trunk/; revision=12021
2004-09-16 22:07:03 +00:00
Guy Harris 8a8b883450 Set the svn:eol-style property on all text files to "native", so that
they have LF at the end of the line on UN*X and CR/LF on Windows;
hopefully this means that if a CR/LF version is checked in on Windows,
the CRs will be stripped so that they show up only when checked out on
Windows, not on UN*X.

svn path=/trunk/; revision=11400
2004-07-18 00:24:25 +00:00
Gerald Combs 8106dc0862 Convert make-version.pl and the associated cvsversion.h and CVSVERSION
definition to Subversion.  "svn info" prints out the last changed date
of the repository, so we don't have to go hunting through "CVS/Entries"
files anymore.


svn path=/trunk/; revision=11379
2004-07-15 21:09:33 +00:00
Guy Harris 081f3ca151 Realize the splash screen window right after creating it, rather than
doing a "show all" followed by a "hide"; that way we don't get a tiny
window that pops up briefly and disappears.

Get rid of the additional positioning of the splash screen -
"splash_window_new()" does that for us.

Expand some comments.

svn path=/trunk/; revision=11331
2004-07-07 07:01:37 +00:00
Guy Harris 4077cb9b5b Get rid of the splash screen's title bar on GTK+ 1.2[.x] as well.
svn path=/trunk/; revision=11329
2004-07-07 05:36:10 +00:00
Gerald Combs 04d996b183 Make sure child processes don't create a splash screen. Make the verbs in
the splash screen messages present participles.

svn path=/trunk/; revision=11321
2004-07-06 19:16:04 +00:00
Ulf Lamping 8312578ffd beautify the splash screen a bit (increased border)
svn path=/trunk/; revision=11314
2004-07-05 05:32:04 +00:00
Guy Harris 4349706b7e Declare "about_ethereal()" as "void", as it returns no value, and as GCC
warns that it's implicitly declared as "int" if you don't declare its
return type.

svn path=/trunk/; revision=11313
2004-07-04 20:49:38 +00:00
Ulf Lamping 176646edbf added a splash screen while Ethereal is started
svn path=/trunk/; revision=11310
2004-07-04 12:15:41 +00:00
Guy Harris aacb8bc9b6 Add "gtk/webbrowser.h" to declare functions from "gtk/webbrowser.c".
Rename "browser_open_program_file()" to "browser_open_data_file()", and
make it open files relative to the application's data directory, as
that's where data files such as HTMLized man pages would be put.  (That
happens to be the program directory on Windows, but it's a different
directory on UN*X - and you aren't guaranteed to be able to find the
program directory on UN*X by looking at argv[0] in any case.)  Move it
to "gtk/webbrowser.c".

Fix "filename2url()" to put "file://", not just "file:", in front of
pathnames on UN*X.

svn path=/trunk/; revision=11216
2004-06-23 01:38:39 +00:00
Guy Harris fe40fa191e Mark some unused variables as such.
svn path=/trunk/; revision=11215
2004-06-22 21:51:55 +00:00
Ulf Lamping eab0af6659 add functionality, to show html files from the local installation
svn path=/trunk/; revision=11213
2004-06-22 16:28:27 +00:00
Ulf Lamping 2a6da1361c Add experimental feature of opening a webbrowser, to show some of the
webpages from http://www.ethereal.com. This functionality is copied from
the Gimp.
Win32 will use ShellExecute to use the system registered webbrowser.
On unix builds, currently the mozilla browser is hardcoded, we still need a
preference setting for this (I will add this later).

svn path=/trunk/; revision=11206
2004-06-21 17:27:35 +00:00
Ulf Lamping 14bf83c340 add details for doxygen, various code cleanups as a result of this
svn path=/trunk/; revision=11052
2004-06-01 17:33:37 +00:00
Ulf Lamping f69aa84636 Don't point to the manpage for the list of authors, it's in the about dialog now
svn path=/trunk/; revision=11014
2004-05-27 16:41:33 +00:00
Ulf Lamping 01c236864a next step to save the size and postition of the dialogs (using a hashtable)
move the get/set window size functionality from main to ui_util,
add some functions to handle windows/dialogs.

changed help and about dialog to suit the current window API

svn path=/trunk/; revision=10974
2004-05-23 17:37:36 +00:00
Guy Harris 9d45162794 GTK+ 1.2[.x] doesn't handle UTF-8 text, so do the "Authors" tab only
with GTK+ 1.3 and later.

If we're doing the "Authors" tab, include "text_page.h" to declare
"text_page_new()".

svn path=/trunk/; revision=10954
2004-05-22 07:32:11 +00:00
Guy Harris c20c6ca58c Include "cvsversion.h" so we report the version correctly for builds
from CVS.

svn path=/trunk/; revision=10952
2004-05-22 04:46:13 +00:00
Guy Harris ade058df51 Declare "text_page_new()" in a "gtk/text_page.h" header, rather than
embedding a declaration in "gtk/about_dlg.c".

Do the Authors page in the About dialog on UN*X as well as on Windows.

svn path=/trunk/; revision=10951
2004-05-22 04:25:57 +00:00
Ulf Lamping f6e2b28e9d WIN32 only: add an "Authors" notebook tab, to show the content of
the AUTHORS-SHORT file

svn path=/trunk/; revision=10946
2004-05-21 17:35:43 +00:00
Ulf Lamping c58455e882 code cleanup (e.g. removed unused function parameters),
added new about page, showing the authors file (but still commented out)

svn path=/trunk/; revision=10942
2004-05-21 08:55:07 +00:00
Guy Harris 466ffc8977 Now that the "About" dialog box's code is in "gtk/about_dlg.c", move the
"create an About dialog" function's declaration to "gtk/about_dlg.h".

svn path=/trunk/; revision=10941
2004-05-21 08:44:45 +00:00
Guy Harris 82051275a7 Include <string.h> to declare "strdup()".
svn path=/trunk/; revision=10937
2004-05-21 00:38:45 +00:00
Ulf Lamping 5719e84c96 beautify the "About Ethereal" page, put plugin list into the dialog
svn path=/trunk/; revision=10930
2004-05-20 18:23:38 +00:00
Ulf Lamping 957ebcf71d separate dir functions from the plugin init,
put this and some other dirs in the about dialog

svn path=/trunk/; revision=10928
2004-05-20 13:48:25 +00:00
Ulf Lamping ad85db871f moved the about dialog from main.c to it's own new about_dlg.c,
added a notebook tab with some directory infos (still incomplete and ugly)
cleaned up #includes in main.c (hoping this didn't break the build on unix)

svn path=/trunk/; revision=10925
2004-05-20 12:01:13 +00:00