diff options
author | Matthias Clasen <mclasen@redhat.com> | 2021-02-10 13:55:50 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2021-02-10 13:55:50 +0000 |
commit | 6c85a4b2f5ea475acf3025e79ccbb864a17c693b (patch) | |
tree | d3692d43a535066ced8e4c451ab4eb6a64b634c0 | |
parent | d3096f079f846a04e39682a5b6fabba00801d669 (diff) | |
parent | befc2c3ed69c604a07a4a3e9bef3e9b0d6a5f161 (diff) | |
download | gtk+-6c85a4b2f5ea475acf3025e79ccbb864a17c693b.tar.gz |
Merge branch 'matthiasc/for-master' into 'master'
Matthiasc/for master
See merge request GNOME/gtk!3177
-rw-r--r-- | demos/icon-browser/iconbrowserapp.c | 2 | ||||
-rw-r--r-- | demos/node-editor/node-editor-application.c | 2 | ||||
-rw-r--r-- | demos/node-editor/node-editor-window.c | 2 | ||||
-rw-r--r-- | demos/node-editor/node-editor.gresource.xml | 2 | ||||
-rw-r--r-- | demos/print-editor/org.gtk.PrintEditor4.desktop | 2 | ||||
-rw-r--r-- | demos/print-editor/print-editor.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/demos/icon-browser/iconbrowserapp.c b/demos/icon-browser/iconbrowserapp.c index d214939c07..ee55407de4 100644 --- a/demos/icon-browser/iconbrowserapp.c +++ b/demos/icon-browser/iconbrowserapp.c @@ -89,7 +89,7 @@ about_activated (GSimpleAction *action, "website", "http://www.gtk.org", "comments", "Program to browse themed icons", "authors", authors, - "logo-icon-name", "org.gtk.Demo4", + "logo-icon-name", "org.gtk.IconBrowser4", "title", "About GTK Icon Browser", "system-information", s->str, NULL); diff --git a/demos/node-editor/node-editor-application.c b/demos/node-editor/node-editor-application.c index 91ca2fc5ec..d9a5ce34de 100644 --- a/demos/node-editor/node-editor-application.c +++ b/demos/node-editor/node-editor-application.c @@ -109,7 +109,7 @@ activate_about (GSimpleAction *action, "website", "http://www.gtk.org", "comments", "Program to test GTK rendering", "authors", (const char *[]){ "Benjamin Otte", "Timm Bäder", NULL}, - "logo-icon-name", "org.gtk.gtk4.NodeEditor.Devel", + "logo-icon-name", "org.gtk.gtk4.NodeEditor", "title", "About GTK Node Editor", "system-information", s->str, NULL); diff --git a/demos/node-editor/node-editor-window.c b/demos/node-editor/node-editor-window.c index 55c61aa799..0335a28c46 100644 --- a/demos/node-editor/node-editor-window.c +++ b/demos/node-editor/node-editor-window.c @@ -927,7 +927,7 @@ node_editor_window_init (NodeEditorWindow *self) "shadow {\n" " child: texture {\n" " bounds: 0 0 128 128;\n" - " texture: url(\"resource:///org/gtk/gtk4/node-editor/icons/apps/org.gtk.gtk4.NodeEditor.Devel.svg\");\n" + " texture: url(\"resource:///org/gtk/gtk4/node-editor/icons/apps/org.gtk.gtk4.NodeEditor.svg\");\n" " }\n" " shadows: rgba(0,0,0,0.5) 0 1 12;\n" "}\n" diff --git a/demos/node-editor/node-editor.gresource.xml b/demos/node-editor/node-editor.gresource.xml index 08464aa766..b32e88e661 100644 --- a/demos/node-editor/node-editor.gresource.xml +++ b/demos/node-editor/node-editor.gresource.xml @@ -4,6 +4,6 @@ <file preprocess="xml-stripblanks">node-editor-window.ui</file> <file preprocess="xml-stripblanks">help-window.ui</file> <file>node-format.md</file> - <file alias='icons/apps/org.gtk.gtk4.NodeEditor.Devel.svg'>data/scalable/apps/org.gtk.gtk4.NodeEditor.Devel.svg</file> + <file alias='icons/apps/org.gtk.gtk4.NodeEditor.svg'>data/scalable/apps/org.gtk.gtk4.NodeEditor.svg</file> </gresource> </gresources> diff --git a/demos/print-editor/org.gtk.PrintEditor4.desktop b/demos/print-editor/org.gtk.PrintEditor4.desktop index 375b31a77d..a8e3779c69 100644 --- a/demos/print-editor/org.gtk.PrintEditor4.desktop +++ b/demos/print-editor/org.gtk.PrintEditor4.desktop @@ -2,7 +2,7 @@ Name=Print Editor Comment=A simple editor demonstrating GTK printing Exec=gtk4-print-editor %f -Icon=org.gtk.PrintEditor4.Devel +Icon=org.gtk.PrintEditor4 Terminal=false Type=Application StartupNotify=true diff --git a/demos/print-editor/print-editor.c b/demos/print-editor/print-editor.c index 838c421b29..81dce41692 100644 --- a/demos/print-editor/print-editor.c +++ b/demos/print-editor/print-editor.c @@ -656,7 +656,7 @@ activate_about (GSimpleAction *action, "website", "http://www.gtk.org", "comments", "Program to demonstrate GTK printing", "authors", authors, - "logo-icon-name", "org.gtk.PrintEditor4.Devel", + "logo-icon-name", "org.gtk.PrintEditor4", "title", "About GTK Print Editor", "system-information", sysinfo->str, NULL); |