Merge lp:~elementary-apps/pantheon-mail/granite-about into lp:~elementary-apps/pantheon-mail/trunk

[Danielle Foré]

Use Granite About

[Danielle Foré (danrabbit)]

Little stuck here, it seems to work fine from the menu but not from command line arg. Would love if someone could point out what I'm doing wrong.

review: Needs Fixing

[lp:~elementary-apps/pantheon-mail/granite-about]

1971. By Danielle Foré on 2016-02-09

blank line

[Danielle Foré (danrabbit)]

review: Abstain

[Ralph Plawetzki (purejava)]

Compiling on Freya does show the Granite.Widgets.AboutDialog when invoked with -a from the cli.

You are on Loki, right?
For testing reasons I could download the iso this evening and see if this makes a difference (right now I have a limited bandwidth).

[Ralph Plawetzki (purejava)]

Did not see your talk about this issue on slack before I wrote the comment above.
Removed startup(); in line 117 of geary-application.vala and compiled again. The AboutDialog is still shown - no crash here.

[Ralph Plawetzki (purejava)]

Please ignore the last two comments.
I did not capture all parts of the talk about this issue on slack.

[lp:~elementary-apps/pantheon-mail/granite-about]

1972. By Danielle Foré on 2016-02-09

fix website lable, copyright elementary in newline

1973. By Danielle Foré on 2016-02-09

merge trunk

[Mike Seese (seesemichaelj)]

Below is concerning the startup() call at line 117 in geary-application.vala proposed in revision 1969.

Technically, you only need to do a Gdk.init(). Gtk.init() calls Gdk.init() and Gtk.Application.startup() calls Gtk.init() and GearyApplication.startup() calls Gtk.Application.startup().

We just need to enforce that gdk gets initialized.

