commit e40e48d4e065f0c5e78bba27141bdea127b99905
author Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com> Thu Sep 17 18:38:25 2015 -0400
committer Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com> Mon Sep 21 10:14:19 2015 -0400
tree 613d6b10f84fc087c5806a0c8ae8eeb2213f6f6d
parent 0daae2111b9dbb2cf91dc0db21e1376344b1adb8

gnome: show git ref in about dialog and -v output

Translation template is updated to reflect slight modifications
in the code.

Issue: #80555
Change-Id: I74172992987656a4f70a95317d24bdede631bd5a

src/dialogs.c

diff --git a/src/dialogs.c b/src/dialogs.c
index da9a0a1..0b6dc7d 100644
--- a/src/dialogs.c
+++ b/src/dialogs.c
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 
 #include "dialogs.h"
@@ -34,6 +23,7 @@
 #include <glib/gi18n.h>
 #include <glib/gprintf.h>
 #include "config.h"
+#include "revision.h"
 
 GtkWidget *
 ring_dialog_working(GtkWidget *parent, const gchar *msg)
@@ -90,7 +80,9 @@
         g_clear_error(&error);
     }
 
-    gchar *name = g_strdup_printf(_("Gnome Ring v%d.%d.%d"), VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH);
+    gchar *name = g_strdup_printf("Gnome Ring");
+    gchar *version = g_strdup_printf(C_("Do not translate the release name", "release: Samuel de Champlain\nv%d.%d.%d - %.10s"),
+                                     VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, RING_CLIENT_REVISION);
 
     const gchar *authors[] = {
         [0] = "Adrien Béraud",
@@ -115,7 +107,7 @@
         "copyright", "© 2015 Savoir-faire Linux",
         "license-type", GTK_LICENSE_GPL_3_0,
         "logo", logo,
-        "version", C_("Do not translate the release name", "release: Samuel de Champlain"),
+        "version", version,
         "comments", _("The GNOME client for Ring.\nRing is a secured and distributed communication software."),
         "authors", authors,
         "website", "http://www.ring.cx/",
@@ -125,4 +117,5 @@
     );
 
     g_free(name);
+    g_free(version);
 }

src/ring_client_options.c

diff --git a/src/ring_client_options.c b/src/ring_client_options.c
index 78be5da..51ac1bc 100644
--- a/src/ring_client_options.c
+++ b/src/ring_client_options.c
@@ -21,6 +21,7 @@
 #include "ring_client_options.h"
 
 #include "config.h"
+#include "revision.h"
 #include "ring_client.h"
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
@@ -32,8 +33,7 @@
                   G_GNUC_UNUSED gpointer data,
                   G_GNUC_UNUSED GError **error)
 {
-    /* TODO: replace with auto generated version */
-    g_print("%d.%d.%d\n", VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH);
+    g_print("%d.%d.%d - %s\n", VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, RING_CLIENT_REVISION);
     exit(EXIT_SUCCESS);
 }