[darcs-to-svn @ Move schemas to data/ and hide main window by default]

svn path=/trunk/; revision=49

diff --git a/data/Makefile.am b/data/Makefile.am
index 06f7e87a62786e8333b93d12255a24018add5b30..a39621f35e3ef69a178d02abac7743f7a94130c8 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -25,9 +25,29 @@ autostart_in_files = empathy.desktop.in
 autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
+schemasdir      = $(GCONF_SCHEMA_FILE_DIR)
+schemas_in_files = empathy.schemas.in
+schemas_DATA    = $(schemas_in_files:.schemas.in=.schemas)
+@INTLTOOL_SCHEMAS_RULE@
+
+if GCONF_SCHEMAS_INSTALL
+install-data-local:
+       if test -z "$(DESTDIR)" ; then \
+         for p in $(schemas_DATA) ; do \
+           GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
+         done \
+       fi
+else
+install-data-local:
+endif
+
 EXTRA_DIST =                           \
        $(image_DATA)                   \
        $(autostart_DATA)               \
-       $(profile_DATA)
+       $(profile_DATA)                 \
+       $(schemas_in_files)             \
+       $(schemas_DATA)
 
+DISTCLEANFILES =               \
+       $(schemas_DATA)
 

diff --git a/data/empathy.schemas.in b/data/empathy.schemas.in
new file mode 100644 (file)
index 0000000..e58bad7
--- /dev/null
+++ b/data/empathy.schemas.in
@@ -0,0 +1,253 @@
+<gconfschemafile>
+  <schemalist>
+
+    <schema>
+      <key>/schemas/apps/empathy/ui/show_offline</key>
+      <applyto>/apps/empathy/ui/show_offline</applyto>
+      <owner>empathy</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Show offline contacts</short>
+       <long>
+       Whether or not to show contacts that are offline in the contact list.
+       </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/gossip/contacts/sort_criterium</key>
+      <applyto>/apps/gossip/contacts/sort_criterium</applyto>
+      <owner>gossip</owner>
+      <type>string</type>
+      <default>name</default>
+      <locale name="C">
+        <short>Contact list sort criterium</short>
+        <long>
+       Which criterium to use when sorting the contact list.
+       Default is to use sort by the contact's name with the value
+       "name". A value of "state" will sort the contact list by state.
+        </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/empathy/ui/show_avatars</key>
+      <applyto>/apps/empathy/ui/show_avatars</applyto>
+      <owner>empathy</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short>Show avatars</short>
+       <long>
+       Whether or not to show avatars for contacts in the contact
+        list and chat windows.
+       </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/empathy/ui/compact_contact_list</key>
+      <applyto>/apps/empathy/ui/compact_contact_list</applyto>
+      <owner>empathy</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Compact contact list</short>
+       <long>
+       Whether to show the contact list in compact mode or not. 
+       </long>
+      </locale>
+    </schema>
+
+    <schema>
+       <key>/schemas/apps/empathy/ui/main_window_hidden</key>
+       <applyto>/apps/empathy/ui/main_window_hidden</applyto>
+       <owner>empathy</owner>
+       <type>bool</type>
+       <default>true</default>
+       <locale name="C">
+          <short>Hide main window</short>
+          <long>
+            Hide the main window.
+          </long>
+       </locale>
+    </schema>
+
+    <schema>
+       <key>/schemas/apps/empathy/ui/avatar_directory</key>
+       <applyto>/apps/empathy/ui/avatar_directory</applyto>
+       <owner>empathy</owner>
+       <type>string</type>
+       <default></default>
+       <locale name="C">
+          <short>Default directory to select an avatar image from</short>
+          <long>
+           The last directory that an avatar image was chosen from.
+          </long>
+       </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/empathy/notifications/play_sounds</key>
+      <applyto>/apps/empathy/notifications/play_sounds</applyto>
+      <owner>empathy</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+         <short>Use notification sounds</short>
+         <long>
+        Whether or not to play a sound when messages arrive.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/empathy/notifications/sound_when_away</key>
+      <applyto>/apps/empathy/notifications/sound_when_away</applyto>
+      <owner>empathy</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+         <short>Enable sound when away</short>
+         <long>
+        Whether or not to play sounds when away.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/empathy/notifications/sound_when_busy</key>
+      <applyto>/apps/empathy/notifications/sound_when_busy</applyto>
+      <owner>empathy</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+         <short>Enable sound when busy</short>
+         <long>
+        Whether or not to play sounds when busy.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/empathy/notifications/popup_when_contact_available</key>
+      <applyto>/apps/empathy/notifications/popup_when_contact_available</applyto>
+      <owner>empathy</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+         <short>Enable popup when contact is available</short>
+         <long>
+        Whether or not to show a popup when a contact becomes available.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
+       <key>/schemas/apps/empathy/ui/separate_chat_windows</key>
+       <applyto>/apps/empathy/ui/separate_chat_windows</applyto>
+       <owner>empathy</owner>
+       <type>bool</type>
+       <default>false</default>
+       <locale name="C">
+          <short>Open new chats in separate windows</short>
+          <long>
+           Always open a separate chat window for new chats.
+          </long>
+       </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/empathy/conversation/graphical_smileys</key>
+      <applyto>/apps/empathy/conversation/graphical_smileys</applyto>
+      <owner>empathy</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+         <short>Use graphical smileys</short>
+         <long>
+        Whether or not to convert smileys into graphical images in
+        conversations.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/empathy/conversation/theme</key>
+      <applyto>/apps/empathy/conversation/theme</applyto>
+      <owner>empathy</owner>
+      <type>string</type>
+      <default>classic</default>
+      <locale name="C">
+         <short>Chat window theme</short>
+         <long>
+           The theme that is used to display the conversation in chat windows.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/empathy/conversation/theme_chat_room</key>
+      <applyto>/apps/empathy/conversation/theme_chat_room</applyto>
+      <owner>empathy</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+         <short>Use theme for chat rooms</short>
+         <long>
+           Whether to use the theme for chat rooms or not.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/empathy/conversation/spell_checker_languages</key>
+      <applyto>/apps/empathy/conversation/spell_checker_languages</applyto>
+      <owner>empathy</owner>
+      <type>string</type>
+      <default>en</default>
+      <locale name="C">
+       <short>Spell checking languages</short>
+       <long>
+         Comma separated list of spell checker languages to use (e.g. en, fr, nl).
+       </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/empathy/conversation/spell_checker_enabled</key>
+      <applyto>/apps/empathy/conversation/spell_checker_enabled</applyto>
+      <owner>empathy</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short>Enable spell checker</short>
+       <long>
+       Whether or not to check words typed against the languages you
+      want to check with.
+       </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/empathy/hints/close_main_window</key>
+      <applyto>/apps/empathy/hints/close_main_window</applyto>
+      <owner>empathy</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short>Show hint about closing the main window</short>
+       <long>
+       Whether or not to show the message dialog about closing the
+      main window with the 'x' button in the title bar.
+       </long>
+      </locale>
+    </schema>
+
+  </schemalist>  
+</gconfschemafile>
+
+
+
+

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index f2cf7ea687b3df99ec2a5321391cdfe90171470d..1810fc4cf7cdbf8a4a46dc2f7221c398b4fa2076 100644 (file)
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -52,28 +52,8 @@ dtd_DATA =                                                                   \
        gossip-status-presets.dtd                                               \
        gossip-contact-groups.dtd
 
