GNOME.org
 

[gnome-builder/wip/chergert/devel] wip on devel rename

commit a701a5a4a28e218833c88dac6a206a11d6e3ba47
Author: Christian Hergert <chergert redhat com>
Date:   Tue Jan 22 19:55:08 2019 -0800

    wip on devel rename

 build-aux/flatpak/org.gnome.Builder.json           |  3 +-
 data/appdata/meson.build                           | 13 +++++---
 ....xml.in => org.gnome.Builder.appdata.xml.in.in} |  4 +--
 data/gsettings/meson.build                         | 38 ++++++++++------------
 ....xml => org.gnome.builder.build.gschema.xml.in} |  2 +-
 .../org.gnome.builder.code-insight.gschema.xml.in  |  2 +-
 ...xml => org.gnome.builder.editor.gschema.xml.in} |  6 ++--
 ...g.gnome.builder.editor.language.gschema.xml.in} |  6 ++--
 ...rg.gnome.builder.extension-type.gschema.xml.in} |  2 +-
 ...schema.xml => org.gnome.builder.gschema.xml.in} |  2 +-
 ...xml => org.gnome.builder.plugin.gschema.xml.in} |  2 +-
 ... org.gnome.builder.project-tree.gschema.xml.in} |  2 +-
 ...ml => org.gnome.builder.project.gschema.xml.in} |  2 +-
 ...l => org.gnome.builder.terminal.gschema.xml.in} |  2 +-
 ... => org.gnome.builder.workbench.gschema.xml.in} |  2 +-
 data/meson.build                                   | 12 +++----
 meson.build                                        | 12 +++++--
 meson_options.txt                                  |  1 +
 src/libide/core/ide-global.c                       | 24 +-------------
 src/libide/core/ide-global.h                       |  2 --
 src/libide/io/ide-gfile.c                          | 16 ---------
 src/main.c                                         |  7 ----
 22 files changed, 62 insertions(+), 100 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json
