Commit 963a0ded authored by Kai Willadsen's avatar Kai Willadsen

Const-ify our application ID for consistency

We're already most of the way to having org.gnome.meld be in consistent
use for e.g., desktop files, schemas, etc. so let's make it official.
parent 871d4e05
......@@ -5,6 +5,8 @@ import sys
__package__ = "meld"
__version__ = "3.19.1"
APPLICATION_ID = "org.gnome.meld"
# START; these paths are clobbered on install by meld.build_helpers
DATADIR = os.path.join(sys.prefix, "share", "meld")
LOCALEDIR = os.path.join(sys.prefix, "share", "locale")
......
......@@ -43,9 +43,10 @@ optparse._ = _
class MeldApp(Gtk.Application):
def __init__(self):
super().__init__()
self.set_flags(Gio.ApplicationFlags.HANDLES_COMMAND_LINE)
self.set_application_id("org.gnome.meld")
super().__init__(
application_id=meld.conf.APPLICATION_ID,
flags=Gio.ApplicationFlags.HANDLES_COMMAND_LINE,
)
GLib.set_application_name("Meld")
Gtk.Window.set_default_icon_name("meld")
......
......@@ -22,9 +22,6 @@ import meld.conf
import meld.filters
MELD_SCHEMA = 'org.gnome.meld'
class MeldSettings(GObject.GObject):
"""Handler for settings that can't easily be bound to object properties"""
......@@ -96,7 +93,7 @@ def load_settings_schema(schema_id):
def create_settings():
global settings, interface_settings, meldsettings
settings = load_settings_schema(MELD_SCHEMA)
settings = load_settings_schema(meld.conf.APPLICATION_ID)
interface_settings = Gio.Settings.new('org.gnome.desktop.interface')
meldsettings = MeldSettings()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment