From cfc156b77a11d16aa5c4c273bfe50d74df59ecf9 Mon Sep 17 00:00:00 2001 From: Mathieu Bridon Date: Sun, 3 Dec 2017 15:40:16 +0100 Subject: Use reverse DNS naming for icon, desktop file, DBus service, app ID (#221) The convention is to use reverse DNS for the DBus service names, icons, desktop files and application ID. Flatpak enforces that convention, and even requires at least 3 components in those names. --- main/CMakeLists.txt | 10 +++++----- main/data/icons/dino-symbolic.svg | 6 ------ main/data/icons/dino.svg | 30 ------------------------------ main/data/icons/im.dino.Dino-symbolic.svg | 6 ++++++ main/data/icons/im.dino.Dino.svg | 30 ++++++++++++++++++++++++++++++ main/data/im.dino.Dino.desktop | 13 +++++++++++++ main/data/im.dino.Dino.service | 3 +++ main/data/im.dino.desktop | 13 ------------- main/data/im.dino.service | 3 --- main/data/unified_window_placeholder.ui | 2 +- main/src/ui/application.vala | 4 ++-- 11 files changed, 60 insertions(+), 60 deletions(-) delete mode 100644 main/data/icons/dino-symbolic.svg delete mode 100644 main/data/icons/dino.svg create mode 100644 main/data/icons/im.dino.Dino-symbolic.svg create mode 100644 main/data/icons/im.dino.Dino.svg create mode 100644 main/data/im.dino.Dino.desktop create mode 100644 main/data/im.dino.Dino.service delete mode 100644 main/data/im.dino.desktop delete mode 100644 main/data/im.dino.service diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 3e23fffc..28cd355d 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -17,7 +17,7 @@ set(RESOURCE_LIST icons/dino-status-chat.svg icons/dino-status-dnd.svg icons/dino-status-online.svg - icons/dino-symbolic.svg + icons/im.dino.Dino-symbolic.svg icons/dino-tick-symbolic.svg add_conversation/add_contact_dialog.ui @@ -147,10 +147,10 @@ if(WIN32) endif(WIN32) install(TARGETS dino ${TARGET_INSTALL}) -install(FILES data/im.dino.desktop DESTINATION ${DESKTOP_FILE_INSTALL_DIR}) -install(FILES data/im.dino.service DESTINATION ${SERVICE_FILE_INSTALL_DIR}) -install(FILES data/icons/dino.svg DESTINATION ${ICON_INSTALL_DIR}/hicolor/scalable/apps) -install(FILES data/icons/dino-symbolic.svg DESTINATION ${ICON_INSTALL_DIR}/hicolor/symbolic/apps) +install(FILES data/im.dino.Dino.desktop DESTINATION ${DESKTOP_FILE_INSTALL_DIR}) +install(FILES data/im.dino.Dino.service DESTINATION ${SERVICE_FILE_INSTALL_DIR}) +install(FILES data/icons/im.dino.Dino.svg DESTINATION ${ICON_INSTALL_DIR}/hicolor/scalable/apps) +install(FILES data/icons/im.dino.Dino-symbolic.svg DESTINATION ${ICON_INSTALL_DIR}/hicolor/symbolic/apps) install(FILES data/icons/dino-status-away.svg data/icons/dino-status-chat.svg diff --git a/main/data/icons/dino-symbolic.svg b/main/data/icons/dino-symbolic.svg deleted file mode 100644 index 00680734..00000000 --- a/main/data/icons/dino-symbolic.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/main/data/icons/dino.svg b/main/data/icons/dino.svg deleted file mode 100644 index 27634d5a..00000000 --- a/main/data/icons/dino.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/main/data/icons/im.dino.Dino-symbolic.svg b/main/data/icons/im.dino.Dino-symbolic.svg new file mode 100644 index 00000000..00680734 --- /dev/null +++ b/main/data/icons/im.dino.Dino-symbolic.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/main/data/icons/im.dino.Dino.svg b/main/data/icons/im.dino.Dino.svg new file mode 100644 index 00000000..27634d5a --- /dev/null +++ b/main/data/icons/im.dino.Dino.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/main/data/im.dino.Dino.desktop b/main/data/im.dino.Dino.desktop new file mode 100644 index 00000000..90f3e38f --- /dev/null +++ b/main/data/im.dino.Dino.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Version=1.0 +Name=Dino +GenericName=Jabber/XMPP Client +Keywords=chat;talk;im;message;xmpp;jabber; +Exec=dino %U +Icon=im.dino.Dino +StartupNotify=false +Terminal=false +Type=Application +Categories=GTK;Network;Chat;InstantMessaging; +X-GNOME-UsesNotifications=true +MimeType=x-scheme-handler/xmpp; diff --git a/main/data/im.dino.Dino.service b/main/data/im.dino.Dino.service new file mode 100644 index 00000000..8f6ebbba --- /dev/null +++ b/main/data/im.dino.Dino.service @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=im.dino.Dino +Exec=dino diff --git a/main/data/im.dino.desktop b/main/data/im.dino.desktop deleted file mode 100644 index b53ef111..00000000 --- a/main/data/im.dino.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Dino -GenericName=Jabber/XMPP Client -Keywords=chat;talk;im;message;xmpp;jabber; -Exec=dino %U -Icon=dino -StartupNotify=false -Terminal=false -Type=Application -Categories=GTK;Network;Chat;InstantMessaging; -X-GNOME-UsesNotifications=true -MimeType=x-scheme-handler/xmpp; diff --git a/main/data/im.dino.service b/main/data/im.dino.service deleted file mode 100644 index 02339e92..00000000 --- a/main/data/im.dino.service +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=im.dino -Exec=dino diff --git a/main/data/unified_window_placeholder.ui b/main/data/unified_window_placeholder.ui index 70307e6e..429c95c6 100644 --- a/main/data/unified_window_placeholder.ui +++ b/main/data/unified_window_placeholder.ui @@ -13,7 +13,7 @@ True - dino-symbolic + im.dino.Dino-symbolic 144 30 True diff --git a/main/src/ui/application.vala b/main/src/ui/application.vala index e4fdd9eb..e8424684 100644 --- a/main/src/ui/application.vala +++ b/main/src/ui/application.vala @@ -14,10 +14,10 @@ public class Dino.Ui.Application : Gtk.Application, Dino.Application { public SearchPathGenerator? search_path_generator { get; set; } public Application() throws Error { - Object(application_id: "im.dino", flags: ApplicationFlags.HANDLES_OPEN); + Object(application_id: "im.dino.Dino", flags: ApplicationFlags.HANDLES_OPEN); init(); Environment.set_application_name("Dino"); - Window.set_default_icon_name("dino"); + Window.set_default_icon_name("im.dino.Dino"); CssProvider provider = new CssProvider(); provider.load_from_resource("/im/dino/theme.css"); -- cgit v1.2.3-54-g00ecf