Gtk.Application.startup() only gets called if there is no other instance of the application. The startup signal is sent during register(). If a primary instance already exists, register() returns true but does not perform any work (see http://www.valadoc.org/#!api=gio-2.0/GLib.Application.register).
I have verified this by putting breakpoints in geary-application.vala lines 117 and 135. If register() called startup(), line 135 would be executed first, otherwise 117 would be. 117 was executed first.

Anyway, going back to the question at hand: is calling "startup()" okay even though another instance exists? I'm unsure of the other functions in GearyApplication.startup(), but they do not seem to be detrimental if called an extra time. Thus I approve the code, but we should keep this in the back our mind if future issues exist concerning starting Mail while Mail is already running (i.e. geary --about or just geary).

review: Approve (code)

=== modified file 'data/pantheon-mail.desktop.in'
--- data/pantheon-mail.desktop.in	2015-11-24 22:59:32 +0000
+++ data/pantheon-mail.desktop.in	2016-02-09 18:45:47 +0000
@@ -12,7 +12,11 @@
 Categories=GNOME;GTK;Network;Email;
 X-GNOME-Gettext-Domain=@GETTEXT_PACKAGE@
 X-GNOME-UsesNotifications=true
-Actions=Compose;
+Actions=AboutDialog;Compose;
+
+[Desktop Action AboutDialog]
+Name=About @APP_NAME@
+Exec=@EXEC_NAME@ --about
 
 [Desktop Action Compose]
 Name=Compose Message

=== modified file 'data/ui/app_menu.interface'
--- data/ui/app_menu.interface	2016-01-19 02:16:54 +0000
+++ data/ui/app_menu.interface	2016-02-09 18:45:47 +0000
@@ -14,10 +14,6 @@
         </section>
         <section>
             <item>
-                <attribute name='label' translatable='yes'>_About</attribute>
-                <attribute name='action'>app.GearyAbout</attribute>
-            </item>
-            <item>
                 <attribute name='label' translatable='yes'>_Quit</attribute>
                 <attribute name='action'>app.GearyQuit</attribute>
                 <attribute name='accel'>&lt;Primary&gt;Q</attribute>

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-01-26 20:57:53 +0000
+++ src/CMakeLists.txt	2016-02-09 18:45:47 +0000
@@ -518,6 +518,7 @@
 set(TARGET_GLIB 2.34)
 
 pkg_check_modules(DEPS REQUIRED
+    granite
     gthread-2.0
     glib-2.0>=${TARGET_GLIB}.0
     gio-2.0>=2.28.0
@@ -535,17 +536,18 @@
 )
 
 set(ENGINE_PACKAGES
-    glib-2.0 gee-0.8 gio-2.0 gmime-2.6 posix sqlite3 libxml-2.0
+    glib-2.0 granite gee-0.8 gio-2.0 gmime-2.6 posix sqlite3 libxml-2.0
 )
 
 # webkitgtk-3.0 is listed as a custom VAPI (below) to ensure it's treated as a dependency and
 # built before compilation
 set(CLIENT_PACKAGES
-    gtk+-3.0 libsecret-1 libsoup-2.4 libnotify libcanberra gcr-3 ${EXTRA_CLIENT_PACKAGES}
+    gtk+-3.0 granite libsecret-1 libsoup-2.4 libnotify libcanberra gcr-3 ${EXTRA_CLIENT_PACKAGES}
 )
 
 set(CONSOLE_PACKAGES
     gtk+-3.0
+    granite
 )
 
 set(GSETTINGS_DIR ${CMAKE_SOURCE_DIR}/data)

=== modified file 'src/client/application/geary-application.vala'
--- src/client/application/geary-application.vala	2016-02-06 02:37:42 +0000
+++ src/client/application/geary-application.vala	2016-02-09 18:45:47 +0000
@@ -15,11 +15,12 @@
     public const string NAME = "Mail";
     public const string PRGNAME = "geary";
     public const string APP_ID = "org.pantheon.mail";
-    public const string DESCRIPTION = _("Mail Client");
-    public const string COPYRIGHT = _("© 2011-2015 Yorba Foundation, © 2016 elementary LLC.");
-    public const string WEBSITE = "https://www.elementary.io";
+    public const string COPYRIGHT = _("2011-2015 Yorba Foundation\n© 2016 elementary LLC.");
+    public const string WEBSITE = "https://elementary.io";
     public const string WEBSITE_LABEL = _("Website");
     public const string BUGREPORT = "https://bugs.launchpad.net/pantheon-mail/+filebug";
+    public const string HELP = "https://elementary.io/help/geary";
+    public const string TRANSLATE = "https://translations.launchpad.net/pantheon-mail";
 
     public const string CONTRACT_NAME = _("Send by Email");
     public const string CONTRACT_DESCRIPTION = _("Send files using Mail");
@@ -38,6 +39,12 @@
         "Robert Schroll <[e-mail]>",
         null
     };
+
+    public const string[] ARTISTS = {
+        "Daniel Foré <[e-mail]>",
+        "Sam Hewitt <[e-mail]>",
+        null
+    };
     
     private static const string ACTION_ENTRY_COMPOSE = "compose";
     
@@ -106,7 +113,9 @@
         } catch (Error e) {
             error("Error registering GearyApplication: %s", e.message);
         }
-        
+
+        startup();
+
         if (!Args.parse(args)) {
             exit_status = 1;
             return true;

=== modified file 'src/client/application/geary-args.vala'
--- src/client/application/geary-args.vala	2015-02-06 20:43:33 +0000
+++ src/client/application/geary-args.vala	2016-02-09 18:45:47 +0000
@@ -7,6 +7,7 @@
 namespace Args {
 
 private const OptionEntry[] options = {
+    { "about", 'a', 0, OptionArg.NONE, ref show_about, N_("Show About dialog"), null },
     { "hidden", 0, 0, OptionArg.NONE, ref hidden_startup, N_("Start Geary with hidden main window"), null },
     { "debug", 'd', 0, OptionArg.NONE, ref log_debug, N_("Output debugging information"), null },
     { "log-conversations", 0, 0, OptionArg.NONE, ref log_conversations, N_("Log conversation monitoring"), null },
@@ -28,6 +29,7 @@
     { null }
 };
 
+public bool show_about = false;
 public bool hidden_startup = false;
 public bool log_debug = false;
 public bool log_network = false;
@@ -73,7 +75,12 @@
             return false;
         }
     }
