aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2012-06-21 11:04:19 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-07-02 16:03:23 +0800
commit4a3ff2e68eb3c17488f9a12587b7e9eb95a51645 (patch)
tree3a30446d3b51b2133210a0d51d6fde6ad60a960c
parent10fc10c0be71a31064298776b7d1abc412157dc8 (diff)
downloadgsoc2013-empathy-4a3ff2e68eb3c17488f9a12587b7e9eb95a51645.tar
gsoc2013-empathy-4a3ff2e68eb3c17488f9a12587b7e9eb95a51645.tar.gz
gsoc2013-empathy-4a3ff2e68eb3c17488f9a12587b7e9eb95a51645.tar.bz2
gsoc2013-empathy-4a3ff2e68eb3c17488f9a12587b7e9eb95a51645.tar.lz
gsoc2013-empathy-4a3ff2e68eb3c17488f9a12587b7e9eb95a51645.tar.xz
gsoc2013-empathy-4a3ff2e68eb3c17488f9a12587b7e9eb95a51645.tar.zst
gsoc2013-empathy-4a3ff2e68eb3c17488f9a12587b7e9eb95a51645.zip
Bring back 'theme' key
We need it for migrating the settings to Adium-only
-rw-r--r--data/org.gnome.Empathy.gschema.xml5
-rw-r--r--libempathy/empathy-gsettings.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/data/org.gnome.Empathy.gschema.xml b/data/org.gnome.Empathy.gschema.xml
index d9810feb9..9b653ccc6 100644
--- a/data/org.gnome.Empathy.gschema.xml
+++ b/data/org.gnome.Empathy.gschema.xml
@@ -170,6 +170,11 @@ present them to the user immediately.</description>
<summary>Show contact list in rooms</summary>
<description>Whether to show the contact list in chat rooms.</description>
</key>
+ <key name="theme" type="s">
+ <default>'classic'</default>
+ <summary>Chat window theme</summary>
+ <description>The theme that is used to display the conversation in chat windows.</description>
+ </key>
<key name="theme-variant" type="s">
<default>''</default>
<summary>Chat window theme variant</summary>
diff --git a/libempathy/empathy-gsettings.h b/libempathy/empathy-gsettings.h
index 0b346ea7a..0a7a18c3e 100644
--- a/libempathy/empathy-gsettings.h
+++ b/libempathy/empathy-gsettings.h
@@ -58,6 +58,7 @@ G_BEGIN_DECLS
#define EMPATHY_PREFS_CHAT_SCHEMA EMPATHY_PREFS_SCHEMA ".conversation"
#define EMPATHY_PREFS_CHAT_SHOW_SMILEYS "graphical-smileys"
#define EMPATHY_PREFS_CHAT_SHOW_CONTACTS_IN_ROOMS "show-contacts-in-rooms"
+#define EMPATHY_PREFS_CHAT_THEME "theme"
#define EMPATHY_PREFS_CHAT_THEME_VARIANT "theme-variant"
#define EMPATHY_PREFS_CHAT_ADIUM_PATH "adium-path"
#define EMPATHY_PREFS_CHAT_SPELL_CHECKER_LANGUAGES "spell-checker-languages"