[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian, updated. 8a17363dea729ed1b54f70edfc742b6cd45c92b9

[Sjoerd Simons]

The following commit has been merged in the debian branch:
commit 8a17363dea729ed1b54f70edfc742b6cd45c92b9
Author: Sjoerd Simons <sjoerd at luon.net>
Date:   Wed Jan 7 18:22:30 2009 +0000

    debian/patches/0001-Set-initial-value-for-sound-pref-checkboxes.patch
    
    * debian/patches/0001-Set-initial-value-for-sound-pref-checkboxes.patch
      - Added. Set the initial values of the sound preferences from the
        configuration. (From upstream git)

diff --git a/debian/changelog b/debian/changelog
index 0484d45..fb6c82a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,11 @@ empathy (2.25.4-1) UNRELEASED; urgency=low
   * debian/control: Bump libempathy soname from 17 to 19
   * debian/libempathy-gtk17.symbols: Update with new symbols
   * debian/libempathy19.symbols: Update with new symbols
+  * debian/patches/0001-Set-initial-value-for-sound-pref-checkboxes.patch
+    - Added. Set the initial values of the sound preferences from the
+      configuration. (From upstream git)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Wed, 07 Jan 2009 17:14:49 +0000
+ -- Sjoerd Simons <sjoerd at debian.org>  Wed, 07 Jan 2009 18:20:30 +0000
 
 empathy (2.25.3-1) experimental; urgency=low
 
diff --git a/debian/patches/0001-Set-initial-value-for-sound-pref-checkboxes.patch b/debian/patches/0001-Set-initial-value-for-sound-pref-checkboxes.patch
new file mode 100644
index 0000000..209a8c0
--- /dev/null
+++ b/debian/patches/0001-Set-initial-value-for-sound-pref-checkboxes.patch
@@ -0,0 +1,24 @@
+From 1d08b628bfde8032d8a5ebe85aa99b3aedff419d Mon Sep 17 00:00:00 2001
+From: xclaesse <xclaesse at 4ee84921-47dd-4033-b63a-18d7a039a3e4>
+Date: Tue, 6 Jan 2009 19:14:57 +0000
+Subject: [PATCH] Set initial value for sound pref checkboxes.
+
+git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@2108 4ee84921-47dd-4033-b63a-18d7a039a3e4
+---
+ src/empathy-preferences.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
+index 75e51c7..3fe9498 100644
+--- a/src/empathy-preferences.c
++++ b/src/empathy-preferences.c
+@@ -290,7 +290,8 @@ preferences_sound_load (EmpathyPreferences *preferences)
+ 
+ 		gtk_list_store_insert_with_values (store, &iter, i,
+ 						   COL_SOUND_NAME, gettext (sound_entries[i].name),
+-						   COL_SOUND_KEY, sound_entries[i].key, -1);
++						   COL_SOUND_KEY, sound_entries[i].key,
++						   COL_SOUND_ENABLED, set, -1);
+ 	}
+ }
+ 

-- 
Empathy packaging