index 2eee1eab1..dba8d23cd 100644
--- a/build-aux/flatpak/org.gnome.Builder.json
+++ b/build-aux/flatpak/org.gnome.Builder.json
@@ -1,5 +1,5 @@
 {
-    "app-id" : "org.gnome.Builder",
+    "app-id" : "org.gnome.Builder-Devel",
     "runtime" : "org.gnome.Sdk",
     "runtime-version" : "master",
     "sdk" : "org.gnome.Sdk",
@@ -516,6 +516,7 @@
             "config-opts" : [
                 "--libdir=lib",
                 "--buildtype=debugoptimized",
+                "-Dapp_id=org.gnome.Builder-Devel",
                 "-Dctags_path=/app/bin/ctags",
                 "-Dfusermount_wrapper=true",
                 "-Dtcmalloc=true",
diff --git a/data/appdata/meson.build b/data/appdata/meson.build
index 4901e65eb..f82bacc02 100644
--- a/data/appdata/meson.build
+++ b/data/appdata/meson.build
@@ -1,9 +1,12 @@
-# Appdata file.
+# Appdata file
 appdata_file = i18n.merge_file(
-  input: 'org.gnome.Builder.appdata.xml.in',
-  output: 'org.gnome.Builder.appdata.xml',
-  po_dir: '../../po',
-  install: true,
+        input: configure_file(
+                         input: 'org.gnome.Builder.appdata.xml.in.in',
+                        output: 'org.gnome.Builder.appdata.xml.in',
+                 configuration: config_h),
+       output: '@@0@@.appdata.xml'.format(app_id),
+       po_dir: '../../po',
+      install: true,
   install_dir: join_paths(get_option('datadir'), 'metainfo'),
 )
 
diff --git a/data/appdata/org.gnome.Builder.appdata.xml.in b/data/appdata/org.gnome.Builder.appdata.xml.in.in
similarity index 98%
rename from data/appdata/org.gnome.Builder.appdata.xml.in
rename to data/appdata/org.gnome.Builder.appdata.xml.in.in
index 30cb992b1..d2bbe3755 100644
--- a/data/appdata/org.gnome.Builder.appdata.xml.in
+++ b/data/appdata/org.gnome.Builder.appdata.xml.in.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 Igor Gnatenko <ignatenko src gnome org> -->
 <component type="desktop-application">
-  <id>org.gnome.Builder</id>
+  <id>@PACKAGE_APP_ID@</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+ and GPL-2.0+ and LGPL-3.0+ and LGPL-2.0+ and MIT</project_license>
   <name>Builder</name>
@@ -63,7 +63,7 @@
       <image width="1600" 
height="900">https://git.gnome.org/browse/gnome-builder/plain/data/appdata/06-debugger.png</image>
     </screenshot>
   </screenshots>
-  <launchable type="desktop-id">org.gnome.Builder.desktop</launchable>
+  <launchable type="desktop-id">@APP_ID@.desktop</launchable>
   <url type="homepage">https://wiki.gnome.org/Apps/Builder</url>
   <url type="bugtracker">https://gitlab.gnome.org/GNOME/gnome-builder/issues</url>
   <url type="donation">http://www.gnome.org/friends/</url>
diff --git a/data/gsettings/meson.build b/data/gsettings/meson.build
index 49de09221..e138be36a 100644
--- a/data/gsettings/meson.build
+++ b/data/gsettings/meson.build
@@ -17,26 +17,24 @@ endif
 
 schema_conf = configuration_data()
 schema_conf.set('ECTAGS', ctags_path)
-
-schema_files += [configure_file(
-          input: 'org.gnome.builder.code-insight.gschema.xml.in',
-         output: 'org.gnome.builder.code-insight.gschema.xml',
-  configuration: schema_conf,
-        install: true,
-    install_dir: schema_dir,
-)]
+schema_conf.set('APP_ID', app_id)
+schema_conf.set('APP_ID_LOWER', app_id_lower)
+schema_conf.set('APP_PATH', app_path)
+schema_conf.set('APP_PATH_LOWER', app_path_lower)
+schema_conf.set('GETTEXT_DOMAIN', 'gnome-builder')
 
 schemas = [
-  'org.gnome.builder.build.gschema.xml',
-  'org.gnome.builder.editor.gschema.xml',
-  'org.gnome.builder.editor.language.gschema.xml',
-  'org.gnome.builder.extension-type.gschema.xml',
-  'org.gnome.builder.gschema.xml',
-  'org.gnome.builder.plugin.gschema.xml',
-  'org.gnome.builder.project.gschema.xml',
-  'org.gnome.builder.project-tree.gschema.xml',
-  'org.gnome.builder.terminal.gschema.xml',
-  'org.gnome.builder.workbench.gschema.xml',
+  'org.gnome.builder.code-insight.gschema.xml.in',
+  'org.gnome.builder.build.gschema.xml.in',
+  'org.gnome.builder.editor.gschema.xml.in',
+  'org.gnome.builder.editor.language.gschema.xml.in',
+  'org.gnome.builder.extension-type.gschema.xml.in',
+  'org.gnome.builder.gschema.xml.in',
+  'org.gnome.builder.plugin.gschema.xml.in',
+  'org.gnome.builder.project.gschema.xml.in',
+  'org.gnome.builder.project-tree.gschema.xml.in',
+  'org.gnome.builder.terminal.gschema.xml.in',
+  'org.gnome.builder.workbench.gschema.xml.in',
 ]
 
 # HACK: We need access to all schemas when running tests, so we
@@ -46,8 +44,8 @@ schemas = [
 foreach schema : schemas
   schema_files += [configure_file(
           input: schema,
-         output: schema,
-           copy: true,
+         output: '@0@.xml'.format(schema.split('.xml.in')[0]),
+  configuration: schema_conf,
         install: true,
     install_dir: schema_dir,
   )]
diff --git a/data/gsettings/org.gnome.builder.build.gschema.xml 
b/data/gsettings/org.gnome.builder.build.gschema.xml.in
similarity index 85%
rename from data/gsettings/org.gnome.builder.build.gschema.xml
rename to data/gsettings/org.gnome.builder.build.gschema.xml.in
index 07dc061a0..1e090d37b 100644
--- a/data/gsettings/org.gnome.builder.build.gschema.xml
+++ b/data/gsettings/org.gnome.builder.build.gschema.xml.in
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema id="org.gnome.builder.build" path="/org/gnome/builder/build/" gettext-domain="gnome-builder">
+  <schema id="@APP_ID_LOWER@.build" path="@APP_PATH_LOWER@/build/" gettext-domain="@GETTEXT_DOMAIN@">
     <key name="parallel" type="i">
       <default>-1</default>
       <range min="-1" max="512"/>
diff --git a/data/gsettings/org.gnome.builder.code-insight.gschema.xml.in 
b/data/gsettings/org.gnome.builder.code-insight.gschema.xml.in
index 5721e8e38..88771df0a 100644
--- a/data/gsettings/org.gnome.builder.code-insight.gschema.xml.in
+++ b/data/gsettings/org.gnome.builder.code-insight.gschema.xml.in
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema id="org.gnome.builder.code-insight" path="/org/gnome/builder/code-insight/" 
gettext-domain="gnome-builder">
+  <schema id="@APP_ID_LOWER@.code-insight" path="@APP_PATH_LOWER@/code-insight/" 
gettext-domain="@GETTEXT_DOMAIN@">
     <key name="ctags-autocompletion" type="b">
       <default>true</default>
       <summary>Ctags based autocompletion</summary>
diff --git a/data/gsettings/org.gnome.builder.editor.gschema.xml 
b/data/gsettings/org.gnome.builder.editor.gschema.xml.in
similarity index 95%
rename from data/gsettings/org.gnome.builder.editor.gschema.xml
rename to data/gsettings/org.gnome.builder.editor.gschema.xml.in
index 24aa5ced8..e65676a35 100644
--- a/data/gsettings/org.gnome.builder.editor.gschema.xml
+++ b/data/gsettings/org.gnome.builder.editor.gschema.xml.in
@@ -1,6 +1,6 @@
 <schemalist>
 
-  <flags id="org.gnome.builder.editor.DrawSpaces">
+  <flags id="@APP_ID_LOWER@.editor.DrawSpaces">
     <value nick="space" value="1"/>
     <value nick="tab" value="2"/>
     <value nick="newline" value="4"/>
@@ -10,7 +10,7 @@
     <value nick="trailing" value="64"/>
   </flags>
 
-  <schema id="org.gnome.builder.editor" path="/org/gnome/builder/editor/" gettext-domain="gnome-builder">
+  <schema id="@APP_ID_LOWER@.editor" path="@APP_PATH_LOWER@/editor/" gettext-domain="@GETTEXT_DOMAIN@">
     <key name="keybindings" type="s">
       <choices>
         <choice value="default"/>
@@ -85,7 +85,7 @@
       <summary>Automatically Hide Overview Map</summary>
       <description>If enabled, Builder will automatically hide the overview map when mouse focus leaves the 
editor, or a timeout occurs.</description>
     </key>
-    <key name="draw-spaces" flags="org.gnome.builder.editor.DrawSpaces">
+    <key name="draw-spaces" flags="@APP_ID_LOWER@.editor.DrawSpaces">
       <default>[]</default>
       <summary>Draw Spaces</summary>
       <description>The various types of space to draw in the editor.</description>
diff --git a/data/gsettings/org.gnome.builder.editor.language.gschema.xml 
b/data/gsettings/org.gnome.builder.editor.language.gschema.xml.in
similarity index 88%
rename from data/gsettings/org.gnome.builder.editor.language.gschema.xml
rename to data/gsettings/org.gnome.builder.editor.language.gschema.xml.in
index 9a1d92120..9de6d018b 100644
--- a/data/gsettings/org.gnome.builder.editor.language.gschema.xml
+++ b/data/gsettings/org.gnome.builder.editor.language.gschema.xml.in
@@ -1,6 +1,6 @@
 <schemalist>
 
-  <flags id="org.gnome.builder.SpacesStyle">
+  <flags id="@APP_ID_LOWER@.SpacesStyle">
     <value nick="before-left-paren" value="1"/>
     <value nick="before-left-bracket" value="2"/>
     <value nick="before-left-brace" value="4"/>
@@ -10,7 +10,7 @@
     <value nick="before-semicolon" value="64"/>
   </flags>
 
-  <schema id="org.gnome.builder.editor.language" gettext-domain="gnome-builder">
+  <schema id="@APP_ID_LOWER@.editor.language" gettext-domain="@GETTEXT_DOMAIN@">
     <key name="auto-indent" type="b">
       <default>true</default>
     </key>
@@ -37,7 +37,7 @@
       <range min="32" max="500"/>
       <default>80</default>
     </key>
-    <key name="spaces-style" flags="org.gnome.builder.SpacesStyle">
+    <key name="spaces-style" flags="@APP_ID_LOWER@.SpacesStyle">
       <default>[]</default>
       <summary>Spaces Style</summary>
       <description>How to apply spaces when reformatting text.</description>
diff --git a/data/gsettings/org.gnome.builder.extension-type.gschema.xml 
b/data/gsettings/org.gnome.builder.extension-type.gschema.xml.in
similarity index 73%
rename from data/gsettings/org.gnome.builder.extension-type.gschema.xml
rename to data/gsettings/org.gnome.builder.extension-type.gschema.xml.in
index b80271a20..ab46cd94e 100644
--- a/data/gsettings/org.gnome.builder.extension-type.gschema.xml
+++ b/data/gsettings/org.gnome.builder.extension-type.gschema.xml.in
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema id="org.gnome.builder.extension-type" gettext-domain="gnome-builder">
+  <schema id="@APP_ID_LOWER@.extension-type" gettext-domain="@GETTEXT_DOMAIN@">
     <key name="enabled" type="b">
       <default>true</default>
       <summary>Enabled</summary>
diff --git a/data/gsettings/org.gnome.builder.gschema.xml b/data/gsettings/org.gnome.builder.gschema.xml.in
similarity index 95%
rename from data/gsettings/org.gnome.builder.gschema.xml
rename to data/gsettings/org.gnome.builder.gschema.xml.in
index e687d3baf..3156cee73 100644
--- a/data/gsettings/org.gnome.builder.gschema.xml
+++ b/data/gsettings/org.gnome.builder.gschema.xml.in
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema id="org.gnome.builder" path="/org/gnome/builder/" gettext-domain="gnome-builder">
+  <schema id="@APP_ID_LOWER@" path="@APP_PATH_LOWER@/" gettext-domain="@GETTEXT_DOMAIN@">
     <key name="window-size" type="(ii)">
       <default>(-1, -1)</default>
       <summary>Window size</summary>
diff --git a/data/gsettings/org.gnome.builder.plugin.gschema.xml 
b/data/gsettings/org.gnome.builder.plugin.gschema.xml.in
similarity index 75%
rename from data/gsettings/org.gnome.builder.plugin.gschema.xml
rename to data/gsettings/org.gnome.builder.plugin.gschema.xml.in
index 6a9c0e05a..af2d37893 100644
--- a/data/gsettings/org.gnome.builder.plugin.gschema.xml
+++ b/data/gsettings/org.gnome.builder.plugin.gschema.xml.in
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema id="org.gnome.builder.plugin" gettext-domain="gnome-builder">
+  <schema id="@APP_ID_LOWER@.plugin" gettext-domain="@GETTEXT_DOMAIN@">
     <key name="enabled" type="b">
       <default>true</default>
       <summary>Plugin enabled</summary>
diff --git a/data/gsettings/org.gnome.builder.project-tree.gschema.xml 
b/data/gsettings/org.gnome.builder.project-tree.gschema.xml.in
similarity index 86%
rename from data/gsettings/org.gnome.builder.project-tree.gschema.xml
rename to data/gsettings/org.gnome.builder.project-tree.gschema.xml.in
index 80bc514b9..4de06fdda 100644
--- a/data/gsettings/org.gnome.builder.project-tree.gschema.xml
+++ b/data/gsettings/org.gnome.builder.project-tree.gschema.xml.in
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema id="org.gnome.builder.project-tree" path="/org/gnome/builder/project-tree/" 
gettext-domain="gnome-builder">
+  <schema id="@APP_ID_LOWER@.project-tree" path="@APP_PATH_LOWER@/project-tree/" 
gettext-domain="@GETTEXT_DOMAIN@">
     <key name="show-icons" type="b">
       <default>true</default>
       <summary>Show Icons</summary>
diff --git a/data/gsettings/org.gnome.builder.project.gschema.xml 
b/data/gsettings/org.gnome.builder.project.gschema.xml.in
similarity index 82%
rename from data/gsettings/org.gnome.builder.project.gschema.xml
rename to data/gsettings/org.gnome.builder.project.gschema.xml.in
index 0426f7828..e215172bf 100644
--- a/data/gsettings/org.gnome.builder.project.gschema.xml
+++ b/data/gsettings/org.gnome.builder.project.gschema.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
-  <schema id="org.gnome.builder.project" gettext-domain="gnome-builder">
+  <schema id="@APP_ID_LOWER@.project" gettext-domain="@GETTEXT_DOMAIN@">
 
     <key name="config-id" type="s">
       <default>"default"</default>
diff --git a/data/gsettings/org.gnome.builder.terminal.gschema.xml 
b/data/gsettings/org.gnome.builder.terminal.gschema.xml.in
similarity index 64%
rename from data/gsettings/org.gnome.builder.terminal.gschema.xml
rename to data/gsettings/org.gnome.builder.terminal.gschema.xml.in
index fbf7978ae..896747c64 100644
--- a/data/gsettings/org.gnome.builder.terminal.gschema.xml
+++ b/data/gsettings/org.gnome.builder.terminal.gschema.xml.in
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema id="org.gnome.builder.terminal" path="/org/gnome/builder/terminal/" gettext-domain="gnome-builder">
+  <schema id="@APP_ID_LOWER@.terminal" path="@APP_PATH_LOWER@/terminal/" gettext-domain="@GETTEXT_DOMAIN@">
     <key name="allow-bold" type="b">
       <default>true</default>
     </key>
diff --git a/data/gsettings/org.gnome.builder.workbench.gschema.xml 
b/data/gsettings/org.gnome.builder.workbench.gschema.xml.in
similarity index 92%
rename from data/gsettings/org.gnome.builder.workbench.gschema.xml
rename to data/gsettings/org.gnome.builder.workbench.gschema.xml.in
index 3bd065627..792ffe1c2 100644
--- a/data/gsettings/org.gnome.builder.workbench.gschema.xml
+++ b/data/gsettings/org.gnome.builder.workbench.gschema.xml.in
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema id="org.gnome.builder.workbench" path="/org/gnome/builder/workbench/" 
gettext-domain="gnome-builder">
+  <schema id="@APP_ID_LOWER@.workbench" path="@APP_PATH_LOWER@/workbench/" gettext-domain="@GETTEXT_DOMAIN@">
     <key name="left-visible" type="b">
       <default>true</default>
       <summary>Show Left Panel</summary>
diff --git a/data/meson.build b/data/meson.build
index 5afb6f81d..607fb0f7c 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -7,7 +7,7 @@ subdir('style-schemes')
 # Desktop launcher and description file.
 desktop_file = i18n.merge_file(
   input: 'org.gnome.Builder.desktop.in.in',
-  output: 'org.gnome.Builder.desktop',
+  output: '@@0@@.desktop'.format(app_id),
   type: 'desktop',
   po_dir: '../po',
   install: true,
@@ -25,9 +25,9 @@ endif
 dbusconf = configuration_data()
 dbusconf.set('bindir', join_paths(get_option('prefix'), get_option('bindir')))
 configure_file(
-       input: 'org.gnome.Builder.service.in',
-       output: 'org.gnome.Builder.service',
-       configuration: dbusconf,
-       install: true,
-       install_dir: join_paths(get_option('datadir'), 'dbus-1', 'services'),
+          input: 'org.gnome.Builder.service.in',
+         output: '@@0@@.service'.format(app_id),
+  configuration: dbusconf,
+        install: true,
+    install_dir: join_paths(get_option('datadir'), 'dbus-1', 'services'),
 )
diff --git a/meson.build b/meson.build
index c5c63adbf..ab38d0061 100644
--- a/meson.build
+++ b/meson.build
@@ -9,6 +9,11 @@ project('gnome-builder', 'c',
                    ],
 )
 
+app_id = get_option('app_id')
+app_id_lower = app_id.to_lower()
+app_path = '/' + '/'.join(app_id.split('.'))
+app_path_lower = app_path.to_lower()
+
 version_split = meson.project_version().split('.')
 MAJOR_VERSION = version_split[0]
 MINOR_VERSION = version_split[1]
@@ -77,6 +82,10 @@ status += [
 ]
 
 config_h = configuration_data()
+config_h.set_quoted('PACKAGE_APP_ID', app_id)
+config_h.set_quoted('PACKAGE_APP_ID_LOWER', app_id_lower)
+config_h.set_quoted('PACKAGE_APP_PATH', app_path)
+config_h.set_quoted('PACKAGE_APP_PATH_LOWER', app_path_lower)
 config_h.set_quoted('PACKAGE_NAME', 'gnome-builder')
 config_h.set_quoted('PACKAGE_ABI_S', libide_api_version)
 config_h.set('PACKAGE_ABI', libide_api_version)
@@ -95,9 +104,6 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCALE_DIR')
 
 config_h.set10('ENABLE_NLS', true) # Always enabled
 
-# Development build setup
-config_h.set('DEVELOPMENT_BUILD', version_split[1].to_int().is_odd())
-
 # We should probably avoid using these
 config_h.set_quoted('SRCDIR', meson.source_root())
 config_h.set_quoted('BUILDDIR', meson.build_root())
diff --git a/meson_options.txt b/meson_options.txt
index 128f13246..abc52a29c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -2,6 +2,7 @@ option('tracing', type: 'boolean', value: false, description: 'Enable tracing of
 option('profiling', type: 'boolean', value: false, description: 'Enable profiling of the Builder codebase')
 option('fusermount_wrapper', type: 'boolean', value: false, description: 'Install fusermount-wrapper when 
distributing with flatpak')
 option('tcmalloc', type: 'boolean', value: false, description: 'Use tcmalloc for dynamic allocations')
+option('app_id', type: 'string', value: 'org.gnome.Builder', description: 'The application-id to use for the 
application')
 
 option('with_safe_path', type: 'string', value: '', description: 'PATH variable to run build commands 
(default: platform-specific)')
 
diff --git a/src/libide/core/ide-global.c b/src/libide/core/ide-global.c
index 46133cc56..67dede54e 100644
--- a/src/libide/core/ide-global.c
+++ b/src/libide/core/ide-global.c
@@ -36,7 +36,6 @@
 #include "ide-global.h"
 
 static GThread *main_thread;
-static const gchar *application_id = "org.gnome.Builder";
 static IdeProcessKind kind = IDE_PROCESS_KIND_HOST;
 
 #if defined (G_HAS_CONSTRUCTORS)
@@ -93,28 +92,7 @@ ide_get_process_kind (void)
 const gchar *
 ide_get_application_id (void)
 {
-  return application_id;
-}
-
-/**
- * ide_set_application_id:
- * @app_id: the application id
- *
- * Sets the application id that will be used.
- *
- * This must be set at application startup before any GApplication
- * has connected to the D-Bus.
- *
- * The default is "org.gnome.Builder".
- *
- * Since: 3.32
- */
-void
-ide_set_application_id (const gchar *app_id)
-{
-  g_return_if_fail (app_id != NULL);
-
-  application_id = g_intern_string (app_id);
+  return PACKAGE_APP_ID;
 }
 
 const gchar *
diff --git a/src/libide/core/ide-global.h b/src/libide/core/ide-global.h
index ac3bfabd3..2773e0274 100644
--- a/src/libide/core/ide-global.h
+++ b/src/libide/core/ide-global.h
@@ -47,8 +47,6 @@ IdeProcessKind  ide_get_process_kind     (void);
 IDE_AVAILABLE_IN_3_32
 const gchar    *ide_get_application_id   (void);
 IDE_AVAILABLE_IN_3_32
-void            ide_set_application_id   (const gchar *app_id);
-IDE_AVAILABLE_IN_3_32
 const gchar    *ide_get_program_name     (void);
 IDE_AVAILABLE_IN_3_32
 gchar          *ide_get_system_arch      (void);
diff --git a/src/libide/io/ide-gfile.c b/src/libide/io/ide-gfile.c
index 6cd4fbd6d..5c5da1c49 100644
--- a/src/libide/io/ide-gfile.c
+++ b/src/libide/io/ide-gfile.c
@@ -366,22 +366,6 @@ ide_g_file_get_children_async (GFile               *file,
   ide_task_set_priority (task, io_priority);
   ide_task_set_task_data (task, gc, get_children_free);
 
-#ifdef DEVELOPMENT_BUILD
-  /* Useful for testing slow interactions on project-tree and such */
-  if (g_getenv ("IDE_G_FILE_DELAY"))
-    {
-      gboolean
-      delayed_run (gpointer data)
-      {
-        g_autoptr(IdeTask) subtask = data;
-        ide_task_run_in_thread (subtask, ide_g_file_get_children_worker);
-        return G_SOURCE_REMOVE;
-      }
-      g_timeout_add_seconds (1, delayed_run, g_object_ref (task));
-      return;
-    }
-#endif
-
   ide_task_run_in_thread (task, ide_g_file_get_children_worker);
 }
 
diff --git a/src/main.c b/src/main.c
index ade1bf4c4..5ea58533c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -98,13 +98,6 @@ main (gint   argc,
   g_set_prgname (ide_get_program_name ());
   g_set_application_name (_("Builder"));
 
-#if 0
-  /* TODO: allow support for parallel nightly install */
-#ifdef DEVELOPMENT_BUILD
-  ide_set_application_id ("org.gnome.Builder-Devel");
-#endif
-#endif
-
   /* Early init of logging so that we get messages in a consistent
    * format. If we deferred this to GApplication, we'd get them in
    * multiple formats.
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]