Ethereal-dev: [Ethereal-dev] Toolbar.c and GTK+ 2.0

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

From: "Gisle Vanem" <giva@xxxxxxxxx>
Date: Fri, 17 Oct 2003 03:04:22 +0200
This is a patch to allow it to compile with GTK+ 2.0 on
Windows:

--- ethereal-2003-10-16\gtk\toolbar.c   Thu Oct 16 00:37:19 2003
+++ gtk\toolbar.c       Fri Oct 17 02:53:03 2003
@@ -266,8 +266,11 @@

        /* toolbar will be horizontal, with both icons and text (as default here) */
        /* (this will usually be overwritten by the preferences setting) */
+#if GTK_MAJOR_VERSION < 2
        *toolbar = gtk_toolbar_new ( GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH);
+#else
+       *toolbar = gtk_toolbar_new ();
+#endif
        /* start capture button */
        icon = gdk_pixmap_create_from_xpm_d(
                        window->window, &mask, &window->style->white, capture_24_xpm);

Cool as it may be, I'd like a "Preference" setting to turn it off
(I like clean interfaces).

BTW. I'm not sure this warning has anything to do with the toolbar:
(ethereal.exe:3592): Gtk-WARNING **: gtk_widget_size_allocate(): attempt to 
allocate widget with width 893 and height -5

Gisle V.

There are only 10 types of people in this world... 
those who understand binary, and those who don't.