Created by Lars Karlitski on 2012-04-05 and last modified on 2012-04-05
Get this branch:
bzr branch lp:~larsu/indicator-messages/lp856284
Only Lars Karlitski can upload to this branch. If you are Lars Karlitski please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Lars Karlitski
Messaging Menu

Recent revisions

266. By Lars Karlitski on 2012-04-05

messages-service.c: add missing resort_menu

This might fix lp:856284, but I couldn't verify because I can't reproduce the

265. By Charles Kerr on 2012-04-04

Merge lp:~larsu/indicator-messages/lp956147 to fix broken thunderbird message indicator icons.

This is a refinement to r254, which set an empty icon so that shortcut labels ("compose new message", "contacts", etc.) are horizontally aligned with the labels of the applications they belong to. Apparently gtk2 sets a "broken" icon onto a GtkImage if gtk_image_set_from_icon_name() is passed an empty string, which caused the behavior seen in bug #956147. Adding an #ifdef is a short-term fix for removing that "broken" icon in gtk2 for 12.04.

Xref: http://bazaar.launchpad.net/~indicator-applet-developers/indicator-messages/trunk.0.6/revision/254
Xref: https://code.launchpad.net/~larsu/indicator-messages/lp956147/+merge/100836

264. By Charles Kerr on 2012-04-04

Merge lp:~larsu/indicator-messages/fix-blacklist-again to revert blacklist changes so that apps relying on the old behavior will work again.

The new policy is: if a file in the blacklist folder is a symbolic link, use its target. If its filename ends on .desktop, use the file's basename (so that copying files works). Otherwise, use the contents of file (first line should contain path to a desktop file).

Xref: bug #939258 and http://bazaar.launchpad.net/~indicator-applet-developers/indicator-messages/trunk.0.6/revision/259

263. By Ted Gould on 2012-03-21

Sync to trunk

262. By Ted Gould on 2012-03-21


261. By Ted Gould on 2012-03-21

Ensure that we're not distributing any gtest sources

260. By Ted Gould on 2012-03-21

Fix to use the lib

259. By Ted Gould on 2012-03-21

Fix blacklisting

258. By Charles Kerr on 2012-03-20

merge lp:~allanlesage/indicator-messages/TDD for automake cleanups and test-oriented fixes

257. By Charles Kerr on 2012-03-20

merge lp:~ken-vandine/indicator-messages/decode_icons to fix indicator-messages' support of displaying icons via set_property_icon()

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.