Commit e2b85e9c authored by Simon McVittie's avatar Simon McVittie

New upstream version 3.36.2

parents f5292df1 db8ac3f6
{
"app-id": "org.gnome.Contacts.Devel",
"runtime": "org.gnome.Platform",
"runtime-version": "master",
"runtime-version": "3.36",
"sdk": "org.gnome.Sdk",
"command": "gnome-contacts",
"tags" : [
......@@ -9,25 +9,16 @@
"Nightly"
],
"finish-args": [
/* X11 + XShm access */
"--share=ipc", "--socket=fallback-x11",
/* Wayland access */
"--socket=wayland",
"--device=dri",
/* Webcam access */
/* FIMXE: Remove when the webcam portal is available */
"--device=all",
/* Notification access */
"--talk-name=org.freedesktop.Notifications",
/* GNOME Control Center (for the Online Accounts panel) */
"--talk-name=org.gnome.ControlCenter",
/* GNOME Online Accounts */
"--talk-name=org.gnome.OnlineAccounts",
/* Evolution Data server */
"--talk-name=org.gnome.evolution.dataserver.AddressBook10",
"--talk-name=org.gnome.evolution.dataserver.Sources5",
"--talk-name=org.gnome.evolution.dataserver.Subprocess.Backend.*",
/* Access for the default avatars */
"--filesystem=xdg-data/pixmaps/faces:ro:create"
],
"cleanup": [
......@@ -41,7 +32,6 @@
],
"modules": [
{
/* Needed by g-o-a */
"name": "librest",
"sources": [
{
......@@ -58,6 +48,7 @@
"sources": [
{
"type": "git",
"branch": "gnome-3-36",
"url": "https://gitlab.gnome.org/GNOME/gnome-online-accounts.git"
}
]
......@@ -125,6 +116,7 @@
"sources": [
{
"type": "git",
"branch": "gnome-3-36",
"url": "https://gitlab.gnome.org/GNOME/evolution-data-server.git"
}
]
......@@ -144,6 +136,7 @@
"sources": [
{
"type": "git",
"branch": "folks-0-14",
"url": "https://gitlab.gnome.org/GNOME/folks.git"
}
]
......@@ -160,6 +153,7 @@
"sources": [
{
"type": "git",
"branch": "gnome-3-36",
"url": "https://gitlab.gnome.org/GNOME/gnome-desktop.git"
}
]
......
......@@ -26,6 +26,19 @@
</screenshots>
<releases>
<release date="2020-06-19" version="3.36.2">
<description>
<p>
Version 3.36.2 is the next release in the stable 3.36 series, with
the following improvements since 3.36.1:
</p>
<ul>
<li>Fixed an issue where typing n had the same as effect as &lt;Ctrl&gt;n</li>
<li>Fixed an issue where the setup window didn't show an icon</li>
<li>This release also updates the Slovak translation.</li>
</ul>
</description>
</release>
<release date="2020-04-17" version="3.36.1">
<description>
<p>
......
......@@ -2,10 +2,8 @@
<interface>
<!-- interface-requires gtk+ 3.22 -->
<template class="ContactsSetupWindow" parent="GtkApplicationWindow">
<property name="visible">True</property>
<property name="default_width">800</property>
<property name="default_height">600</property>
<property name="icon_name">gnome-contacts</property>
<child type="titlebar">
<object class="GtkHeaderBar">
<property name="visible">True</property>
......
project('gnome-contacts', [ 'vala', 'c' ],
version: '3.36.1',
version: '3.36.2',
license: 'GPL2+',
meson_version: '>= 0.50',
)
......
This diff is collapsed.
......@@ -55,7 +55,6 @@ public class Contacts.App : Gtk.Application {
this.settings = new Settings (this);
add_main_option_entries (options);
create_actions ();
}
public override int command_line (ApplicationCommandLine command_line) {
......@@ -267,14 +266,6 @@ public class Contacts.App : Gtk.Application {
}
}
private void create_actions () {
this.add_action_entries (action_entries, this);
this.set_accels_for_action ("app.help", {"F1"});
this.set_accels_for_action ("app.new-contact", {"<Primary>n"});
this.set_accels_for_action ("win.show-help-overlay", {"<Primary>question"});
}
private void create_window () {
this.window = new Contacts.Window (this.settings, this, this.contacts_store);
}
......@@ -343,6 +334,15 @@ public class Contacts.App : Gtk.Application {
base.startup ();
load_styling ();
create_actions ();
}
private void create_actions () {
this.add_action_entries (action_entries, this);
this.set_accels_for_action ("app.help", {"F1"});
this.set_accels_for_action ("app.new-contact", {"<Primary>n"});
this.set_accels_for_action ("win.show-help-overlay", {"<Primary>question"});
}
public void load_styling () {
......
......@@ -36,7 +36,7 @@ public class Contacts.SetupWindow : Gtk.ApplicationWindow {
public signal void setup_done (Edsf.PersonaStore selected_address_book);
public SetupWindow (App app, Store store) {
Object (application: app);
Object (application: app, icon_name: Config.APP_ID);
this.setup_accounts_list = new AccountsList (store);
this.setup_accounts_list.hexpand = true;
this.setup_accounts_list.show ();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment