diff --git a/README.md b/README.md
index 52d1527..30b117a 100644
--- a/README.md
+++ b/README.md
@@ -31,9 +31,9 @@ All kaomojis are stored in a simple, accessible format:
To add your own category/emoticon, simply create a folder and a corresponding .txt file in either `$XDG_DATA_HOME/moemoji/kaomoji/` or `/usr/local/share/moemoji`.
-If you use flatpak, the correct data path is `~/.var/app/net.angeltech.MoeMoji/data/`.
+If you use flatpak, the correct data path is `~/.var/app/jp.angeltech.MoeMoji/data/`.
So adding your own emoticons would look like this:
-1. `cd ~/.var/app/net.angeltech.MoeMoji/data/`
+1. `cd ~/.var/app/jp.angeltech.MoeMoji/data/`
2. `mkdir -p moemoji/kaomoji`
3. `cd moemoji/kaomoji`
4. `mkdir your-category`
@@ -51,5 +51,5 @@ Run dev build: `GSETTINGS_SCHEMA_DIR=./builddir/data ./builddir/src/moemoji`
# Flatpak packaging
-`flatpak-builder --force-clean --user --install .flatpak-build net.angeltech.MoeMoji.json`
-`flatpak run net.angeltech.MoeMoji`
+`flatpak-builder --force-clean --user --install .flatpak-build jp.angeltech.MoeMoji.json`
+`flatpak run jp.angeltech.MoeMoji`
diff --git a/data/icons/hicolor/scalable/apps/net.angeltech.MoeMoji-tray-dark.svg b/data/icons/hicolor/scalable/apps/jp.angeltech.MoeMoji-tray-dark.svg
similarity index 100%
rename from data/icons/hicolor/scalable/apps/net.angeltech.MoeMoji-tray-dark.svg
rename to data/icons/hicolor/scalable/apps/jp.angeltech.MoeMoji-tray-dark.svg
diff --git a/data/icons/hicolor/scalable/apps/net.angeltech.MoeMoji-tray-light.svg b/data/icons/hicolor/scalable/apps/jp.angeltech.MoeMoji-tray-light.svg
similarity index 100%
rename from data/icons/hicolor/scalable/apps/net.angeltech.MoeMoji-tray-light.svg
rename to data/icons/hicolor/scalable/apps/jp.angeltech.MoeMoji-tray-light.svg
diff --git a/data/icons/hicolor/scalable/apps/net.angeltech.MoeMoji.svg b/data/icons/hicolor/scalable/apps/jp.angeltech.MoeMoji.svg
similarity index 100%
rename from data/icons/hicolor/scalable/apps/net.angeltech.MoeMoji.svg
rename to data/icons/hicolor/scalable/apps/jp.angeltech.MoeMoji.svg
diff --git a/data/icons/hicolor/symbolic/apps/net.angeltech.MoeMoji-symbolic.svg b/data/icons/hicolor/symbolic/apps/jp.angeltech.MoeMoji-symbolic.svg
similarity index 100%
rename from data/icons/hicolor/symbolic/apps/net.angeltech.MoeMoji-symbolic.svg
rename to data/icons/hicolor/symbolic/apps/jp.angeltech.MoeMoji-symbolic.svg
diff --git a/data/icons/meson.build b/data/icons/meson.build
index ffe5ebf..1e2be81 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -1,4 +1,4 @@
-application_id = 'net.angeltech.MoeMoji'
+application_id = 'jp.angeltech.MoeMoji'
scalable_dir = join_paths('hicolor', 'scalable', 'apps')
install_data(
diff --git a/data/net.angeltech.MoeMoji.appdata.xml.in b/data/jp.angeltech.MoeMoji.appdata.xml.in
similarity index 79%
rename from data/net.angeltech.MoeMoji.appdata.xml.in
rename to data/jp.angeltech.MoeMoji.appdata.xml.in
index a216bfc..c12bbf0 100644
--- a/data/net.angeltech.MoeMoji.appdata.xml.in
+++ b/data/jp.angeltech.MoeMoji.appdata.xml.in
@@ -1,6 +1,6 @@
- net.angeltech.MoeMoji
+ jp.angeltech.MoeMoji
MoeMoji
Moe picker!
@@ -11,7 +11,7 @@
CC0-1.0
- net.angeltech.MoeMoji.desktop
+ jp.angeltech.MoeMoji.desktop
WTFPL
diff --git a/data/net.angeltech.MoeMoji.desktop.in b/data/jp.angeltech.MoeMoji.desktop.in
similarity index 88%
rename from data/net.angeltech.MoeMoji.desktop.in
rename to data/jp.angeltech.MoeMoji.desktop.in
index 27fac39..f11de4e 100644
--- a/data/net.angeltech.MoeMoji.desktop.in
+++ b/data/jp.angeltech.MoeMoji.desktop.in
@@ -2,7 +2,7 @@
Type=Application
Name=MoeMoji
Comment=Japanese emoticon picker!
-Icon=net.angeltech.MoeMoji
+Icon=jp.angeltech.MoeMoji
Exec=moemoji
Terminal=false
Categories=Accessibility;GTK;Utility;
diff --git a/data/net.angeltech.MoeMoji.gschema.xml b/data/jp.angeltech.MoeMoji.gschema.xml
similarity index 59%
rename from data/net.angeltech.MoeMoji.gschema.xml
rename to data/jp.angeltech.MoeMoji.gschema.xml
index 5d4861a..dcabd96 100644
--- a/data/net.angeltech.MoeMoji.gschema.xml
+++ b/data/jp.angeltech.MoeMoji.gschema.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/data/meson.build b/data/meson.build
index 9a261da..33c1903 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,6 +1,6 @@
desktop_file = i18n.merge_file(
- input: 'net.angeltech.MoeMoji.desktop.in',
- output: 'net.angeltech.MoeMoji.desktop',
+ input: 'jp.angeltech.MoeMoji.desktop.in',
+ output: 'jp.angeltech.MoeMoji.desktop',
type: 'desktop',
po_dir: '../po',
install: true,
@@ -15,8 +15,8 @@ if desktop_utils.found()
endif
appstream_file = i18n.merge_file(
- input: 'net.angeltech.MoeMoji.appdata.xml.in',
- output: 'net.angeltech.MoeMoji.appdata.xml',
+ input: 'jp.angeltech.MoeMoji.appdata.xml.in',
+ output: 'jp.angeltech.MoeMoji.appdata.xml',
po_dir: '../po',
install: true,
install_dir: join_paths(get_option('datadir'), 'appdata')
@@ -29,12 +29,12 @@ if appstream_util.found()
)
endif
-gnome.compile_schemas(build_by_default: true, depend_files: 'net.angeltech.MoeMoji.gschema.xml')
+gnome.compile_schemas(build_by_default: true, depend_files: 'jp.angeltech.MoeMoji.gschema.xml')
devenv = environment()
devenv.set('GSETTINGS_SCHEMA_DIR', meson.current_build_dir() / 'data')
meson.add_devenv(devenv)
-install_data('net.angeltech.MoeMoji.gschema.xml',
+install_data('jp.angeltech.MoeMoji.gschema.xml',
install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas')
)
diff --git a/net.angeltech.MoeMoji.json b/jp.angeltech.MoeMoji.json
similarity index 81%
rename from net.angeltech.MoeMoji.json
rename to jp.angeltech.MoeMoji.json
index 5f43f91..457e703 100644
--- a/net.angeltech.MoeMoji.json
+++ b/jp.angeltech.MoeMoji.json
@@ -1,5 +1,5 @@
{
- "app-id": "net.angeltech.MoeMoji",
+ "app-id": "jp.angeltech.MoeMoji",
"runtime": "org.gnome.Platform",
"runtime-version": "49",
"sdk": "org.gnome.Sdk",
@@ -9,8 +9,7 @@
"--socket=fallback-x11",
"--socket=wayland",
"--talk-name=org.kde.StatusNotifierWatcher",
- "--talk-name=org.freedesktop.portal.Desktop",
- "--own-name=org.kde.*"
+ "--own-name=org.kde.StatusNotifierItem-2-1"
],
"modules": [
{
diff --git a/src/main.c b/src/main.c
index cb87a28..603c75c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -21,7 +21,7 @@ static void register_with_portal (void) {
"org.freedesktop.host.portal.Registry",
"Register",
g_variant_new ("(s@a{sv})",
- "net.angeltech.MoeMoji",
+ "jp.angeltech.MoeMoji",
g_variant_builder_end (&options)),
NULL,
G_DBUS_CALL_FLAGS_NONE,
@@ -41,6 +41,6 @@ int main (int argc, char *argv[]) {
textdomain(GETTEXT_PACKAGE);
register_with_portal ();
g_autoptr(MoeMojiApplication) app =
- moemoji_application_new("net.angeltech.MoeMoji", G_APPLICATION_DEFAULT_FLAGS);
+ moemoji_application_new("jp.angeltech.MoeMoji", G_APPLICATION_DEFAULT_FLAGS);
return g_application_run(G_APPLICATION(app), argc, argv);
}
diff --git a/src/moemoji-application.c b/src/moemoji-application.c
index f2f1025..a9e8dab 100644
--- a/src/moemoji-application.c
+++ b/src/moemoji-application.c
@@ -246,7 +246,7 @@ GVariant *sni_get_property(G_GNUC_UNUSED GDBusConnection *connection,
MoeMojiApplication *self = MOEMOJI_APPLICATION(user_data);
return g_variant_new_string(self->tray_icon_name
? self->tray_icon_name
- : "net.angeltech.MoeMoji-tray-dark");
+ : "jp.angeltech.MoeMoji-tray-dark");
}
if (g_strcmp0(property_name, "ItemIsMenu") == 0)
return g_variant_new_boolean(FALSE);
@@ -279,8 +279,8 @@ static void on_sni_bus_name_acquired(GDBusConnection *connection,
static void update_tray_icon(MoeMojiApplication *self) {
AdwStyleManager *sm = adw_style_manager_get_default();
gboolean dark = adw_style_manager_get_dark(sm);
- self->tray_icon_name = dark ? "net.angeltech.MoeMoji-tray-dark"
- : "net.angeltech.MoeMoji-tray-light";
+ self->tray_icon_name = dark ? "jp.angeltech.MoeMoji-tray-dark"
+ : "jp.angeltech.MoeMoji-tray-light";
if (self->dbus_conn && self->sni_registration_id > 0) {
g_dbus_connection_emit_signal(self->dbus_conn, NULL, "/StatusNotifierItem",
@@ -507,8 +507,8 @@ static void moemoji_application_startup(GApplication *app) {
MoeMojiApplication *self = MOEMOJI_APPLICATION(app);
gtk_icon_theme_add_resource_path(
gtk_icon_theme_get_for_display(gdk_display_get_default()),
- "/net/angeltech/MoeMoji/icons");
- gtk_window_set_default_icon_name("net.angeltech.MoeMoji-symbolic");
+ "/jp/angeltech/MoeMoji/icons");
+ gtk_window_set_default_icon_name("jp.angeltech.MoeMoji-symbolic");
gboolean in_flatpak = g_file_test("/.flatpak-info", G_FILE_TEST_EXISTS);
if (in_flatpak) {
self->icon_theme_path = NULL;
@@ -592,7 +592,7 @@ static void moemoji_application_class_init(MoeMojiApplicationClass *klass) {
}
static void moemoji_application_init(MoeMojiApplication *self) {
- self->settings = g_settings_new("net.angeltech.MoeMoji");
+ self->settings = g_settings_new("jp.angeltech.MoeMoji");
self->window_created = FALSE;
self->shortcuts_bound = FALSE;
g_autoptr(GSimpleAction) quit_action = g_simple_action_new("quit", NULL);
diff --git a/src/moemoji-window.c b/src/moemoji-window.c
index 6c3306f..f646e3e 100644
--- a/src/moemoji-window.c
+++ b/src/moemoji-window.c
@@ -260,7 +260,7 @@ static void on_search_changed(GtkSearchEntry *entry, gpointer user_data) {
static void moemoji_window_class_init(MoeMojiWindowClass *klass) {
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
gtk_widget_class_set_template_from_resource(
- widget_class, "/net/angeltech/MoeMoji/moemoji-window.ui");
+ widget_class, "/jp/angeltech/MoeMoji/moemoji-window.ui");
gtk_widget_class_bind_template_child(widget_class, MoeMojiWindow, outer_box);
gtk_widget_class_bind_template_child(widget_class, MoeMojiWindow,
content_box);
diff --git a/src/moemoji.gresource.xml b/src/moemoji.gresource.xml
index dde04ee..2ce2a23 100644
--- a/src/moemoji.gresource.xml
+++ b/src/moemoji.gresource.xml
@@ -1,10 +1,10 @@
-
+
moemoji-window.ui
style.css
wp.png
- ../data/icons/hicolor/scalable/apps/net.angeltech.MoeMoji.svg
- ../data/icons/hicolor/symbolic/apps/net.angeltech.MoeMoji-symbolic.svg
+ ../data/icons/hicolor/scalable/apps/jp.angeltech.MoeMoji.svg
+ ../data/icons/hicolor/symbolic/apps/jp.angeltech.MoeMoji-symbolic.svg
-
\ No newline at end of file
+
diff --git a/src/style.css b/src/style.css
index b5072d7..82841d4 100644
--- a/src/style.css
+++ b/src/style.css
@@ -31,7 +31,7 @@
}
.wallpaper-bg {
- background-image: linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)), url("/net/angeltech/MoeMoji/wp.png");
+ background-image: linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)), url("/jp/angeltech/MoeMoji/wp.png");
background-size: cover;
background-color: transparent;
}