[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian, updated. debian/2.91.4.3-1-5-gcab7d46

[Emilio Pozuelo Monfort]

The following commit has been merged in the debian branch:
commit 9b234b7e4e4b0347dfe8e885eb65dc6ab6b1d25e
Author: Emilio Pozuelo Monfort <emilio.pozuelo at collabora.co.uk>
Date:   Tue Jan 11 13:59:13 2011 +0000

    0001-Simplify-filter-adding-code-by-just-using-gdk_x11-fu.patch removed

diff --git a/debian/changelog b/debian/changelog
index 9194c6b..0b4e3eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 empathy (2.91.5-1) UNRELEASED; urgency=low
 
   * New upstream release.
+    + d/p/0001-Simplify-filter-adding-code-by-just-using-gdk_x11-fu.patch:
+      - Removed, included upstream.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 11 Jan 2011 13:45:17 +0000
 
diff --git a/debian/patches/0001-Simplify-filter-adding-code-by-just-using-gdk_x11-fu.patch b/debian/patches/0001-Simplify-filter-adding-code-by-just-using-gdk_x11-fu.patch
deleted file mode 100644
index 9a03c1e..0000000
--- a/debian/patches/0001-Simplify-filter-adding-code-by-just-using-gdk_x11-fu.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 278cc34c7431dbe1d674cf081beff87a6b41daf3 Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
-Date: Sat, 25 Dec 2010 20:47:24 +0100
-Subject: [PATCH] Simplify filter adding code by just using gdk_x11 functions instead of hoops
-
----
- libempathy-gtk/empathy-avatar-image.c |   18 ++++++++----------
- 1 files changed, 8 insertions(+), 10 deletions(-)
-
-diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c
-index a11627d..3fb7969 100644
---- a/libempathy-gtk/empathy-avatar-image.c
-+++ b/libempathy-gtk/empathy-avatar-image.c
-@@ -148,24 +148,22 @@ avatar_image_filter_func (GdkXEvent  *gdkxevent,
- static void
- avatar_image_add_filter (EmpathyAvatarImage *avatar_image)
- {
-+	Display    *display;
- 	Window     window;
--	GdkWindow *gdkwindow;
- 	gint       mask;
-+	XWindowAttributes attrs;
- 
- 	mask = PropertyChangeMask;
- 
--	window = GDK_ROOT_WINDOW ();
--	gdkwindow = gdk_x11_window_lookup_for_display (gdk_display_get_default (),
--		window);
-+	window = gdk_x11_get_default_root_xwindow ();
-+	display = gdk_x11_get_default_xdisplay ();
- 
- 	gdk_error_trap_push ();
--	if (gdkwindow) {
--		XWindowAttributes attrs;
--		XGetWindowAttributes (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), window, &attrs);
--		mask |= attrs.your_event_mask;
--	}
- 
--	XSelectInput (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), window, mask);
-+	XGetWindowAttributes (display, window, &attrs);
-+	mask |= attrs.your_event_mask;
-+
-+	XSelectInput (display, window, mask);
- 
- 	gdk_error_trap_pop_ignored ();
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e59061d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Simplify-filter-adding-code-by-just-using-gdk_x11-fu.patch

-- 
Empathy packaging