aboutsummaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorxclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4>2008-01-12 19:02:46 +0800
committerxclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4>2008-01-12 19:02:46 +0800
commitc62f76890dc76aad6882ebb2444c9d11a0741a5c (patch)
tree0a0e0fc96c6cbbf8636d27ef006fa6c8446e99dc /data
parent9566b626ac9731a94a9b824765a021b9505baf1d (diff)
downloadgsoc2013-empathy-c62f76890dc76aad6882ebb2444c9d11a0741a5c.tar
gsoc2013-empathy-c62f76890dc76aad6882ebb2444c9d11a0741a5c.tar.gz
gsoc2013-empathy-c62f76890dc76aad6882ebb2444c9d11a0741a5c.tar.bz2
gsoc2013-empathy-c62f76890dc76aad6882ebb2444c9d11a0741a5c.tar.lz
gsoc2013-empathy-c62f76890dc76aad6882ebb2444c9d11a0741a5c.tar.xz
gsoc2013-empathy-c62f76890dc76aad6882ebb2444c9d11a0741a5c.tar.zst
gsoc2013-empathy-c62f76890dc76aad6882ebb2444c9d11a0741a5c.zip
Add option in preference to automatically connect at startup. Fixes bug #499885 (Carl-Anton Ingmarsson).
git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@539 4ee84921-47dd-4033-b63a-18d7a039a3e4
Diffstat (limited to 'data')
-rw-r--r--data/empathy.desktop.in.in2
-rw-r--r--data/empathy.schemas.in18
2 files changed, 15 insertions, 5 deletions
diff --git a/data/empathy.desktop.in.in b/data/empathy.desktop.in.in
index e5d56a278..d7feab251 100644
--- a/data/empathy.desktop.in.in
+++ b/data/empathy.desktop.in.in
@@ -2,7 +2,7 @@
Version=1.0
_Name=Empathy Instant Messenger
_Comment=Send and receive instant messages
-Exec=empathy --no-connect
+Exec=empathy
Icon=empathy
StartupNotify=false
Terminal=false
diff --git a/data/empathy.schemas.in b/data/empathy.schemas.in
index 732464867..6a9ab9ee5 100644
--- a/data/empathy.schemas.in
+++ b/data/empathy.schemas.in
@@ -290,10 +290,20 @@
</long>
</locale>
</schema>
+
+ <schema>
+ <key>/schemas/apps/empathy/autoconnect</key>
+ <applyto>/apps/empathy/autoconnect</applyto>
+ <owner>empathy</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Checks if Empathy should autoconnect on startup</short>
+ <long>
+ Whether or not Empathy should automatically login to your accounts on startup.
+ </long>
+ </locale>
+ </schema>
</schemalist>
</gconfschemafile>
-
-
-
-