[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

[Benedikt Meurer]

Brian J. Tarricone wrote:
> 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?

No, "==" is correct.

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

gtkdoc-scan failes to query the XfceAppMenuItem GObject characteristics on 
normal run. Therefore I set GTKDOC_SCAN when running gtkdoc-scan and added the 
env var check. I hate this kinds of hacks, but actually I don't know a better 
way to get around this.

The main problem is, that gtkdoc-scan does not open a display, but the 
gtkicontheme stuff requires a GdkScreen object, which leds to a core dump. If 
you know a better way to check it, feel free to change it :)

> 	-brian

Benedikt

-- 
NetBSD Operating system:                       http://www.NetBSD.org/
pkgsrc "Work in progress":                  http://pkgsrc-wip.sf.net/
XFce desktop environment:                        http://www.xfce.org/
German Unix-AG Association:                   http://www.unix-ag.org/
os-network:                                 http://www.os-network.de/

OpenPGP Key: http://www.home.unix-ag.org/bmeurer/#gpg