Bring back 'theme' key

We need it for migrating the settings to Adium-only

diff --git a/data/org.gnome.Empathy.gschema.xml b/data/org.gnome.Empathy.gschema.xml
index d9810feb9c4d6af4e9ae189061576173e5c462ac..9b653ccc603d2a7317436b633cfb9be6d9fc24f5 100644 (file)
--- 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 0b346ea7abaa56ddafbdb235d8d70ba281bb356e..0a7a18c3ed81171ceb50af64c9eb85eb88a820c3 100644 (file)
--- 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"