Merge lp://qastaging/~indicator-applet-developers/indicator-messages/consolidate into lp://qastaging/~indicator-applet-developers/indicator-messages/trunk.13.10

Thanks Pete, there is a merge conflict in src/im-desktop-menu.c there though. Would it also be possible to have the previous branch re-used? e.g show the fix as a different commit, would make things easier to review

FAILED: Continuous integration, rev:411
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/67/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-amd64-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-armhf-ci/20/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-messages-ci/67/rebuild

> Thanks Pete, there is a merge conflict in src/im-desktop-menu.c there though.
> Would it also be possible to have the previous branch re-used? e.g show the
> fix as a different commit, would make things easier to review

Hi Sebastien, I thought I did reuse the existing branch? (lp:~indicator-applet-developers/indicator-messages/consolidate)

I've fixed the merge-conflict now, too.

> > Thanks Pete, there is a merge conflict in src/im-desktop-menu.c there
> though.
> > Would it also be possible to have the previous branch re-used? e.g show the
> > fix as a different commit, would make things easier to review
>
> Hi Sebastien, I thought I did reuse the existing branch? (lp:~indicator-
> applet-developers/indicator-messages/consolidate)
>
i.e. commit 411, below. Perhaps I am misunderstanding here...

PASSED: Continuous integration, rev:412
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/68/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-armhf-ci/21

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-messages-ci/68/rebuild

> Hi Sebastien, I thought I did reuse the existing branch? (lp:~indicator-applet-developers/indicator-messages/consolidate)

Sorry, I got confused by launchpad, it listed only one commit (411) on the mp with a non trivial diff, I guess it's a side effect of the reverts...

The fix in r411 seems fine to me, I'm going to build that branch/run it for a bit and comment back

> > Hi Sebastien, I thought I did reuse the existing branch? (lp:~indicator-
> applet-developers/indicator-messages/consolidate)
>
> Sorry, I got confused by launchpad, it listed only one commit (411) on the mp
> with a non trivial diff, I guess it's a side effect of the reverts...
>
> The fix in r411 seems fine to me, I'm going to build that branch/run it for a
> bit and comment back

Yes, reverting the revert was fiddly! :)

Running the new version, it mostly works, some comments:

> g_menu_append (clear_section, "Clear", "indicator.remove-all");

"Clear" should be set as translatable (e.g _("Clear"))

> item = g_menu_item_new ("Clear All", "remove-all");

same

* "Clear" should be disabled if the indicator is not blue

* the ordering of items is wrong, https://wiki.ubuntu.com/MessagingMenu states:

"a section for Ubuntu’s default chat client, if it is registered;
a section for Ubuntu’s default mail client, if it is registered;

a section for any other registered application, sorted alphabetically by the application Name. "

The old codebase lists:
- status
- empathy
- tb
- ...

The new one:
- GMail
- tb
- fb
- xchat-gnome
-...

Well, I've addressed the trivial translatable issue. I think I'll have to leave the rest for Ted.

I can't find a way to enable / disable a GMenu. I'm thinking it must be easy, but there's nothing describing it in the documentation.

FAILED: Continuous integration, rev:413
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/69/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-amd64-ci/22/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-armhf-ci/22/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-messages-ci/69/rebuild

> Well, I've addressed the trivial translatable issue.

Thanks

> I think I'll have to leave the rest for Ted.

That makes sense

Some other issues:

- the envelop doesn't turn blue when I receive new emails there (or not always, just got 3, the launcher picked them, the indicator menu has them, but the envelop

- you use g_desktop_app_info_get_action_name () which is new in glib 2.37, you need to bump the glib requirement

- if the glib requirement is bumped you can drop the "#if G_ENCODE_VERSION(GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34" checks

- the tb entry in the menu is missing the "Compose new message" item it seems

oh, also xchat-gnome events seem to not be working anymore (e.g query messages don't get listed in the menu)

the service output those errors

"(process:13670): Indicator-Messages-WARNING **: could not fetch the list of sources: GDBus.Error:org.freedesktop.DBus.Error.UnknownMethod:interface "com.canonical.indicator.messages.application" doesn't exist for the object /com/canonical/indicator/messages/xchat_gnome_desktop"

(the string is not exact, I translated the french one)

PASSED: Continuous integration, rev:414
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/70/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-armhf-ci/23

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-messages-ci/70/rebuild

PASSED: Continuous integration, rev:417
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/71/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-armhf-ci/24

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-messages-ci/71/rebuild

PASSED: Continuous integration, rev:423
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/72/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-armhf-ci/25

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-messages-ci/72/rebuild

Okay, so the updates on the branch of things that were done 8/20 by Pete
and myself.

* The action names can now have ':'s in the name.
* "Clear" and "Clear All" were made translatable.
* The accessibility strings were also made translatable and adjust based
on the state of the icon.
* Setting of the alert icon was modified to handle source updates as
well as added and removed sources.
* Desktop file actions are now gotten from the libindicator parser, but
no libindicator (thus GTK) dep was added.
* The Clear menu item is no sensitive based on whether there are items
to clear
* The base action has been updated from (sssb) to the more modern a{sv}

I think that's all the issues that were listed in the comments.

PASSED: Continuous integration, rev:424
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/73/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-armhf-ci/26

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-messages-ci/73/rebuild

PASSED: Continuous integration, rev:425
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/74/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-armhf-ci/27

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-messages-ci/74/rebuild

Thanks, that looks better, still some issue:

- the order is still wrong, default im client and mailer should be first

- the libindicate parser copy seems a lot of undeed code, can we do without it?

- the spacing between the icons and status seems wrong, but I guess that's a bug somewhere else in the stack since e.g indicator-bluetooth seems to have the same issue

let's get that in and resolve those point with following merge requests