[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian, updated. debian/2.25.4-1-4-gabc6c2c

[Sjoerd Simons]

The following commit has been merged in the debian branch:
commit abc6c2c496fa4317f375f2e43e0b85023f1e904a
Author: Sjoerd Simons <sjoerd at luon.net>
Date:   Tue Feb 3 17:04:07 2009 +0000

    removed debian/patches/0001-Set-initial-value-for-sound-pref-checkboxes.patch
    
    * debian/patches/0001-Set-initial-value-for-sound-pref-checkboxes.patch
      - Removed, fixed upstream

diff --git a/debian/changelog b/debian/changelog
index c105a1b..792734b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 empathy (2.25.90-1) UNRELEASED; urgency=low
 
   * New Upstream Version
+  * debian/patches/0001-Set-initial-value-for-sound-pref-checkboxes.patch
+    - Removed, fixed upstream
 
- -- Sjoerd Simons <sjoerd at debian.org>  Tue, 03 Feb 2009 16:48:18 +0000
+ -- Sjoerd Simons <sjoerd at debian.org>  Tue, 03 Feb 2009 17:03:06 +0000
 
 empathy (2.25.4-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
deleted file mode 100644
index 209a8c0..0000000
--- a/debian/patches/0001-Set-initial-value-for-sound-pref-checkboxes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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