From 8fb8303ba0d70355a1af515a8f3100cbf2e496e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Thu, 2 Aug 2018 11:03:41 +0200 Subject: [PATCH] demos: Make desktop file names match the application id --- build-aux/flatpak/org.gtk.Demo.json | 1 - build-aux/flatpak/org.gtk.WidgetFactory.json | 1 - demos/gtk-demo/meson.build | 2 +- demos/gtk-demo/{gtk4-demo.desktop => org.gtk.Demo.desktop} | 0 demos/icon-browser/meson.build | 2 +- .../{gtk4-icon-browser.desktop => org.gtk.IconBrowser.desktop} | 0 demos/widget-factory/meson.build | 2 +- ...tk4-widget-factory.desktop => org.gtk.WidgetFactory.desktop} | 0 8 files changed, 3 insertions(+), 5 deletions(-) rename demos/gtk-demo/{gtk4-demo.desktop => org.gtk.Demo.desktop} (100%) rename demos/icon-browser/{gtk4-icon-browser.desktop => org.gtk.IconBrowser.desktop} (100%) rename demos/widget-factory/{gtk4-widget-factory.desktop => org.gtk.WidgetFactory.desktop} (100%) diff --git a/build-aux/flatpak/org.gtk.Demo.json b/build-aux/flatpak/org.gtk.Demo.json index a0c5085591..ca655a7bd6 100644 --- a/build-aux/flatpak/org.gtk.Demo.json +++ b/build-aux/flatpak/org.gtk.Demo.json @@ -5,7 +5,6 @@ "sdk": "org.gnome.Sdk", "command": "gtk4-demo", "tags": ["devel", "development", "nightly"], - "rename-desktop-file": "gtk4-demo.desktop", "rename-icon": "gtk4-demo", "desktop-file-name-prefix": "(Development) ", "finish-args": [ diff --git a/build-aux/flatpak/org.gtk.WidgetFactory.json b/build-aux/flatpak/org.gtk.WidgetFactory.json index c28acf426e..ea6aaa9938 100644 --- a/build-aux/flatpak/org.gtk.WidgetFactory.json +++ b/build-aux/flatpak/org.gtk.WidgetFactory.json @@ -5,7 +5,6 @@ "sdk": "org.gnome.Sdk", "command": "gtk4-widget-factory", "tags": ["devel", "development", "nightly"], - "rename-desktop-file": "gtk4-widget-factory.desktop", "rename-icon": "gtk4-widget-factory", "desktop-file-name-prefix": "(Development) ", "finish-args": [ diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build index e626fae503..93c2902575 100644 --- a/demos/gtk-demo/meson.build +++ b/demos/gtk-demo/meson.build @@ -129,7 +129,7 @@ foreach icon_size: [ '16x16', '22x22', '24x24', '32x32', '48x48', '256x256', ] endforeach # desktop file -install_data('gtk4-demo.desktop', install_dir: gtk_applicationsdir) +install_data('org.gtk.Demo.desktop', install_dir: gtk_applicationsdir) # GSettings install_data('org.gtk.Demo.gschema.xml', install_dir: gtk_schemasdir) diff --git a/demos/gtk-demo/gtk4-demo.desktop b/demos/gtk-demo/org.gtk.Demo.desktop similarity index 100% rename from demos/gtk-demo/gtk4-demo.desktop rename to demos/gtk-demo/org.gtk.Demo.desktop diff --git a/demos/icon-browser/meson.build b/demos/icon-browser/meson.build index 95b1c0f4e4..fcaca82d8d 100644 --- a/demos/icon-browser/meson.build +++ b/demos/icon-browser/meson.build @@ -17,4 +17,4 @@ executable('gtk4-icon-browser', link_args: extra_demo_ldflags, install: true) -install_data('gtk4-icon-browser.desktop', install_dir: gtk_applicationsdir) +install_data('org.gtk.IconBrowser.desktop', install_dir: gtk_applicationsdir) diff --git a/demos/icon-browser/gtk4-icon-browser.desktop b/demos/icon-browser/org.gtk.IconBrowser.desktop similarity index 100% rename from demos/icon-browser/gtk4-icon-browser.desktop rename to demos/icon-browser/org.gtk.IconBrowser.desktop diff --git a/demos/widget-factory/meson.build b/demos/widget-factory/meson.build index 2050d2e750..be7b5db57a 100644 --- a/demos/widget-factory/meson.build +++ b/demos/widget-factory/meson.build @@ -13,7 +13,7 @@ executable('gtk4-widget-factory', install: true) # desktop file -install_data('gtk4-widget-factory.desktop', install_dir: gtk_applicationsdir) +install_data('org.gtk.WidgetFactory.desktop', install_dir: gtk_applicationsdir) # icons icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor') diff --git a/demos/widget-factory/gtk4-widget-factory.desktop b/demos/widget-factory/org.gtk.WidgetFactory.desktop similarity index 100% rename from demos/widget-factory/gtk4-widget-factory.desktop rename to demos/widget-factory/org.gtk.WidgetFactory.desktop