Merge lp:~renatofilho/indicator-messages/phablet-fix-1181371 into lp:indicator-messages/phablet

[Ted Gould]

Update indicator icon after remove all messages.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:364
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~renatofilho/indicator-messages/phablet-fix-1181371/+merge/167163/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/indicator-messages-phablet-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-phablet-raring-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/indicator-messages-phablet-raring-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-phablet-raring-i386-ci/3

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

review: Needs Fixing (continuous-integration)

[Lars Karlitski (larsu)]

Not sure yet why this fixes the bug (as I can't reproduce it), but I'm fine with this going in temporarily.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:364
http://jenkins.qa.ubuntu.com/job/indicator-messages-phablet-ci/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-messages-phablet-saucy-armhf-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-messages-phablet-saucy-i386-ci/1/console

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/indicator-messages/phablet-fix-1181371]

365. By Renato Araujo Oliveira Filho on 2013-06-05

Replaced deprecated functions.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:365
http://jenkins.qa.ubuntu.com/job/indicator-messages-phablet-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-phablet-saucy-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/indicator-messages-phablet-saucy-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-phablet-saucy-i386-ci/2

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

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

Since this is changelog dput based can you update the changelog and mark the series for saucy?

review: Needs Fixing

[lp:~renatofilho/indicator-messages/phablet-fix-1181371]

366. By Renato Araujo Oliveira Filho on 2013-06-05

releasing version 13.11.0phablet1

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:366
http://jenkins.qa.ubuntu.com/job/indicator-messages-phablet-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-phablet-saucy-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/indicator-messages-phablet-saucy-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-phablet-saucy-i386-ci/3

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

review: Approve (continuous-integration)

[Ted Gould (ted)]

The phablet branch is deprecated. I don't think this merge is still valid. If it is, please repropose into trunk.

review: Disapprove

Unmerged revisions

366. By Renato Araujo Oliveira Filho on 2013-06-05

releasing version 13.11.0phablet1

365. By Renato Araujo Oliveira Filho on 2013-06-05

Replaced deprecated functions.

364. By Renato Araujo Oliveira Filho on 2013-06-03

Try to fix blue icon.

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-26 16:54:41 +0000
+++ debian/changelog	2013-06-05 18:09:25 +0000
@@ -1,3 +1,10 @@
+indicator-messages (13.11.0phablet1) saucy; urgency=low
+
+  * Fixed indicator blue icon.
+  * Removed use of deprecated functions.
+
+ -- Renato Araujo Oliveira Filho <[e-mail]>  Wed, 05 Jun 2013 15:06:03 -0300
+
 indicator-messages (13.10.0phablet1) raring; urgency=low
 
   * Version bump to not pull from archives

=== modified file 'src/app-section.c'
--- src/app-section.c	2012-11-14 16:57:54 +0000
+++ src/app-section.c	2013-06-05 18:09:25 +0000
@@ -301,7 +301,7 @@
 
 	g_return_if_fail(priv->ids != NULL);
 
-	if (!indicator_desktop_shortcuts_nick_exec(priv->ids, nick)) {
+	if (!indicator_desktop_shortcuts_nick_exec_with_context(priv->ids, nick, NULL)) {
 		g_warning("Unable to execute nick '%s' for desktop file '%s'",
 			  nick, g_desktop_app_info_get_filename (priv->appinfo));
 	}

=== modified file 'src/ido-detail-label.c'
--- src/ido-detail-label.c	2012-09-04 17:20:20 +0000
+++ src/ido-detail-label.c	2013-06-05 18:09:25 +0000
@@ -140,8 +140,9 @@
 {
   const PangoFontDescription *font;
 
-  font = gtk_style_context_get_font (gtk_widget_get_style_context (widget),
-                                     gtk_widget_get_state_flags (widget));
+  gtk_style_context_get (gtk_widget_get_style_context (widget),
+                         gtk_widget_get_state_flags (widget),
+                         "font", &font, NULL);
 
   return pango_context_get_metrics (context,
                                     font,

=== modified file 'src/im-application-list.c'
--- src/im-application-list.c	2012-12-20 16:46:15 +0000
+++ src/im-application-list.c	2013-06-05 18:09:25 +0000
@@ -277,6 +277,7 @@
       g_strfreev (source_actions);
       g_strfreev (message_actions);
     }
+  im_application_list_update_draws_attention (app->list);
 }
 
 static void