osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Don't include some xpm's when built with GTK+ 1.2[.x] - the icons they 

define aren't used with 1.2[.x].

svn path=/trunk/; revision=9768
This commit is contained in:
Guy Harris 2004-01-21 09:02:09 +00:00
parent 9c9fd17906
commit e338b18e4f
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/toolbar.c
View File

@ -2,7 +2,7 @@
* The main toolbar
* Copyright 2003, Ulf Lamping <ulf.lamping@web.de>
*
* $Id: toolbar.c,v 1.24 2004/01/21 03:54:31 ulfl Exp $
* $Id: toolbar.c,v 1.25 2004/01/21 09:02:09 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -95,12 +95,18 @@
#endif /* HAVE_LIBPCAP */
#include "../image/toolbar/dfilter_24.xpm"
/* these icons are standard stock icons, but used for ethereal specific stock icon labels */
#if GTK_MAJOR_VERSION >= 2
#include "../image/toolbar/stock_add_24.xpm"
#endif
#include "../image/toolbar/stock_open_24.xpm"
#if GTK_MAJOR_VERSION >= 2
#include "../image/toolbar/stock_ok_20.xpm"
#endif
#include "../image/toolbar/stock_save_24.xpm"
#include "../image/toolbar/stock_preferences_24.xpm"
#if GTK_MAJOR_VERSION >= 2
#include "../image/toolbar/stock_properties_24.xpm"
#endif
/* XXX: add this key to some .h file, as it adds a key to the top level Widget? */