Merge lp:~elementary-apps/audience/about-in-quicklist into lp:~audience-members/audience/trunk

[Julián Unrrein]

Add an "About Audience" entry to the static quicklist.

Add an "About Audience" entry to the static quicklist.

[Julián Unrrein (junrrein)]

I did a "make pot" test in a local branch, and it seems not be doing anything in the .pot file for Audience. Please check this before approving.

[Julián Unrrein (junrrein)]

I fixed the problem with new translatable strings not being pulled for translation. There were incorrect paths in po/CMakeLists.txt.

[Raphael Isemann (teemperor)]

Uh, it crashes for me when i use the quick-list action:

[_LOG_LEVEL_DEBUG 22:45:32.570184] Application.vala:285: The show-about-dialog action was activated

Program received signal SIGSEGV, Segmentation fault.
0x00007ffff5ba12c9 in g_object_ref_sink ()
   from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
(gdb) bt
#0 0x00007ffff5ba12c9 in g_object_ref_sink ()
   from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#1 0x00007ffff7b30463 in granite_widgets_show_about_dialog ()
   from /usr/lib/x86_64-linux-gnu/libgranite.so.2
#2 0x00007ffff7b3139a in granite_application_real_show_about ()
   from /usr/lib/x86_64-linux-gnu/libgranite.so.2
#3 0x00007ffff7b31419 in granite_application_show_about ()
   from /usr/lib/x86_64-linux-gnu/libgranite.so.2
#4 0x00007ffff7b314f9 in __lambda12_ () from /usr/lib/x86_64-linux-gnu/libgranite.so.2
#5 0x00007ffff7b31527 in ___lambda12__g_simple_action_activate ()
   from /usr/lib/x86_64-linux-gnu/libgranite.so.2
#6 0x00007ffff5b983b8 in g_closure_invoke ()
   from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#7 0x00007ffff5ba9d3d in ?? () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#8 0x00007ffff5bb1a29 in g_signal_emit_valist ()
   from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#9 0x00007ffff5bb1ce2 in g_signal_emit ()
   from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#10 0x00007ffff65e4c35 in ?? () from /usr/lib/x86_64-linux-gnu/libgio-2.0.so.0
#11 0x00007ffff65daff4 in ?? () from /usr/lib/x86_64-linux-gnu/libgio-2.0.so.0
#12 0x00007ffff65e1ed7 in ?? () from /usr/lib/x86_64-linux-gnu/libgio-2.0.so.0
#13 0x00007ffff6602de1 in ?? () from /usr/lib/x86_64-linux-gnu/libgio-2.0.so.0
#14 0x00007ffff58c8ce5 in g_main_context_dispatch ()
   from /lib/x86_64-linux-gnu/libglib-2.0.so.0
---Type <return> to continue, or q <return> to quit---
#15 0x00007ffff58c9048 in ?? () from /lib/x86_64-linux-gnu/libglib-2.0.so.0
#16 0x00007ffff58c90ec in g_main_context_iteration ()
   from /lib/x86_64-linux-gnu/libglib-2.0.so.0
#17 0x00007ffff65dd67c in g_application_run ()
   from /usr/lib/x86_64-linux-gnu/libgio-2.0.so.0
#18 0x00007ffff7b30c67 in granite_application_run ()
   from /usr/lib/x86_64-linux-gnu/libgranite.so.2
#19 0x00000000004154d4 in _vala_main (args=0x7fffffffdf78, args_length1=1)
    at /home/teemperor/workspace/about-in-quicklist/src/Audience.vala:721
#20 0x0000000000415511 in main (argc=1, argv=0x7fffffffdf78)
    at /home/teemperor/workspace/about-in-quicklist/src/Audience.vala:709

[Julián Unrrein (junrrein)]

I can't replicate it here using Vala 0.24, Gtk 3.12.2 and Granite from the daily PPA. And the crash is coming from Granite.

[Julián Unrrein (junrrein)]

@teemperor: Does running "audience --about" using the version from trunk also segfaults on your side?

[Julián Unrrein (junrrein)]

