Commit Graph

113 Commits

Author SHA1 Message Date
Anders Broman b73070850a More GTK 3.0 changes.
svn path=/trunk/; revision=38593
2011-08-18 06:37:28 +00:00
Anders Broman 1ad61cb1d5 Get rid of get_color() it looks like we do not need allocated collors.
The code is #if 0:ed out in case there is any ill side effects.

svn path=/trunk/; revision=38574
2011-08-17 10:53:46 +00:00
Michael Tüxen 31fae9a126 Handle the case in the capture options dialog box
where no interfaces are available.

svn path=/trunk/; revision=38554
2011-08-16 09:35:14 +00:00
Anders Broman 5ab5d4e3b3 gdk_pixbuf_render_pixmap_and_mask_for_colormap() used in xpm_to_widget_from_parent is gone in GTK 3.0.
Rather tan trying to replace it go for the simpler xpm_to_widget() The
result looks the same to me.

svn path=/trunk/; revision=38549
2011-08-15 20:56:00 +00:00
Jörg Mayer 3a19feec7b Replace almost all occurances of GTK_OBJECT by G_OBJECT.
The remaining uses are inside calls to functions that are deprecated
in gtk3.

svn path=/trunk/; revision=38499
2011-08-12 17:26:20 +00:00
Michael Tüxen 6ec0878aad Use the fix from Joerg to get the airpcap icon also for remote
interface.
This is a misuse of the icon, but we don't have an icon
for remote interfaces yet and I'm the wrong one for
creating one...

svn path=/trunk/; revision=38369
2011-08-05 17:41:31 +00:00
Michael Tüxen a5fd811d8b Fix the compile issue reported by Joerg.
This does not fix the icon issue.

svn path=/trunk/; revision=38368
2011-08-05 17:33:47 +00:00
Michael Tüxen eaffdfeaaa Add support for multiple interfaces to the capture options dialog.
Obtained from Irene Ruengeler.

svn path=/trunk/; revision=38350
2011-08-05 07:19:17 +00:00
Michael Tüxen 91df20357a Make sure that the interfaces listed in ifaces really exist.
Some protection code in capture / options.
Obtained from Irene Ruengeler.


svn path=/trunk/; revision=38142
2011-07-21 15:23:46 +00:00
Michael Tüxen dcac95be11 Add some temporary protection code to support the current capture
options dialog box. It will be removed as soon as the capture options
dialog box supports multiple interfaces.

Received from Irene Ruengeler.


svn path=/trunk/; revision=38140
2011-07-21 11:28:16 +00:00
Anders Broman c165083608 strdup -> g_strdup
svn path=/trunk/; revision=38134
2011-07-20 13:53:00 +00:00
Michael Tüxen 7a16d2fa87 Synchronize the selection of interfaces between the main welcome
window, the capture/interface dialog box and the capture / start
menu item.
Obtained from Irene Ruengeler.


svn path=/trunk/; revision=38133
2011-07-20 12:51:57 +00:00
Michael Tüxen 358fcedaba Get the interfaces list from the Capture / Interfaces list in sync
when using the capture / start menu item.

Obtained from Irene Ruengeler.

svn path=/trunk/; revision=38109
2011-07-19 12:42:18 +00:00
Michael Tüxen a180787959 Make sure that the Capture/Start menue item will always use the
same interfaces as selected in the Main Welcome Window.

svn path=/trunk/; revision=38087
2011-07-18 16:20:19 +00:00
Michael Tüxen 3e3bc0f7f0 Remove redundant code.
svn path=/trunk/; revision=38063
2011-07-16 17:04:48 +00:00
Michael Tüxen 09af2bc6d2 Don't allow capturing from multiple interface when compiled with multiple thread
support.

svn path=/trunk/; revision=38057
2011-07-16 11:07:32 +00:00
Michael Tüxen 85d399d906 You can't create a mutex without initializing the thread system.
So #ifdef the code with USE_THREADS.

