[Xfce4-commits] CVS: xfce4/libxfcegui4/libxfcegui4 xfce-appmenuitem.c, 1.8, 1.9 xfce-exec.c, 1.1, 1.2 xfce_aboutdialog.c, 1.6, 1.7 xfce_aboutdialog.h, 1.2, 1.3

[Brian J. Tarricone]

On Thu, 4 Mar 2004, Benedikt Meurer wrote:

> --- xfce-appmenuitem.c	4 Mar 2004 20:37:53 -0000	1.8
> +++ xfce-appmenuitem.c	4 Mar 2004 22:55:15 -0000	1.9
> @@ -220,11 +220,15 @@
>  					_("The name of the themed icon to display next to the item"),
>  					NULL, G_PARAM_READABLE | G_PARAM_WRITABLE));
>  	
> -	_ensure_icon_theme_instance();
> +        /* this does not work with gtkdoc-scan */
> +        if (g_getenv ("GTKDOC_SCAN") == NULL) 
> +          {
> +	    _ensure_icon_theme_instance();
>  	
> -	icon_size = _calc_icon_size();
> -	if(icon_size == -1)
> +	    icon_size = _calc_icon_size();
> +	    if(icon_size == -1)
>  		icon_size = XFCE_APP_MENU_ITEM_DEFAULT_ICON_SIZE;
> +          }
>  }

huh?  from what it looks like you just did, XfceAppMenuItem will never 
initialise its GtkIconTheme object when run normally.  did you mean to 
put "!=" instead?

either way, what's the problem that requires the env var check?

	-brian