From 351c7dc9fa6fea65938f0de4e1cc445ad1771ec3 Mon Sep 17 00:00:00 2001 From: Mathieu Bridon Date: Wed, 24 Jan 2018 18:37:15 +0100 Subject: Do not use hyphen for the reverse-DNS names The convention for DBus and Flatpak is to not use hyphens in the last segment of a name. In fact, this is even illegal in object paths. This commit moves everything from org.gnome.d-feet to org.gnome.dfeet --- configure.ac | 2 +- data/Makefile.am | 6 +- .../scalable/apps/org.gnome.d-feet.svg | 2153 ------------------- .../HighContrast/scalable/apps/org.gnome.dfeet.svg | 2153 +++++++++++++++++++ data/icons/Makefile.am | 18 +- data/icons/hicolor/16x16/apps/org.gnome.d-feet.png | Bin 1002 -> 0 bytes data/icons/hicolor/16x16/apps/org.gnome.dfeet.png | Bin 0 -> 1002 bytes data/icons/hicolor/24x24/apps/org.gnome.d-feet.png | Bin 1522 -> 0 bytes data/icons/hicolor/24x24/apps/org.gnome.dfeet.png | Bin 0 -> 1522 bytes .../hicolor/256x256/apps/org.gnome.d-feet.png | Bin 39476 -> 0 bytes .../icons/hicolor/256x256/apps/org.gnome.dfeet.png | Bin 0 -> 39476 bytes data/icons/hicolor/32x32/apps/org.gnome.d-feet.png | Bin 2443 -> 0 bytes data/icons/hicolor/32x32/apps/org.gnome.dfeet.png | Bin 0 -> 2443 bytes data/icons/hicolor/48x48/apps/org.gnome.d-feet.png | Bin 4393 -> 0 bytes data/icons/hicolor/48x48/apps/org.gnome.dfeet.png | Bin 0 -> 4393 bytes .../hicolor/scalable/apps/org.gnome.d-feet.svg | 2233 -------------------- .../hicolor/scalable/apps/org.gnome.dfeet.svg | 2233 ++++++++++++++++++++ data/org.gnome.d-feet.appdata.xml.in | 27 - data/org.gnome.d-feet.desktop.in.in | 11 - data/org.gnome.d-feet.gschema.xml | 4 - data/org.gnome.dfeet.appdata.xml.in | 27 + data/org.gnome.dfeet.desktop.in.in | 11 + data/org.gnome.dfeet.gschema.xml | 4 + data/ui/bus.ui | 2 +- org.gnome.d-feet.json | 67 - org.gnome.dfeet.json | 67 + po/POTFILES.in | 6 +- po/POTFILES.skip | 2 +- src/dfeet/application.py | 2 +- src/tests/tests.py | 6 +- 30 files changed, 4517 insertions(+), 4517 deletions(-) delete mode 100644 data/icons/HighContrast/scalable/apps/org.gnome.d-feet.svg create mode 100644 data/icons/HighContrast/scalable/apps/org.gnome.dfeet.svg delete mode 100644 data/icons/hicolor/16x16/apps/org.gnome.d-feet.png create mode 100644 data/icons/hicolor/16x16/apps/org.gnome.dfeet.png delete mode 100644 data/icons/hicolor/24x24/apps/org.gnome.d-feet.png create mode 100644 data/icons/hicolor/24x24/apps/org.gnome.dfeet.png delete mode 100644 data/icons/hicolor/256x256/apps/org.gnome.d-feet.png create mode 100644 data/icons/hicolor/256x256/apps/org.gnome.dfeet.png delete mode 100644 data/icons/hicolor/32x32/apps/org.gnome.d-feet.png create mode 100644 data/icons/hicolor/32x32/apps/org.gnome.dfeet.png delete mode 100644 data/icons/hicolor/48x48/apps/org.gnome.d-feet.png create mode 100644 data/icons/hicolor/48x48/apps/org.gnome.dfeet.png delete mode 100644 data/icons/hicolor/scalable/apps/org.gnome.d-feet.svg create mode 100644 data/icons/hicolor/scalable/apps/org.gnome.dfeet.svg delete mode 100644 data/org.gnome.d-feet.appdata.xml.in delete mode 100644 data/org.gnome.d-feet.desktop.in.in delete mode 100644 data/org.gnome.d-feet.gschema.xml create mode 100644 data/org.gnome.dfeet.appdata.xml.in create mode 100644 data/org.gnome.dfeet.desktop.in.in create mode 100644 data/org.gnome.dfeet.gschema.xml delete mode 100644 org.gnome.d-feet.json create mode 100644 org.gnome.dfeet.json diff --git a/configure.ac b/configure.ac index bdeee4c..48102ea 100644 --- a/configure.ac +++ b/configure.ac @@ -48,7 +48,7 @@ AC_CONFIG_FILES([ src/dfeet/Makefile src/tests/Makefile data/Makefile - data/org.gnome.d-feet.desktop.in + data/org.gnome.dfeet.desktop.in data/icons/Makefile data/ui/Makefile help/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 4c7e363..c50d1b6 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,12 +1,12 @@ SUBDIRS = icons ui -gsettings_SCHEMAS = org.gnome.d-feet.gschema.xml +gsettings_SCHEMAS = org.gnome.dfeet.gschema.xml @GSETTINGS_RULES@ @INTLTOOL_DESKTOP_RULE@ desktopdir = $(datadir)/applications -desktop_in_files = org.gnome.d-feet.desktop.in +desktop_in_files = org.gnome.dfeet.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) UPDATE_DESKTOP = if test -z "$(DESTDIR)"; then update-desktop-database $(datadir)/applications || :; fi @@ -14,7 +14,7 @@ UPDATE_DESKTOP = if test -z "$(DESTDIR)"; then update-desktop-database $(datadir @INTLTOOL_XML_RULE@ appdatadir = $(datadir)/metainfo appdata_DATA = $(appdata_in_files:.xml.in=.xml) -appdata_in_files = org.gnome.d-feet.appdata.xml.in +appdata_in_files = org.gnome.dfeet.appdata.xml.in install-data-hook: diff --git a/data/icons/HighContrast/scalable/apps/org.gnome.d-feet.svg b/data/icons/HighContrast/scalable/apps/org.gnome.d-feet.svg deleted file mode 100644 index 3d6255d..0000000 --- a/data/icons/HighContrast/scalable/apps/org.gnome.d-feet.svg +++ /dev/null @@ -1,2153 +0,0 @@ - - - - - Optical Drive - - - - image/svg+xml - - Optical Drive - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/HighContrast/scalable/apps/org.gnome.dfeet.svg b/data/icons/HighContrast/scalable/apps/org.gnome.dfeet.svg new file mode 100644 index 0000000..3d6255d --- /dev/null +++ b/data/icons/HighContrast/scalable/apps/org.gnome.dfeet.svg @@ -0,0 +1,2153 @@ + + + + + Optical Drive + + + + image/svg+xml + + Optical Drive + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index 4e7c21d..5439998 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -1,6 +1,6 @@ icon16dir = $(datadir)/icons/hicolor/16x16/apps icon16_DATA = \ - hicolor/16x16/apps/org.gnome.d-feet.png \ + hicolor/16x16/apps/org.gnome.dfeet.png \ hicolor/16x16/apps/dfeet-method-category.png \ hicolor/16x16/apps/dfeet-method.png \ hicolor/16x16/apps/dfeet-object.png \ @@ -11,28 +11,28 @@ icon16_DATA = \ hicolor/16x16/apps/dfeet-icon-default-service.png icon24dir = $(datadir)/icons/hicolor/24x24/apps -icon24_DATA = hicolor/24x24/apps/org.gnome.d-feet.png +icon24_DATA = hicolor/24x24/apps/org.gnome.dfeet.png icon32dir = $(datadir)/icons/hicolor/32x32/apps -icon32_DATA = hicolor/32x32/apps/org.gnome.d-feet.png +icon32_DATA = hicolor/32x32/apps/org.gnome.dfeet.png icon48dir = $(datadir)/icons/hicolor/48x48/apps -icon48_DATA = hicolor/48x48/apps/org.gnome.d-feet.png +icon48_DATA = hicolor/48x48/apps/org.gnome.dfeet.png #icon64dir = $(datadir)/icons/hicolor/64x64/apps -#icon64_DATA = hicolor/64x64/apps/org.gnome.d-feet.png +#icon64_DATA = hicolor/64x64/apps/org.gnome.dfeet.png #icon128dir = $(datadir)/icons/hicolor/128x128/apps -#icon128_DATA = hicolor/128x128/apps/org.gnome.d-feet.png +#icon128_DATA = hicolor/128x128/apps/org.gnome.dfeet.png icon256dir = $(datadir)/icons/hicolor/256x256/apps -icon256_DATA = hicolor/256x256/apps/org.gnome.d-feet.png +icon256_DATA = hicolor/256x256/apps/org.gnome.dfeet.png scalabledir = $(datadir)/icons/hicolor/scalable/apps -scalable_DATA = hicolor/scalable/apps/org.gnome.d-feet.svg +scalable_DATA = hicolor/scalable/apps/org.gnome.dfeet.svg scalablehcdir = $(datadir)/icons/HighContrast/scalable/apps -scalablehc_DATA = HighContrast/scalable/apps/org.gnome.d-feet.svg +scalablehc_DATA = HighContrast/scalable/apps/org.gnome.dfeet.svg gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor diff --git a/data/icons/hicolor/16x16/apps/org.gnome.d-feet.png b/data/icons/hicolor/16x16/apps/org.gnome.d-feet.png deleted file mode 100644 index 0915dde..0000000 Binary files a/data/icons/hicolor/16x16/apps/org.gnome.d-feet.png and /dev/null differ diff --git a/data/icons/hicolor/16x16/apps/org.gnome.dfeet.png b/data/icons/hicolor/16x16/apps/org.gnome.dfeet.png new file mode 100644 index 0000000..0915dde Binary files /dev/null and b/data/icons/hicolor/16x16/apps/org.gnome.dfeet.png differ diff --git a/data/icons/hicolor/24x24/apps/org.gnome.d-feet.png b/data/icons/hicolor/24x24/apps/org.gnome.d-feet.png deleted file mode 100644 index 0112930..0000000 Binary files a/data/icons/hicolor/24x24/apps/org.gnome.d-feet.png and /dev/null differ diff --git a/data/icons/hicolor/24x24/apps/org.gnome.dfeet.png b/data/icons/hicolor/24x24/apps/org.gnome.dfeet.png new file mode 100644 index 0000000..0112930 Binary files /dev/null and b/data/icons/hicolor/24x24/apps/org.gnome.dfeet.png differ diff --git a/data/icons/hicolor/256x256/apps/org.gnome.d-feet.png b/data/icons/hicolor/256x256/apps/org.gnome.d-feet.png deleted file mode 100644 index 4202063..0000000 Binary files a/data/icons/hicolor/256x256/apps/org.gnome.d-feet.png and /dev/null differ diff --git a/data/icons/hicolor/256x256/apps/org.gnome.dfeet.png b/data/icons/hicolor/256x256/apps/org.gnome.dfeet.png new file mode 100644 index 0000000..4202063 Binary files /dev/null and b/data/icons/hicolor/256x256/apps/org.gnome.dfeet.png differ diff --git a/data/icons/hicolor/32x32/apps/org.gnome.d-feet.png b/data/icons/hicolor/32x32/apps/org.gnome.d-feet.png deleted file mode 100644 index 50a90c8..0000000 Binary files a/data/icons/hicolor/32x32/apps/org.gnome.d-feet.png and /dev/null differ diff --git a/data/icons/hicolor/32x32/apps/org.gnome.dfeet.png b/data/icons/hicolor/32x32/apps/org.gnome.dfeet.png new file mode 100644 index 0000000..50a90c8 Binary files /dev/null and b/data/icons/hicolor/32x32/apps/org.gnome.dfeet.png differ diff --git a/data/icons/hicolor/48x48/apps/org.gnome.d-feet.png b/data/icons/hicolor/48x48/apps/org.gnome.d-feet.png deleted file mode 100644 index d99ed04..0000000 Binary files a/data/icons/hicolor/48x48/apps/org.gnome.d-feet.png and /dev/null differ diff --git a/data/icons/hicolor/48x48/apps/org.gnome.dfeet.png b/data/icons/hicolor/48x48/apps/org.gnome.dfeet.png new file mode 100644 index 0000000..d99ed04 Binary files /dev/null and b/data/icons/hicolor/48x48/apps/org.gnome.dfeet.png differ diff --git a/data/icons/hicolor/scalable/apps/org.gnome.d-feet.svg b/data/icons/hicolor/scalable/apps/org.gnome.d-feet.svg deleted file mode 100644 index b2e99e1..0000000 --- a/data/icons/hicolor/scalable/apps/org.gnome.d-feet.svg +++ /dev/null @@ -1,2233 +0,0 @@ - - - - - Optical Drive - - - - image/svg+xml - - Optical Drive - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/hicolor/scalable/apps/org.gnome.dfeet.svg b/data/icons/hicolor/scalable/apps/org.gnome.dfeet.svg new file mode 100644 index 0000000..b2e99e1 --- /dev/null +++ b/data/icons/hicolor/scalable/apps/org.gnome.dfeet.svg @@ -0,0 +1,2233 @@ + + + + + Optical Drive + + + + image/svg+xml + + Optical Drive + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/org.gnome.d-feet.appdata.xml.in b/data/org.gnome.d-feet.appdata.xml.in deleted file mode 100644 index 87c4bb6..0000000 --- a/data/org.gnome.d-feet.appdata.xml.in +++ /dev/null @@ -1,27 +0,0 @@ - - - - org.gnome.d-feet.desktop - CC0-1.0 - GPL-2.0+ - <_name>D-Feet - <_summary>Debug D-Bus applications - - <_p> - A simple application for debugging the message bus system D-Bus. - D-Feet can be used to inspect D-Bus interfaces of running programs and - invoke methods on those interfaces. - - - - - https://git.gnome.org/browse/d-feet/plain/data/screenshots/d-feet-overview.png - - - https://wiki.gnome.org/Apps/DFeet - https://bugzilla.gnome.org/enter_bug.cgi?product=d-feet - http://www.gnome.org/friends/ - thomasbechtold_at_jpberlin_de - GNOME - d-feet - diff --git a/data/org.gnome.d-feet.desktop.in.in b/data/org.gnome.d-feet.desktop.in.in deleted file mode 100644 index 6581f0c..0000000 --- a/data/org.gnome.d-feet.desktop.in.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -_Name=D-Feet -_GenericName=D-Bus Debugger -_Comment=Debug D-Bus applications -_Keywords=debug;d-bus;dbus;dfeet; -Exec=@PACKAGE@ -Icon=org.gnome.d-feet -Terminal=false -Type=Application -Categories=GNOME;GTK;Development;Debugger; -StartupNotify=true diff --git a/data/org.gnome.d-feet.gschema.xml b/data/org.gnome.d-feet.gschema.xml deleted file mode 100644 index 297cd1f..0000000 --- a/data/org.gnome.d-feet.gschema.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/data/org.gnome.dfeet.appdata.xml.in b/data/org.gnome.dfeet.appdata.xml.in new file mode 100644 index 0000000..c4065c1 --- /dev/null +++ b/data/org.gnome.dfeet.appdata.xml.in @@ -0,0 +1,27 @@ + + + + org.gnome.dfeet.desktop + CC0-1.0 + GPL-2.0+ + <_name>D-Feet + <_summary>Debug D-Bus applications + + <_p> + A simple application for debugging the message bus system D-Bus. + D-Feet can be used to inspect D-Bus interfaces of running programs and + invoke methods on those interfaces. + + + + + https://git.gnome.org/browse/d-feet/plain/data/screenshots/d-feet-overview.png + + + https://wiki.gnome.org/Apps/DFeet + https://bugzilla.gnome.org/enter_bug.cgi?product=d-feet + http://www.gnome.org/friends/ + thomasbechtold_at_jpberlin_de + GNOME + d-feet + diff --git a/data/org.gnome.dfeet.desktop.in.in b/data/org.gnome.dfeet.desktop.in.in new file mode 100644 index 0000000..134cf10 --- /dev/null +++ b/data/org.gnome.dfeet.desktop.in.in @@ -0,0 +1,11 @@ +[Desktop Entry] +_Name=D-Feet +_GenericName=D-Bus Debugger +_Comment=Debug D-Bus applications +_Keywords=debug;d-bus;dbus;dfeet; +Exec=@PACKAGE@ +Icon=org.gnome.dfeet +Terminal=false +Type=Application +Categories=GNOME;GTK;Development;Debugger; +StartupNotify=true diff --git a/data/org.gnome.dfeet.gschema.xml b/data/org.gnome.dfeet.gschema.xml new file mode 100644 index 0000000..d46272e --- /dev/null +++ b/data/org.gnome.dfeet.gschema.xml @@ -0,0 +1,4 @@ + + + + diff --git a/data/ui/bus.ui b/data/ui/bus.ui index 6708243..059e041 100644 --- a/data/ui/bus.ui +++ b/data/ui/bus.ui @@ -54,7 +54,7 @@ True False 128 - org.gnome.d-feet + org.gnome.dfeet True diff --git a/org.gnome.d-feet.json b/org.gnome.d-feet.json deleted file mode 100644 index d91d32e..0000000 --- a/org.gnome.d-feet.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "id": "org.gnome.d-feet", - "runtime": "org.gnome.Platform", - "runtime-version": "master", - "branch": "master", - "sdk": "org.gnome.Sdk", - "command": "d-feet", - "tags": ["nightly"], - "desktop-file-name-prefix": "(Nightly) ", - "finish-args": [ - "--share=ipc", "--socket=x11", - "--socket=wayland", - "--socket=system-bus", "--socket=session-bus", - "--filesystem=xdg-run/dconf", "--filesystem=~/.config/dconf:ro", - "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf" - ], - "modules": [ - { - "name": "pycairo", - "buildsystem": "simple", - "build-commands": [ - "python2 setup.py install --prefix=/app" - ], - "sources": [ - { - "type": "git", - "url": "https://github.com/pygobject/pycairo.git" - } - ], - "cleanup": [ - "/include", - "/share/pkgconfig" - ] - }, - { - "name": "pygobject", - "build-options" : { - "env": { - "PYTHON": "/usr/bin/python2" - } - }, - "sources": [ - { - "type": "git", - "url": "https://git.gnome.org/browse/pygobject" - } - ], - "cleanup": [ - "/include", - "/lib/pkgconfig", - "/lib/python2.7/site-packages/gi/*.la" - ] - }, - { - "name": "d-feet", - "config-opts": [ - "--disable-tests" - ], - "sources": [ - { - "type": "git", - "url": "https://git.gnome.org/browse/d-feet" - } - ] - } - ] -} diff --git a/org.gnome.dfeet.json b/org.gnome.dfeet.json new file mode 100644 index 0000000..2322985 --- /dev/null +++ b/org.gnome.dfeet.json @@ -0,0 +1,67 @@ +{ + "id": "org.gnome.dfeet", + "runtime": "org.gnome.Platform", + "runtime-version": "master", + "branch": "master", + "sdk": "org.gnome.Sdk", + "command": "d-feet", + "tags": ["nightly"], + "desktop-file-name-prefix": "(Nightly) ", + "finish-args": [ + "--share=ipc", "--socket=x11", + "--socket=wayland", + "--socket=system-bus", "--socket=session-bus", + "--filesystem=xdg-run/dconf", "--filesystem=~/.config/dconf:ro", + "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf" + ], + "modules": [ + { + "name": "pycairo", + "buildsystem": "simple", + "build-commands": [ + "python2 setup.py install --prefix=/app" + ], + "sources": [ + { + "type": "git", + "url": "https://github.com/pygobject/pycairo.git" + } + ], + "cleanup": [ + "/include", + "/share/pkgconfig" + ] + }, + { + "name": "pygobject", + "build-options" : { + "env": { + "PYTHON": "/usr/bin/python2" + } + }, + "sources": [ + { + "type": "git", + "url": "https://git.gnome.org/browse/pygobject" + } + ], + "cleanup": [ + "/include", + "/lib/pkgconfig", + "/lib/python2.7/site-packages/gi/*.la" + ] + }, + { + "name": "d-feet", + "config-opts": [ + "--disable-tests" + ], + "sources": [ + { + "type": "git", + "url": "https://git.gnome.org/browse/d-feet" + } + ] + } + ] +} diff --git a/po/POTFILES.in b/po/POTFILES.in index e73de53..4e31d24 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,8 +1,8 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. -data/org.gnome.d-feet.appdata.xml.in -data/org.gnome.d-feet.desktop.in.in -data/org.gnome.d-feet.gschema.xml +data/org.gnome.dfeet.appdata.xml.in +data/org.gnome.dfeet.desktop.in.in +data/org.gnome.dfeet.gschema.xml [type: gettext/glade]data/ui/addconnectiondialog.ui [type: gettext/glade]data/ui/app-menu.ui [type: gettext/glade]data/ui/bus.ui diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 45f9f4b..d0845fe 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -1 +1 @@ -data/org.gnome.d-feet.desktop.in +data/org.gnome.dfeet.desktop.in diff --git a/src/dfeet/application.py b/src/dfeet/application.py index c8e02ee..9ddb66d 100644 --- a/src/dfeet/application.py +++ b/src/dfeet/application.py @@ -12,7 +12,7 @@ class DFeetApp(Gtk.Application): self.package = package self.version = version self.data_dir = data_dir - Gtk.Application.__init__(self, application_id="org.gnome.d-feet", + Gtk.Application.__init__(self, application_id="org.gnome.dfeet", flags=Gio.ApplicationFlags.FLAGS_NONE) # Note that the function in C activate() becomes do_activate() in Python diff --git a/src/tests/tests.py b/src/tests/tests.py index 4fb52d5..31a7292 100755 --- a/src/tests/tests.py +++ b/src/tests/tests.py @@ -16,7 +16,7 @@ import unittest XML = """ - + @@ -38,8 +38,8 @@ DATA_DIR = os.path.abspath("../../data/") class IntrospectionHelperTest(unittest.TestCase): """tests for the introspection helper classes""" def setUp(self): - self.name = "org.gnome.d-feet" - self.object_path = "/org/gnome/d-feet" + self.name = "org.gnome.dfeet" + self.object_path = "/org/gnome/dfeet" self.node_info = Gio.DBusNodeInfo.new_for_xml(XML) def test_dbus_node_info(self): -- cgit v1.2.1