I'll try another approach using "gapplication action".

[Julián Unrrein (junrrein)]

This branch isn't in a testable way right now.

[Julián Unrrein (junrrein)]

I meant in a testable state. I was trying using "gapplication action" to launch the about dialog instead of the --about command line flag, and see if that would be the problem. It's not testable because the GLib package in Trusty doesn't ship the gapplication binary for some reason, which should for GLib 2.40, but that's another matter.

I may end up reverting those commits, depending on if/how the crash issue is resolved.

[Julián Unrrein (junrrein)]

A fix for the crash has landed in Granite, and I rolled back the "gapplication action" commits. This branch is in a testable state again.

[Corentin Noël (tintou)]

It seems there is a problem with the about dialog if the about_authors is not set.
I suggest to add Cody Garver and Tom Beckmann as authors as they have the highest amount of commits.

[lp:~elementary-apps/audience/about-in-quicklist]

361. By Julián Unrrein on 2014-09-03

Add info about the authors.

[Julián Unrrein (junrrein)]

Added authors.

=== added file 'AUTHORS'
--- AUTHORS	1970-01-01 00:00:00 +0000
+++ AUTHORS	2014-09-03 00:07:36 +0000
@@ -0,0 +1,2 @@
+Cody Garver <[e-mail]>
+Tom Beckmann <[e-mail]>
\ No newline at end of file

=== modified file 'data/audience.desktop'
--- data/audience.desktop	2014-06-16 11:41:59 +0000
+++ data/audience.desktop	2014-09-03 00:07:36 +0000
@@ -12,3 +12,8 @@
 MimeType=application/x-musepack;application/musepack;application/x-ape;application/x-id3;application/ogg;application/x-ogg;application/x-vorbis+ogg;application/x-flac;video/quicktime;video/x-quicktime;application/x-quicktimeplayer;application/smil;application/vnd.rn-realmedia;video/vnd.rn-realvideo;application/asx;video/x-ms-asf-plugin;video/x-msvideo;video/msvideo;application/x-mplayer2;application/x-ms-wmv;video/x-ms-asf;video/x-ms-wm;video/x-ms-wmv;video/x-ms-wmp;video/x-ms-wvx;application/x-drm-v2;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/3gpp;video/fli;video/x-fli;video/x-flv;video/vnd.vivo;application/x-nsv-vp3-mp3;video/x-matroska;video/matroska;video/x-mng;video/webm;video/x-webm;video/mp2t;video/vnd.mpegurl;video/x-ogm+ogg;
 X-GNOME-Gettext-Domain=audience
 X-PulseAudio-Properties=media.role=video
+Actions=AboutDialog;
+
+[Desktop Action AboutDialog]
+Exec=audience --about
+Name=About Audience
\ No newline at end of file

=== modified file 'src/Audience.vala'
--- src/Audience.vala	2014-08-30 18:30:01 +0000
+++ src/Audience.vala	2014-09-03 00:07:36 +0000
@@ -51,8 +51,9 @@
             help_url = "https://code.launchpad.net/audience";
             translate_url = "https://translations.launchpad.net/audience";
 
-            /*about_authors = {""};
-            about_documenters = {""};
+            about_authors = { "Cody Garver <[e-mail]>",
+                              "Tom Beckmann <[e-mail]>" };
+            /*about_documenters = {""};
             about_artists = {""};
             about_translators = "Launchpad Translators";
             about_comments = "To be determined"; */
@@ -763,4 +764,4 @@
     var app = new Audience.App ();
 
     app.run (args);
-}
+}
\ No newline at end of file

=== modified file 'src/desktop-launcher.vala'
--- src/desktop-launcher.vala	2012-06-08 04:16:28 +0000
+++ src/desktop-launcher.vala	2014-09-03 00:07:36 +0000
@@ -4,4 +4,5 @@
     /* changes in these launcher keys in .desktop file.          */
     public const string COMMENT = N_("Play your media");
     public const string GENERIC_NAME = N_("Media Player");
-}
+    public const string ABOUT = N_("About Audience");
+}
\ No newline at end of file