-    
+
+    if (show_about) {
+        GearyController.on_about ();
+        Process.exit (0);
+    }
+
     if (version) {
         stdout.printf("%s %s\n", GearyApplication.PRGNAME, GearyApplication.VERSION);
         Process.exit(0);

=== modified file 'src/client/application/geary-controller.vala'
--- src/client/application/geary-controller.vala	2016-01-29 06:23:48 +0000
+++ src/client/application/geary-controller.vala	2016-02-09 18:45:47 +0000
@@ -19,7 +19,6 @@
     // Named actions.
     //
     // NOTE: Some actions with accelerators need to also be added to ui/accelerators.ui
-    public const string ACTION_ABOUT = "GearyAbout";
     public const string ACTION_QUIT = "GearyQuit";
     public const string ACTION_NEW_MESSAGE = "GearyNewMessage";
     public const string ACTION_REPLY_TO_MESSAGE = "GearyReplyToMessage";
@@ -375,10 +374,6 @@
         prefs.label = _("_Preferences");
         entries += prefs;
 
-        Gtk.ActionEntry about = { ACTION_ABOUT, Stock._ABOUT, TRANSLATABLE, null, null, on_about };
-        about.label = _("_About");
-        entries += about;
-
         Gtk.ActionEntry quit = { ACTION_QUIT, Stock._QUIT, TRANSLATABLE, "<Ctrl>Q", null, on_quit };
         quit.label = _("_Quit");
         entries += quit;
@@ -548,7 +543,6 @@
         const string[] exported_actions = {
             ACTION_ACCOUNTS,
             ACTION_PREFERENCES,
-            ACTION_ABOUT,
             ACTION_QUIT,
         };
 
@@ -1663,22 +1657,30 @@
         GearyApplication.instance.exit();
     }
 
-    private void on_about() {
-        Gtk.show_about_dialog(main_window,
-            "program-name", GearyApplication.NAME,
-            "comments", GearyApplication.DESCRIPTION,
-            "authors", GearyApplication.AUTHORS,
-            "copyright", GearyApplication.COPYRIGHT,
-            "license-type", Gtk.License.LGPL_2_1,
-            "logo_icon_name", "internet-mail",
-            "version", GearyApplication.VERSION,
-            "website", GearyApplication.WEBSITE,
-            "website-label", GearyApplication.WEBSITE_LABEL,
-            "title", _("About %s").printf(GearyApplication.NAME),
-            /// Translators: add your name and email address to receive credit in the About dialog
-            /// For example: Yamada Taro <[e-mail]>
-            "translator-credits", _("translator-credits")
-        );
+    public static void on_about() {
+        var dialog = create_about_dialog ();
+        dialog.run ();
+        dialog.destroy ();
+    }
+
+    public static Granite.Widgets.AboutDialog create_about_dialog () {
+        var about = new Granite.Widgets.AboutDialog ();
+        about.program_name = GearyApplication.NAME;
+        about.version = GearyApplication.VERSION;
+        about.logo_icon_name = "internet-mail";
+        about.copyright = GearyApplication.COPYRIGHT;
+        about.website = GearyApplication.WEBSITE;
+        about.website_label = GearyApplication.WEBSITE_LABEL;
+        about.authors = GearyApplication.AUTHORS;
+        about.artists = GearyApplication.ARTISTS;
+        // Translators: add your name and email address to receive credit in the About dialog
+        // For example: Yamada Taro <[e-mail]>
+        about.translator_credits = _("translator-credits");
+        about.license_type = Gtk.License.LGPL_2_1;
+        about.help = GearyApplication.HELP;
+        about.translate = GearyApplication.TRANSLATE;
+        about.bug = GearyApplication.BUGREPORT;
+        return about;
     }
 
     private void on_shift_key(bool pressed) {