-schemasdir      = $(GCONF_SCHEMA_FILE_DIR)
-schemas_in_files = empathy.schemas.in
-schemas_DATA    = $(schemas_in_files:.schemas.in=.schemas)
-@INTLTOOL_SCHEMAS_RULE@
-
-if GCONF_SCHEMAS_INSTALL
-install-data-local:
-       if test -z "$(DESTDIR)" ; then \
-         for p in $(schemas_DATA) ; do \
-           GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
-         done \
-       fi
-else
-install-data-local:
-endif
 
 EXTRA_DIST =                   \
        $(glade_DATA)           \
-       $(dtd_DATA)             \
-       $(schemas_in_files)     \
-       $(schemas_DATA)
-
-DISTCLEANFILES =               \
-       $(schemas_DATA)
+       $(dtd_DATA)
 

diff --git a/libempathy-gtk/empathy.schemas.in b/libempathy-gtk/empathy.schemas.in
deleted file mode 100644 (file)
index 66de66d..0000000
--- a/libempathy-gtk/empathy.schemas.in
+++ /dev/null
@@ -1,253 +0,0 @@
-<gconfschemafile>
-  <schemalist>
-
-    <schema>
-      <key>/schemas/apps/empathy/ui/show_offline</key>
-      <applyto>/apps/empathy/ui/show_offline</applyto>
-      <owner>empathy</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Show offline contacts</short>
-       <long>
-       Whether or not to show contacts that are offline in the contact list.
-       </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gossip/contacts/sort_criterium</key>
-      <applyto>/apps/gossip/contacts/sort_criterium</applyto>
-      <owner>gossip</owner>
-      <type>string</type>
-      <default>name</default>
-      <locale name="C">
-        <short>Contact list sort criterium</short>
-        <long>
-       Which criterium to use when sorting the contact list.
-       Default is to use sort by the contact's name with the value
-       "name". A value of "state" will sort the contact list by state.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/empathy/ui/show_avatars</key>
-      <applyto>/apps/empathy/ui/show_avatars</applyto>
-      <owner>empathy</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Show avatars</short>
-       <long>
-       Whether or not to show avatars for contacts in the contact
-        list and chat windows.
-       </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/empathy/ui/compact_contact_list</key>
-      <applyto>/apps/empathy/ui/compact_contact_list</applyto>
-      <owner>empathy</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Compact contact list</short>
-       <long>
-       Whether to show the contact list in compact mode or not. 
-       </long>
-      </locale>
-    </schema>
-
-    <schema>
-       <key>/schemas/apps/empathy/ui/main_window_hidden</key>
-       <applyto>/apps/empathy/ui/main_window_hidden</applyto>
-       <owner>empathy</owner>
-       <type>bool</type>
-       <default>false</default>
-       <locale name="C">
-          <short>Hide main window</short>
-          <long>
-            Hide the main window.
-          </long>
-       </locale>
-    </schema>
-
-    <schema>
-       <key>/schemas/apps/empathy/ui/avatar_directory</key>
-       <applyto>/apps/empathy/ui/avatar_directory</applyto>
-       <owner>empathy</owner>
-       <type>string</type>
-       <default></default>
-       <locale name="C">
-          <short>Default directory to select an avatar image from</short>
-          <long>
-           The last directory that an avatar image was chosen from.
-          </long>
-       </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/empathy/notifications/play_sounds</key>
-      <applyto>/apps/empathy/notifications/play_sounds</applyto>
-      <owner>empathy</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Use notification sounds</short>
-         <long>
-        Whether or not to play a sound when messages arrive.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/empathy/notifications/sound_when_away</key>
-      <applyto>/apps/empathy/notifications/sound_when_away</applyto>
-      <owner>empathy</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Enable sound when away</short>
-         <long>
-        Whether or not to play sounds when away.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/empathy/notifications/sound_when_busy</key>
-      <applyto>/apps/empathy/notifications/sound_when_busy</applyto>
-      <owner>empathy</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Enable sound when busy</short>
-         <long>
-        Whether or not to play sounds when busy.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/empathy/notifications/popup_when_contact_available</key>
-      <applyto>/apps/empathy/notifications/popup_when_contact_available</applyto>
-      <owner>empathy</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Enable popup when contact is available</short>
-         <long>
-        Whether or not to show a popup when a contact becomes available.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-       <key>/schemas/apps/empathy/ui/separate_chat_windows</key>
-       <applyto>/apps/empathy/ui/separate_chat_windows</applyto>
-       <owner>empathy</owner>
-       <type>bool</type>
-       <default>false</default>
-       <locale name="C">
-          <short>Open new chats in separate windows</short>
-          <long>
-           Always open a separate chat window for new chats.
-          </long>
-       </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/empathy/conversation/graphical_smileys</key>
-      <applyto>/apps/empathy/conversation/graphical_smileys</applyto>
-      <owner>empathy</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Use graphical smileys</short>
-         <long>
-        Whether or not to convert smileys into graphical images in
-        conversations.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/empathy/conversation/theme</key>
-      <applyto>/apps/empathy/conversation/theme</applyto>
-      <owner>empathy</owner>
-      <type>string</type>
-      <default>classic</default>
-      <locale name="C">
-         <short>Chat window theme</short>
-         <long>
-           The theme that is used to display the conversation in chat windows.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/empathy/conversation/theme_chat_room</key>
-      <applyto>/apps/empathy/conversation/theme_chat_room</applyto>
-      <owner>empathy</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Use theme for chat rooms</short>
-         <long>
-           Whether to use the theme for chat rooms or not.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/empathy/conversation/spell_checker_languages</key>
-      <applyto>/apps/empathy/conversation/spell_checker_languages</applyto>
-      <owner>empathy</owner>
-      <type>string</type>
-      <default>en</default>
-      <locale name="C">
-       <short>Spell checking languages</short>
-       <long>
-         Comma separated list of spell checker languages to use (e.g. en, fr, nl).
-       </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/empathy/conversation/spell_checker_enabled</key>
-      <applyto>/apps/empathy/conversation/spell_checker_enabled</applyto>
-      <owner>empathy</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Enable spell checker</short>
-       <long>
-       Whether or not to check words typed against the languages you
-      want to check with.
-       </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/empathy/hints/close_main_window</key>
-      <applyto>/apps/empathy/hints/close_main_window</applyto>
-      <owner>empathy</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Show hint about closing the main window</short>
-       <long>
-       Whether or not to show the message dialog about closing the
-      main window with the 'x' button in the title bar.
-       </long>
-      </locale>
-    </schema>
-
-  </schemalist>  
-</gconfschemafile>
-
-
-
-