svn path=/trunk/; revision=38045
2011-07-15 14:58:45 +00:00
Jörg Mayer 00beddf9fc Add a missing ( in the UI_MANAGER case
svn path=/trunk/; revision=38042
2011-07-15 11:14:41 +00:00
Gerald Combs a533d70be0 On Windows enable threads everywhere instead of just in dumpcap. If
threads are enabled use them to check the recent file list. Fixes bug
3810.

svn path=/trunk/; revision=38033
2011-07-14 23:18:02 +00:00
Michael Tüxen e791424ab6 Add back r37749, which was taken out by accident.
Thanks to Stephen Fisher for pointing it out.

svn path=/trunk/; revision=38018
2011-07-14 16:54:44 +00:00
Michael Tüxen 865240b6ba Display interface stuff only when interfaces are available.
svn path=/trunk/; revision=37995
2011-07-12 21:33:11 +00:00
Michael Tüxen a73931eafd This fixes the compile issue reported in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6111


svn path=/trunk/; revision=37990
2011-07-12 11:06:44 +00:00
Anders Broman baf0396650 Fix more tooltips.
svn path=/trunk/; revision=37988
2011-07-12 06:54:01 +00:00
Michael Tüxen d56de3d638 Try to make non-libpcap builds compiling.
svn path=/trunk/; revision=37937
2011-07-08 09:26:34 +00:00
Michael Tüxen 15bf360095 Use the interfaces from the last capturing process as a starting point
for the next one.

Obtained from Irene Ruengeler.

svn path=/trunk/; revision=37936
2011-07-08 08:49:06 +00:00
Michael Tüxen 8fac080296 Try to unbreak the Mac OS X 10.5 buildbots.
svn path=/trunk/; revision=37931
2011-07-07 20:20:55 +00:00
Michael Tüxen 3500412973 Bring back interface icons.
Obtained from Irene Ruengeler.

svn path=/trunk/; revision=37929
2011-07-07 13:57:08 +00:00
Michael Tüxen 20ded72bac Use the interface descriptions again.
This patch is from Irene Ruengeler.

svn path=/trunk/; revision=37928
2011-07-07 13:34:40 +00:00
Michael Tüxen 6542687a78 Fix a crash when using hidden interfaces.
svn path=/trunk/; revision=37925
2011-07-06 17:27:42 +00:00
Martin Mathieson c4dd3e5e5c Add
#if defined(_WIN32) || defined(HAVE_PCAP_CREATE)
around access to interface_options.buffer_size

svn path=/trunk/; revision=37920
2011-07-06 14:56:42 +00:00
Michael Tüxen 8180111144 Use g_object_set() instead of gtk_object_set().
svn path=/trunk/; revision=37917
2011-07-06 11:35:52 +00:00
Michael Tüxen b682b5ee01 Get it even linking...
svn path=/trunk/; revision=37916
2011-07-06 11:25:57 +00:00
Michael Tüxen eef7623fb9 Get it compiling when not having libpcap.
svn path=/trunk/; revision=37915
2011-07-06 11:22:38 +00:00
Michael Tüxen 48683778a0 Add support for multiple interface to the main welcome screen.
This patch is from Irene Ruengeler.

svn path=/trunk/; revision=37913
2011-07-06 09:17:06 +00:00
Michael Tüxen 421dafd2de Get rid of old non-interface specific settings which are now interface
specifc. This finalizes the change of the infrastructure.
This patch is based on work by Irene Ruengeler.

svn path=/trunk/; revision=37794
2011-06-27 00:09:03 +00:00
Anders Broman 7deaa0ce7a Make it possible to copy stuff from the welcome header.
svn path=/trunk/; revision=37749
2011-06-22 08:54:17 +00:00
Michael Tüxen 985a98dd1b Fix the case where you start with interfaces on the command line
(so using ifaces) and then using the GUI (which only deals with
iface).

These kind of problems will completely disappear when the
old strucuture components like iface have completely be
retired. This is the next thing we will work on.

svn path=/trunk/; revision=37345
2011-05-22 11:11:00 +00:00
Balint Reczey 5921cd68a2 Refer to "Capture Help" as "Capture Help below" when there are no interfaces
to capture on.

svn path=/trunk/; revision=37238
2011-05-18 13:08:02 +00:00
Guy Harris da1403c6dd This ain't C++; you have to put "void" in as the argument list of
functions that take no arguments, otherwise the function is treated as a
crufty old C function with undeclared arguments.

svn path=/trunk/; revision=37211
2011-05-17 21:26:25 +00:00
Balint Reczey 72b5d04c1a If no interface is found for capturing show this information
and direct user to Capture Help instead of showing the empty list of
interfaces and capture options.

svn path=/trunk/; revision=37016
2011-05-08 10:56:23 +00:00
Guy Harris 4fdcc5c180 Rename ws_stat to ws_stat64, and make it take a pointer to a ws_statb64
as an argument, along the lines of ws_fstat64, and, on Windows, make it
use _wstati64, to handle 64-bit file sizes.

svn path=/trunk/; revision=36547
2011-04-10 20:59:10 +00:00
Stephen Fisher 5a7b4defa3 After applying GUI preferences, reset the welcome screen's header message
in case the show version in welcome screen option was toggled.


svn path=/trunk/; revision=35114
2010-12-03 22:19:58 +00:00
Guy Harris 002a1b75fa Make some other statusbar routines take a format string and format args,
and get rid of an unnecessary string pointer.

Make the argument to welcome_header_push_msg() a const pointer.

svn path=/trunk/; revision=35042
2010-11-27 23:06:14 +00:00
Stig Bjørlykke fb0621683d Split some texts on the welcome page to make "Interface List" and
"Capture Help" smaller to make room for longer filenames in the
Open Recent list.

svn path=/trunk/; revision=34379
2010-10-05 06:59:11 +00:00
Gerald Combs 31e1d6463f Initialize a variable before we try to free it.
svn path=/trunk/; revision=33877
2010-08-21 16:38:13 +00:00
Jeff Morriss 000b99fc5f Free the err_str from capture_interface_list() even if the error isn't CANT_GET_INTERFACE_LIST.
svn path=/trunk/; revision=33866
2010-08-20 22:15:07 +00:00
Bill Meier 3911b90cde Use proper signatures for event callback functions:
EG: Non-event signal callback functions shouldn't
   be directly used as event callback functions.
Replace use of deprecated "GtkSignalFunc";
Whitespace cleanup.

svn path=/trunk/; revision=33849
2010-08-19 15:02:23 +00:00
Gerald Combs 366d3cf473 Fix an include.
svn path=/trunk/; revision=33819
2010-08-16 18:58:24 +00:00
Gerald Combs 303030f5c1 Fix compilation on Windows.
svn path=/trunk/; revision=33818
2010-08-16 18:32:27 +00:00
Gerald Combs 6ef98db3bb Don't drop characters in the middle of a UTF-8 sequence. Fixes bug 5066.
Use an ellipsis character instead of three dots.

svn path=/trunk/; revision=33816
2010-08-16 17:53:43 +00:00