From 9f2b7eb8484ed134431a526b651dbf1627da6342 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 23 Apr 2012 14:17:49 +0200 Subject: Stop generating gschema from .in file intltool now supports translating gschema files properly so we don't need to do this crack any more. https://bugzilla.gnome.org/show_bug.cgi?id=672619 --- data/.gitignore | 1 - data/Makefile.am | 8 +- data/org.gnome.Empathy.gschema.xml | 303 ++++++++++++++++++++++++++++++++++ data/org.gnome.Empathy.gschema.xml.in | 302 --------------------------------- 4 files changed, 305 insertions(+), 309 deletions(-) create mode 100644 data/org.gnome.Empathy.gschema.xml delete mode 100644 data/org.gnome.Empathy.gschema.xml.in (limited to 'data') diff --git a/data/.gitignore b/data/.gitignore index 2d4a96f0..1b5fab59 100644 --- a/data/.gitignore +++ b/data/.gitignore @@ -1,7 +1,6 @@ empathy.desktop empathy.desktop.in org.gnome.Empathy.gschema.valid -org.gnome.Empathy.gschema.xml gschemas.compiled org.freedesktop.Telepathy.Client.Empathy.Chat.service org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service diff --git a/data/Makefile.am b/data/Makefile.am index a2be750c..9a2dd880 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -8,11 +8,7 @@ desktop_in_files = \ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ -gsettings_files = \ - org.gnome.Empathy.gschema.xml.in \ - $(NULL) -gsettings_SCHEMAS = $(gsettings_files:.xml.in=.xml) -@INTLTOOL_XML_NOMERGE_RULE@ +gsettings_SCHEMAS = org.gnome.Empathy.gschema.xml @GSETTINGS_RULES@ # We need to compile schemas at make time @@ -81,7 +77,7 @@ EXTRA_DIST = \ $(html_DATA) \ $(clientfile_DATA) \ $(servicefile_in_files) \ - $(gsettings_files) \ + $(gsettings_SCHEMAS) \ $(NULL) DISTCLEANFILES = \ diff --git a/data/org.gnome.Empathy.gschema.xml b/data/org.gnome.Empathy.gschema.xml new file mode 100644 index 00000000..583eacab --- /dev/null +++ b/data/org.gnome.Empathy.gschema.xml @@ -0,0 +1,303 @@ + + + + + + + + + + + + + true + Connection managers should be used + Whether connectivity managers should be used to automatically disconnect/reconnect. + + + true + Empathy should auto-connect on startup + Whether Empathy should automatically log into your accounts on startup. + + + true + Empathy should auto-away when idle + Whether Empathy should go into away mode automatically if the user is idle. + + + '' + Empathy default download folder + The default folder to save file transfers in. + + + 0 + + Magic number used to check if sanity cleaning tasks should be run + empathy-sanity-cleaning.c uses this number to check if the cleaning tasks should be executed or not. Users should not change this key manually. + + + + + + + + + + + + true + Show offline contacts + Whether to show contacts that are offline in the contact list. + + + true + Show avatars + Whether to show avatars for contacts in the contact list and chat windows. + + + false + Show protocols + Whether to show protocols for contacts in the contact list. + + + false + Show Balance in contact list + Whether to show account balances in the contact list. + + + false + Compact contact list + Whether to show the contact list in compact mode. + + + false + Hide main window + Hide the main window. + + + '' + Default directory to select an avatar image from + The last directory that an avatar image was chosen from. + + + false + Open new chats in separate windows + Always open a separate chat window for new chats. + + + true + Display incoming events in the status area + Display incoming events in the status area. If false, +present them to the user immediately. + + + 0 + The position for the chat window side pane + The stored position (in pixels) of the chat window side pane. + + + true + Show contact groups + Whether to show groups in the contact list. + + + + + 'state' + Contact list sort criterion + Which criterion to use when sorting the contact list. Default is to sort by the contact's state with the value "state". A value of "name" will sort the contact list by name. + + + + + true + Use notification sounds + Whether to play a sound to notify of events. + + + true + Disable sounds when away + Whether to play sound notifications when away or busy. + + + true + Play a sound for incoming messages + Whether to play a sound to notify of incoming messages. + + + false + Play a sound for outgoing messages + Whether to play a sound to notify of outgoing messages. + + + true + Play a sound for new conversations + Whether to play a sound to notify of new conversations. + + + false + Play a sound when a contact logs in + Whether to play a sound to notify of contacts logging into the network. + + + false + Play a sound when a contact logs out + Whether to play a sound to notify of contacts logging out of the network. + + + false + Play a sound when we log in + Whether to play a sound when logging into a network. + + + false + Play a sound when we log out + Whether to play a sound when logging out of a network. + + + + + true + Enable popup notifications for new messages + Whether to show a popup notification when receiving a new message. + + + true + Disable popup notifications when away + Whether to show popup notifications when away or busy. + + + false + Pop up notifications if the chat isn't focused + Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused. + + + false + Pop up notifications when a contact logs in + Whether to show a popup notification when a contact goes online. + + + false + Pop up notifications when a contact logs out + Whether to show a popup notification when a contact goes offline. + + + + + true + Use graphical smileys + Whether to convert smileys into graphical images in conversations. + + + true + Show contact list in rooms + Whether to show the contact list in chat rooms. + + + 'classic' + Chat window theme + The theme that is used to display the conversation in chat windows. + + + '' + Chat window theme variant + The theme variant that is used to display the conversation in chat windows. + + + '' + Path of the Adium theme to use + Path of the Adium theme to use if the theme used for chat is Adium. + + + false + Enable WebKit Developer Tools + Whether WebKit developer tools, such as the Web Inspector, should be enabled. + + + true + Inform other users when you are typing to them + Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state. + + + true + Use theme for chat rooms + Whether to use the theme for chat rooms. + + + 'en' + Spell checking languages + Comma-separated list of spell checker languages to use (e.g. "en, fr, nl"). + + + true + Enable spell checker + Whether to check words typed against the languages you want to check with. + + + ':' + Nick completed character + Character to add after nickname when using nick completion (tab) in group chat. + + + false + Empathy should use the avatar of the contact as the chat window icon + Whether Empathy should use the avatar of the contact as the chat window icon. + + + "/" + Last account selected in Join Room dialog + D-Bus object path of the last account selected to join a room. + + + + + '' + Camera device + Default camera device to use in video calls, e.g. /dev/video0. + + + 'bottom-left' + Camera position + Position the camera preview should be during a call. + + + true + Echo cancellation support + Whether to enable Pulseaudio's echo cancellation filter. + + + + + true + Show hint about closing the main window + Whether to show the message dialog about closing the main window with the 'x' button in the title bar. + + + + + false + Empathy can publish the user's location + Whether Empathy can publish the user's location to their contacts. + + + true + Empathy can use the network to guess the location + Whether Empathy can use the network to guess the location. + + + true + Empathy can use the cellular network to guess the location + Whether Empathy can use the cellular network to guess the location. + + + false + Empathy can use the GPS to guess the location + Whether Empathy can use the GPS to guess the location. + + + true + Empathy should reduce the location's accuracy + Whether Empathy should reduce the location's accuracy for privacy reasons. + + + diff --git a/data/org.gnome.Empathy.gschema.xml.in b/data/org.gnome.Empathy.gschema.xml.in deleted file mode 100644 index c1ac758e..00000000 --- a/data/org.gnome.Empathy.gschema.xml.in +++ /dev/null @@ -1,302 +0,0 @@ - - - - - - - - - - - - true - <_summary>Connection managers should be used - <_description>Whether connectivity managers should be used to automatically disconnect/reconnect. - - - true - <_summary>Empathy should auto-connect on startup - <_description>Whether Empathy should automatically log into your accounts on startup. - - - true - <_summary>Empathy should auto-away when idle - <_description>Whether Empathy should go into away mode automatically if the user is idle. - - - '' - <_summary>Empathy default download folder - <_description>The default folder to save file transfers in. - - - 0 - - <_summary>Magic number used to check if sanity cleaning tasks should be run - <_description>empathy-sanity-cleaning.c uses this number to check if the cleaning tasks should be executed or not. Users should not change this key manually. - - - - - - - - - - - - true - <_summary>Show offline contacts - <_description>Whether to show contacts that are offline in the contact list. - - - true - <_summary>Show avatars - <_description>Whether to show avatars for contacts in the contact list and chat windows. - - - false - <_summary>Show protocols - <_description>Whether to show protocols for contacts in the contact list. - - - false - <_summary>Show Balance in contact list - <_description>Whether to show account balances in the contact list. - - - false - <_summary>Compact contact list - <_description>Whether to show the contact list in compact mode. - - - false - <_summary>Hide main window - <_description>Hide the main window. - - - '' - <_summary>Default directory to select an avatar image from - <_description>The last directory that an avatar image was chosen from. - - - false - <_summary>Open new chats in separate windows - <_description>Always open a separate chat window for new chats. - - - true - <_summary>Display incoming events in the status area - <_description>Display incoming events in the status area. If false, -present them to the user immediately. - - - 0 - <_summary>The position for the chat window side pane - <_description>The stored position (in pixels) of the chat window side pane. - - - true - <_summary>Show contact groups - <_description>Whether to show groups in the contact list. - - - - - 'state' - <_summary>Contact list sort criterion - <_description>Which criterion to use when sorting the contact list. Default is to sort by the contact's state with the value "state". A value of "name" will sort the contact list by name. - - - - - true - <_summary>Use notification sounds - <_description>Whether to play a sound to notify of events. - - - true - <_summary>Disable sounds when away - <_description>Whether to play sound notifications when away or busy. - - - true - <_summary>Play a sound for incoming messages - <_description>Whether to play a sound to notify of incoming messages. - - - false - <_summary>Play a sound for outgoing messages - <_description>Whether to play a sound to notify of outgoing messages. - - - true - <_summary>Play a sound for new conversations - <_description>Whether to play a sound to notify of new conversations. - - - false - <_summary>Play a sound when a contact logs in - <_description>Whether to play a sound to notify of contacts logging into the network. - - - false - <_summary>Play a sound when a contact logs out - <_description>Whether to play a sound to notify of contacts logging out of the network. - - - false - <_summary>Play a sound when we log in - <_description>Whether to play a sound when logging into a network. - - - false - <_summary>Play a sound when we log out - <_description>Whether to play a sound when logging out of a network. - - - - - true - <_summary>Enable popup notifications for new messages - <_description>Whether to show a popup notification when receiving a new message. - - - true - <_summary>Disable popup notifications when away - <_description>Whether to show popup notifications when away or busy. - - - false - <_summary>Pop up notifications if the chat isn't focused - <_description>Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused. - - - false - <_summary>Pop up notifications when a contact logs in - <_description>Whether to show a popup notification when a contact goes online. - - - false - <_summary>Pop up notifications when a contact logs out - <_description>Whether to show a popup notification when a contact goes offline. - - - - - true - <_summary>Use graphical smileys - <_description>Whether to convert smileys into graphical images in conversations. - - - true - <_summary>Show contact list in rooms - <_description>Whether to show the contact list in chat rooms. - - - 'classic' - <_summary>Chat window theme - <_description>The theme that is used to display the conversation in chat windows. - - - '' - <_summary>Chat window theme variant - <_description>The theme variant that is used to display the conversation in chat windows. - - - '' - <_summary>Path of the Adium theme to use - <_description>Path of the Adium theme to use if the theme used for chat is Adium. - - - false - <_summary>Enable WebKit Developer Tools - <_description>Whether WebKit developer tools, such as the Web Inspector, should be enabled. - - - true - <_summary>Inform other users when you are typing to them - <_description>Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state. - - - true - <_summary>Use theme for chat rooms - <_description>Whether to use the theme for chat rooms. - - - 'en' - <_summary>Spell checking languages - <_description>Comma-separated list of spell checker languages to use (e.g. "en, fr, nl"). - - - true - <_summary>Enable spell checker - <_description>Whether to check words typed against the languages you want to check with. - - - ':' - <_summary>Nick completed character - <_description>Character to add after nickname when using nick completion (tab) in group chat. - - - false - <_summary>Empathy should use the avatar of the contact as the chat window icon - <_description>Whether Empathy should use the avatar of the contact as the chat window icon. - - - "/" - <_summary>Last account selected in Join Room dialog - <_description>D-Bus object path of the last account selected to join a room. - - - - - '' - <_summary>Camera device - <_description>Default camera device to use in video calls, e.g. /dev/video0. - - - 'bottom-left' - <_summary>Camera position - <_description>Position the camera preview should be during a call. - - - true - <_summary>Echo cancellation support - <_description>Whether to enable Pulseaudio's echo cancellation filter. - - - - - true - <_summary>Show hint about closing the main window - <_description>Whether to show the message dialog about closing the main window with the 'x' button in the title bar. - - - - - false - <_summary>Empathy can publish the user's location - <_description>Whether Empathy can publish the user's location to their contacts. - - - true - <_summary>Empathy can use the network to guess the location - <_description>Whether Empathy can use the network to guess the location. - - - true - <_summary>Empathy can use the cellular network to guess the location - <_description>Whether Empathy can use the cellular network to guess the location. - - - false - <_summary>Empathy can use the GPS to guess the location - <_description>Whether Empathy can use the GPS to guess the location. - - - true - <_summary>Empathy should reduce the location's accuracy - <_description>Whether Empathy should reduce the location's accuracy for privacy reasons. - - - -- cgit v1.2.1