[gtk/appnames: 3/7] gtk-demo: Rename to org.gtk.Demo4
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/appnames: 3/7] gtk-demo: Rename to org.gtk.Demo4
- Date: Tue, 2 Apr 2019 00:34:15 +0000 (UTC)
commit 365400c13e89d5251f442f06a4d4c086c7989ae8
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Apr 1 18:49:09 2019 -0400
gtk-demo: Rename to org.gtk.Demo4
.gitlab-ci.yml | 2 +-
build-aux/flatpak/{org.gtk.Demo.json => org.gtk.Demo4.json} | 2 +-
demos/gtk-demo/application.c | 10 +++++-----
demos/gtk-demo/application_demo.c | 6 +++---
.../data/scalable/apps/{org.gtk.Demo.svg => org.gtk.Demo4.svg} | 0
.../{org.gtk.Demo-symbolic.svg => org.gtk.Demo4-symbolic.svg} | 2 +-
demos/gtk-demo/demo.gresource.xml | 2 +-
demos/gtk-demo/main.c | 4 ++--
demos/gtk-demo/meson.build | 6 +++---
.../{org.gtk.Demo.appdata.xml => org.gtk.Demo4.appdata.xml} | 2 +-
demos/gtk-demo/{org.gtk.Demo.desktop => org.gtk.Demo4.desktop} | 2 +-
.../{org.gtk.Demo.gschema.xml => org.gtk.Demo4.gschema.xml} | 6 +++---
demos/gtk-demo/sidebar.c | 2 +-
demos/gtk-demo/stack.ui | 2 +-
14 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 620cba17f4..f56c81e5dd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,7 +55,7 @@ msys2-mingw32:
flatpak:demo:
variables:
- APPID: org.gtk.Demo
+ APPID: org.gtk.Demo4
<<: *flatpak-defaults
flatpak:widget-factory:
diff --git a/build-aux/flatpak/org.gtk.Demo.json b/build-aux/flatpak/org.gtk.Demo4.json
similarity index 98%
rename from build-aux/flatpak/org.gtk.Demo.json
rename to build-aux/flatpak/org.gtk.Demo4.json
index bb2c1054eb..067be8efbe 100644
--- a/build-aux/flatpak/org.gtk.Demo.json
+++ b/build-aux/flatpak/org.gtk.Demo4.json
@@ -1,5 +1,5 @@
{
- "app-id": "org.gtk.Demo",
+ "app-id": "org.gtk.Demo4",
"runtime": "org.gnome.Platform",
"runtime-version": "master",
"sdk": "org.gnome.Sdk",
diff --git a/demos/gtk-demo/application.c b/demos/gtk-demo/application.c
index e1e2d881c6..740e64ef40 100644
--- a/demos/gtk-demo/application.c
+++ b/demos/gtk-demo/application.c
@@ -212,7 +212,7 @@ activate_about (GSimpleAction *action,
"comments", "Program to demonstrate GTK functions.",
"authors", authors,
"documenters", documentors,
- "logo-icon-name", "org.gtk.Demo",
+ "logo-icon-name", "org.gtk.Demo4",
"title", "About GTK Code Demos",
NULL);
}
@@ -370,7 +370,7 @@ demo_application_init (DemoApplication *app)
GSettings *settings;
GAction *action;
- settings = g_settings_new ("org.gtk.Demo");
+ settings = g_settings_new ("org.gtk.Demo4");
g_action_map_add_action_entries (G_ACTION_MAP (app),
app_entries, G_N_ELEMENTS (app_entries),
@@ -397,7 +397,7 @@ demo_application_window_store_state (DemoApplicationWindow *win)
{
GSettings *settings;
- settings = g_settings_new ("org.gtk.Demo");
+ settings = g_settings_new ("org.gtk.Demo4");
g_settings_set (settings, "window-size", "(ii)", win->width, win->height);
g_settings_set_boolean (settings, "maximized", win->maximized);
g_settings_set_boolean (settings, "fullscreen", win->fullscreen);
@@ -409,7 +409,7 @@ demo_application_window_load_state (DemoApplicationWindow *win)
{
GSettings *settings;
- settings = g_settings_new ("org.gtk.Demo");
+ settings = g_settings_new ("org.gtk.Demo4");
g_settings_get (settings, "window-size", "(ii)", &win->width, &win->height);
win->maximized = g_settings_get_boolean (settings, "maximized");
win->fullscreen = g_settings_get_boolean (settings, "fullscreen");
@@ -541,7 +541,7 @@ main (int argc, char *argv[])
GtkApplication *app;
app = GTK_APPLICATION (g_object_new (demo_application_get_type (),
- "application-id", "org.gtk.Demo2",
+ "application-id", "org.gtk.Demo4.App",
"flags", G_APPLICATION_HANDLES_OPEN,
NULL));
diff --git a/demos/gtk-demo/application_demo.c b/demos/gtk-demo/application_demo.c
index d2eb69f2b6..8f36568464 100644
--- a/demos/gtk-demo/application_demo.c
+++ b/demos/gtk-demo/application_demo.c
@@ -52,7 +52,7 @@ do_application_demo (GtkWidget *toplevel)
if (watch == 0)
watch = g_bus_watch_name (G_BUS_TYPE_SESSION,
- "org.gtk.Demo2",
+ "org.gtk.Demo4.App",
0,
on_name_appeared,
on_name_vanished,
@@ -80,8 +80,8 @@ do_application_demo (GtkWidget *toplevel)
else
{
g_dbus_connection_call_sync (g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL),
- "org.gtk.Demo2",
- "/org/gtk/Demo2",
+ "org.gtk.Demo4.App",
+ "/org/gtk/Demo4/App",
"org.gtk.Actions",
"Activate",
g_variant_new ("(sava{sv})", "quit", NULL, NULL),
diff --git a/demos/gtk-demo/data/scalable/apps/org.gtk.Demo.svg
b/demos/gtk-demo/data/scalable/apps/org.gtk.Demo4.svg
similarity index 100%
rename from demos/gtk-demo/data/scalable/apps/org.gtk.Demo.svg
rename to demos/gtk-demo/data/scalable/apps/org.gtk.Demo4.svg
diff --git a/demos/gtk-demo/data/symbolic/apps/org.gtk.Demo-symbolic.svg
b/demos/gtk-demo/data/symbolic/apps/org.gtk.Demo4-symbolic.svg
similarity index 98%
rename from demos/gtk-demo/data/symbolic/apps/org.gtk.Demo-symbolic.svg
rename to demos/gtk-demo/data/symbolic/apps/org.gtk.Demo4-symbolic.svg
index 033dae5ebd..da6cc64463 100644
--- a/demos/gtk-demo/data/symbolic/apps/org.gtk.Demo-symbolic.svg
+++ b/demos/gtk-demo/data/symbolic/apps/org.gtk.Demo4-symbolic.svg
@@ -10,7 +10,7 @@
xmlns="http://www.w3.org/2000/svg";
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- sodipodi:docname="org.gtk.Demo-symbolic.svg"
+ sodipodi:docname="org.gtk.Demo4-symbolic.svg"
height="16.03125"
id="svg7384"
inkscape:version="0.92.4 5da689c313, 2019-01-14"
diff --git a/demos/gtk-demo/demo.gresource.xml b/demos/gtk-demo/demo.gresource.xml
index cdf86c3c35..051161242c 100644
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -270,7 +270,7 @@
<file>demotaggedentry.c</file>
<file>demotaggedentry.h</file>
</gresource>
- <gresource prefix="/org/gtk/Demo">
+ <gresource prefix="/org/gtk/Demo4">
<file>icons/16x16/actions/application-exit.png</file>
<file>icons/16x16/actions/document-new.png</file>
<file>icons/16x16/actions/document-open.png</file>
diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index 81a01e06fc..acd4335111 100644
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -58,7 +58,7 @@ activate_about (GSimpleAction *action,
"website", "http://www.gtk.org";,
"comments", "Program to demonstrate GTK widgets",
"authors", authors,
- "logo-icon-name", "org.gtk.Demo",
+ "logo-icon-name", "org.gtk.Demo4",
"title", "About GTK Demo",
NULL);
}
@@ -1212,7 +1212,7 @@ main (int argc, char **argv)
}
/* -- End of hack -- */
- app = gtk_application_new ("org.gtk.Demo", G_APPLICATION_NON_UNIQUE|G_APPLICATION_HANDLES_COMMAND_LINE);
+ app = gtk_application_new ("org.gtk.Demo4", G_APPLICATION_NON_UNIQUE|G_APPLICATION_HANDLES_COMMAND_LINE);
g_action_map_add_action_entries (G_ACTION_MAP (app),
app_entries, G_N_ELEMENTS (app_entries),
diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
index 86fd6d6b80..cbe956d0c2 100644
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -134,11 +134,11 @@ foreach size: ['scalable', 'symbolic']
endforeach
# desktop file
-install_data('org.gtk.Demo.desktop', install_dir: gtk_applicationsdir)
+install_data('org.gtk.Demo4.desktop', install_dir: gtk_applicationsdir)
# GSettings
-install_data('org.gtk.Demo.gschema.xml', install_dir: gtk_schemasdir)
+install_data('org.gtk.Demo4.gschema.xml', install_dir: gtk_schemasdir)
gnome.compile_schemas()
# appdata
-install_data('org.gtk.Demo.appdata.xml', install_dir: gtk_appdatadir)
+install_data('org.gtk.Demo4.appdata.xml', install_dir: gtk_appdatadir)
diff --git a/demos/gtk-demo/org.gtk.Demo.appdata.xml b/demos/gtk-demo/org.gtk.Demo4.appdata.xml
similarity index 97%
rename from demos/gtk-demo/org.gtk.Demo.appdata.xml
rename to demos/gtk-demo/org.gtk.Demo4.appdata.xml
index 9f37d11a73..5aa974bfb8 100644
--- a/demos/gtk-demo/org.gtk.Demo.appdata.xml
+++ b/demos/gtk-demo/org.gtk.Demo4.appdata.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop">
- <id>org.gtk.Demo.desktop</id>
+ <id>org.gtk.Demo4.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>LGPL-2.0+</project_license>
<name>GTK Demo</name>
diff --git a/demos/gtk-demo/org.gtk.Demo.desktop b/demos/gtk-demo/org.gtk.Demo4.desktop
similarity index 90%
rename from demos/gtk-demo/org.gtk.Demo.desktop
rename to demos/gtk-demo/org.gtk.Demo4.desktop
index e9078dfe30..0322b6a570 100644
--- a/demos/gtk-demo/org.gtk.Demo.desktop
+++ b/demos/gtk-demo/org.gtk.Demo4.desktop
@@ -2,7 +2,7 @@
Name=GTK Demo
Comment=GTK code examples and demonstrations
Exec=gtk4-demo
-Icon=org.gtk.Demo
+Icon=org.gtk.Demo4
Terminal=false
Type=Application
StartupNotify=true
diff --git a/demos/gtk-demo/org.gtk.Demo.gschema.xml b/demos/gtk-demo/org.gtk.Demo4.gschema.xml
similarity index 77%
rename from demos/gtk-demo/org.gtk.Demo.gschema.xml
rename to demos/gtk-demo/org.gtk.Demo4.gschema.xml
index 93be088b10..3eaa6e8b40 100644
--- a/demos/gtk-demo/org.gtk.Demo.gschema.xml
+++ b/demos/gtk-demo/org.gtk.Demo4.gschema.xml
@@ -2,14 +2,14 @@
<schemalist>
- <enum id='org.gtk.Demo.Color'>
+ <enum id='org.gtk.Demo4.Color'>
<value nick='red' value='0'/>
<value nick='green' value='1'/>
<value nick='blue' value='2'/>
</enum>
- <schema id='org.gtk.Demo' path='/org/gtk/Demo/'>
- <key name='color' enum='org.gtk.Demo.Color'>
+ <schema id='org.gtk.Demo4' path='/org/gtk/Demo4/'>
+ <key name='color' enum='org.gtk.Demo4.Color'>
<default>'red'</default>
</key>
<key name='window-size' type='(ii)'>
diff --git a/demos/gtk-demo/sidebar.c b/demos/gtk-demo/sidebar.c
index ab4ab2a7e4..b591d46010 100644
--- a/demos/gtk-demo/sidebar.c
+++ b/demos/gtk-demo/sidebar.c
@@ -65,7 +65,7 @@ do_sidebar (GtkWidget *do_widget)
{
if (i == 0)
{
- widget = gtk_image_new_from_icon_name ("org.gtk.Demo");
+ widget = gtk_image_new_from_icon_name ("org.gtk.Demo4");
gtk_image_set_pixel_size (GTK_IMAGE (widget), 256);
}
else
diff --git a/demos/gtk-demo/stack.ui b/demos/gtk-demo/stack.ui
index 97565a9ba6..24b21b713e 100644
--- a/demos/gtk-demo/stack.ui
+++ b/demos/gtk-demo/stack.ui
@@ -25,7 +25,7 @@
<object class="GtkImage">
<property name="margin-top">20</property>
<property name="margin-bottom">20</property>
- <property name="icon-name">org.gtk.Demo</property>
+ <property name="icon-name">org.gtk.Demo4</property>
</object>
</property>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]