diff options
author | Niels De Graef <nielsdegraef@gmail.com> | 2018-04-30 10:20:26 +0200 |
---|---|---|
committer | Niels De Graef <nielsdegraef@gmail.com> | 2018-04-30 10:33:15 +0200 |
commit | 9d87da526cc92285ff50c1cc314ff36d7c86036e (patch) | |
tree | b25dfc505676e7dc9503acea841d1bd290910e5c | |
parent | 09bf5e0fd4547bc4122834469932b4b1e4ad39f3 (diff) | |
download | gnome-contacts-9d87da526cc92285ff50c1cc314ff36d7c86036e.tar.gz |
Rename icon to use org.gnome.Contacts (our app ID).
Fixes #95.
-rw-r--r-- | data/flatpak/org.gnome.Contacts.json | 1 | ||||
-rw-r--r-- | data/icons/hicolor/16x16/apps/org.gnome.Contacts.png (renamed from data/icons/hicolor/16x16/apps/gnome-contacts.png) | bin | 878 -> 878 bytes | |||
-rw-r--r-- | data/icons/hicolor/22x22/apps/org.gnome.Contacts.png (renamed from data/icons/hicolor/22x22/apps/gnome-contacts.png) | bin | 1264 -> 1264 bytes | |||
-rw-r--r-- | data/icons/hicolor/24x24/apps/org.gnome.Contacts.png (renamed from data/icons/hicolor/24x24/apps/gnome-contacts.png) | bin | 1317 -> 1317 bytes | |||
-rw-r--r-- | data/icons/hicolor/32x32/apps/org.gnome.Contacts.png (renamed from data/icons/hicolor/32x32/apps/gnome-contacts.png) | bin | 2119 -> 2119 bytes | |||
-rw-r--r-- | data/icons/hicolor/48x48/apps/org.gnome.Contacts.png (renamed from data/icons/hicolor/48x48/apps/gnome-contacts.png) | bin | 3402 -> 3402 bytes | |||
-rw-r--r-- | data/icons/hicolor/512x512/apps/org.gnome.Contacts.png (renamed from data/icons/hicolor/512x512/apps/gnome-contacts.png) | bin | 84688 -> 84688 bytes | |||
-rw-r--r-- | data/icons/hicolor/org.gnome.Contacts.svg (renamed from data/icons/hicolor/gnome-contacts.svg) | 0 | ||||
-rw-r--r-- | data/icons/hicolor/symbolic/apps/org.gnome.Contacts.svg (renamed from data/icons/hicolor/symbolic/apps/gnome-contacts-symbolic.svg) | 0 | ||||
-rw-r--r-- | data/org.gnome.Contacts.desktop.in | 2 | ||||
-rw-r--r-- | meson.build | 3 | ||||
-rw-r--r-- | src/contacts-accounts-list.vala | 6 | ||||
-rw-r--r-- | src/contacts-app.vala | 6 | ||||
-rw-r--r-- | vapi/config.vapi | 2 |
14 files changed, 11 insertions, 9 deletions
diff --git a/data/flatpak/org.gnome.Contacts.json b/data/flatpak/org.gnome.Contacts.json index dd20042..65d6299 100644 --- a/data/flatpak/org.gnome.Contacts.json +++ b/data/flatpak/org.gnome.Contacts.json @@ -5,7 +5,6 @@ "sdk": "org.gnome.Sdk", "command": "gnome-contacts", "desktop-file-name-prefix": "(Development) ", - "rename-icon": "gnome-contacts", "copy-icon": true, "finish-args": [ /* X11 + XShm access */ diff --git a/data/icons/hicolor/16x16/apps/gnome-contacts.png b/data/icons/hicolor/16x16/apps/org.gnome.Contacts.png Binary files differindex 7b3121f..7b3121f 100644 --- a/data/icons/hicolor/16x16/apps/gnome-contacts.png +++ b/data/icons/hicolor/16x16/apps/org.gnome.Contacts.png diff --git a/data/icons/hicolor/22x22/apps/gnome-contacts.png b/data/icons/hicolor/22x22/apps/org.gnome.Contacts.png Binary files differindex d1d1584..d1d1584 100644 --- a/data/icons/hicolor/22x22/apps/gnome-contacts.png +++ b/data/icons/hicolor/22x22/apps/org.gnome.Contacts.png diff --git a/data/icons/hicolor/24x24/apps/gnome-contacts.png b/data/icons/hicolor/24x24/apps/org.gnome.Contacts.png Binary files differindex 2f56f41..2f56f41 100644 --- a/data/icons/hicolor/24x24/apps/gnome-contacts.png +++ b/data/icons/hicolor/24x24/apps/org.gnome.Contacts.png diff --git a/data/icons/hicolor/32x32/apps/gnome-contacts.png b/data/icons/hicolor/32x32/apps/org.gnome.Contacts.png Binary files differindex cfadd37..cfadd37 100644 --- a/data/icons/hicolor/32x32/apps/gnome-contacts.png +++ b/data/icons/hicolor/32x32/apps/org.gnome.Contacts.png diff --git a/data/icons/hicolor/48x48/apps/gnome-contacts.png b/data/icons/hicolor/48x48/apps/org.gnome.Contacts.png Binary files differindex 2fbf4ce..2fbf4ce 100644 --- a/data/icons/hicolor/48x48/apps/gnome-contacts.png +++ b/data/icons/hicolor/48x48/apps/org.gnome.Contacts.png diff --git a/data/icons/hicolor/512x512/apps/gnome-contacts.png b/data/icons/hicolor/512x512/apps/org.gnome.Contacts.png Binary files differindex 000f08f..000f08f 100644 --- a/data/icons/hicolor/512x512/apps/gnome-contacts.png +++ b/data/icons/hicolor/512x512/apps/org.gnome.Contacts.png diff --git a/data/icons/hicolor/gnome-contacts.svg b/data/icons/hicolor/org.gnome.Contacts.svg index 031a067..031a067 100644 --- a/data/icons/hicolor/gnome-contacts.svg +++ b/data/icons/hicolor/org.gnome.Contacts.svg diff --git a/data/icons/hicolor/symbolic/apps/gnome-contacts-symbolic.svg b/data/icons/hicolor/symbolic/apps/org.gnome.Contacts.svg index f58d16d..f58d16d 100644 --- a/data/icons/hicolor/symbolic/apps/gnome-contacts-symbolic.svg +++ b/data/icons/hicolor/symbolic/apps/org.gnome.Contacts.svg diff --git a/data/org.gnome.Contacts.desktop.in b/data/org.gnome.Contacts.desktop.in index 9afe1ef..63945b4 100644 --- a/data/org.gnome.Contacts.desktop.in +++ b/data/org.gnome.Contacts.desktop.in @@ -4,7 +4,7 @@ Comment=A contacts manager for GNOME # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! Keywords=friends;address book; # Translators: Do NOT translate or transliterate this text (this is an icon file name)! -Icon=gnome-contacts +Icon=org.gnome.Contacts Exec=gnome-contacts Terminal=false Type=Application diff --git a/meson.build b/meson.build index ca560f9..9dd2509 100644 --- a/meson.build +++ b/meson.build @@ -20,6 +20,8 @@ docs_enabled = get_option('docs') manpage_enabled = get_option('manpage') # Common variables +contacts_app_id = 'org.gnome.Contacts' + config_h_dir = include_directories('.') contacts_prefix = get_option('prefix') datadir = join_paths(contacts_prefix, get_option('datadir')) @@ -66,6 +68,7 @@ valadoc = find_program('valadoc', required: docs_enabled) # Configuration conf = configuration_data() +conf.set_quoted('APP_ID', contacts_app_id) conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) conf.set_quoted('G_LOG_DOMAIN', meson.project_name()) conf.set_quoted('LOCALEDIR', locale_dir) diff --git a/src/contacts-accounts-list.vala b/src/contacts-accounts-list.vala index 0682a86..8ce7e4d 100644 --- a/src/contacts-accounts-list.vala +++ b/src/contacts-accounts-list.vala @@ -104,8 +104,7 @@ public class Contacts.AccountsList : Box { var provider_image = Contacts.get_icon_for_goa_account (source_account_id); row_data.attach (provider_image, 0, 0, 1, 2); } else { - var provider_image = new Image.from_icon_name ("gnome-contacts", - IconSize.DIALOG); + var provider_image = new Image.from_icon_name (Config.APP_ID, IconSize.DIALOG); row_data.attach (provider_image, 0, 0, 1, 2); } @@ -138,8 +137,7 @@ public class Contacts.AccountsList : Box { local_data.margin_start = 5; local_data.set_column_spacing (10); local_data.set_data ("store", local_store); - var provider_image = new Image.from_icon_name ("gnome-contacts", - IconSize.DIALOG); + var provider_image = new Image.from_icon_name (Config.APP_ID, IconSize.DIALOG); local_data.add (provider_image); var local_label = new Label (_("Local Address Book")); local_data.add (local_label); diff --git a/src/contacts-app.vala b/src/contacts-app.vala index 3e3043f..079b144 100644 --- a/src/contacts-app.vala +++ b/src/contacts-app.vala @@ -46,7 +46,7 @@ public class Contacts.App : Gtk.Application { public App () { Object ( - application_id: "org.gnome.Contacts", + application_id: Config.APP_ID, flags: ApplicationFlags.HANDLES_COMMAND_LINE ); @@ -79,7 +79,7 @@ public class Contacts.App : Gtk.Application { public override int handle_local_options (VariantDict options) { if ("version" in options) { - stdout.printf ("gnome-contacts %s\n", Config.PACKAGE_VERSION); + stdout.printf ("%s %s\n", Config.PACKAGE_NAME, Config.PACKAGE_VERSION); return 0; } @@ -185,7 +185,7 @@ public class Contacts.App : Gtk.Application { "comments", _("Contact Management Application"), "copyright", _("© 2011 Red Hat, Inc.\n© 2011-2018 The Contacts Developers"), "license-type", Gtk.License.GPL_2_0, - "logo-icon-name", "gnome-contacts", + "logo-icon-name", Config.APP_ID, "version", Config.PACKAGE_VERSION, "website", "https://wiki.gnome.org/Apps/Contacts", "wrap-license", true); diff --git a/vapi/config.vapi b/vapi/config.vapi index 1c1b43f..2459e3b 100644 --- a/vapi/config.vapi +++ b/vapi/config.vapi @@ -1,5 +1,7 @@ [CCode (lower_case_cprefix = "", cheader_filename = "config.h")] namespace Config { +public const string APP_ID; + /* Package information */ public const string PACKAGE_NAME; public const string PACKAGE_STRING; |