Indicator Application can only work with icon names, not rendered icons

[qense]

In ticket #2873 I submitted a patch that added Indicator Application support to Transmission. What I didn't realise when attaching the patch was that libappindicator cannot cope with generated images as tray icons, which are the icons used as quenfall-back mechanism by Transmission in case TRAY_ICON doesn't exist -- which is the case most of the times as it is now.

Attached is a patch that fixes the fall-back mechanism for the tray icon; in tr-icon.c the application first checks whether TRAY_ICON is available in the GTK+ icon theme -- the same check as used in actions.c for the default fall-back mechanism. If it doesn't exist the icon_name is set to "transmission", which does exist on all systems with Transmission installed.

(A bit unrelated: maybe it would be useful if a notice about Indicator Application support would be added to <​http://trac.transmissionbt.com/wiki/Building> in the Ubuntu section. I've set the minimum libappindicator version to 0.0.11 in configure.ac.)

[charles]

if( !gtk_icon_theme_has_icon( theme, TRAY_ICON ) ) { 
   icon_name = TRAY_ICON; 
} else { 
    icon_name = "transmission"; 
}

maybe I'm confused, but isn't that logic backwards? Wouldn't you want to use TRAY_ICON if gtk_icon_theme_has_icon( TRAY_ICON ) returns true?

[qense]

I'm confused. With the admittedly wrong logic in the patch the icon is shown. However, when fixing the logic, or when assigning TRAY_ICON directly to 'icon_name' the icon doesn't work anymore. I'm investigating this further. Very strange...

[qense]

Updated the patch, this time it does work correctly.

The problem was that Transmission adds an icon to the icon theme when TRAY_ICON cannot be found. This made my code think that it existed, whereas Indicator Application couldn't find it.

I've solved this by letting the code checks if the icon has got a file patch associated with itself.

[charles]

suggested revision of previous patch

[charles]

qense: does that revised version work as well? if so I'll commit it for next week's release.

[qense]

The patch works fine, thank you for improving it! However, there is a bug in it: you've forgot to change the variable name 'indicator_menu' to 'w' everywhere it is used, app_indicator_set_menu() was still using the old variable name. I'm attaching a fixed patch.

[charles]

Ha! I really should do this stuff when I'm -not- tired. :)

Thanks for the fix.

[charles]

Patch added to trunk for 1.90 by r10200