[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian-wheezy, updated. debian/2.30.3-2-8-g1aa27c9

[Laurent Bigonville]

The following commit has been merged in the debian-wheezy branch:
commit 1aa27c942e6a1b87ae5dca43433ba4ce45f03143
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Wed Jul 27 10:40:29 2011 +0200

    debian/patches/0003-use-gtk-clutter-init.patch: Call gtk_clutter_init() instead of clutter_init() (Backported from upstream)

diff --git a/debian/changelog b/debian/changelog
index b602b99..b927c9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,10 @@ empathy (2.30.3-3) UNRELEASED; urgency=low
     - Bump Standards-Version to 3.9.2 (no further changes)
   * debian/patches/0002-port-libnotify-0.7.patch: Port to libnotify 0.7 API
     (Closes: #630267)
+  * debian/patches/0003-use-gtk-clutter-init.patch: Call gtk_clutter_init()
+    instead of clutter_init() (Backported from upstream)
 
- -- Laurent Bigonville <bigon at debian.org>  Mon, 25 Jul 2011 22:35:37 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Wed, 27 Jul 2011 10:59:08 +0200
 
 empathy (2.30.3-2) unstable; urgency=low
 
diff --git a/debian/patches/0003-use-gtk-clutter-init.patch b/debian/patches/0003-use-gtk-clutter-init.patch
new file mode 100644
index 0000000..33f0d48
--- /dev/null
+++ b/debian/patches/0003-use-gtk-clutter-init.patch
@@ -0,0 +1,32 @@
+commit 2f7d7b2d43b15f9133e2c89ead564651b03e6bd5
+Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
+Date:   Mon Aug 9 10:05:35 2010 +0200
+
+    use gtk_clutter_init rather than clutter_init
+    
+    This should fix the "Unable to make the stage window ..... the current GLX
+    drawable" warning.
+    Thanks to Jiri Techet to have spotted this.
+
+--- a/src/empathy.c
++++ b/src/empathy.c
+@@ -595,14 +595,16 @@
+ 
+   /* Init */
+   g_thread_init (NULL);
++
++#ifdef HAVE_LIBCHAMPLAIN
++  gtk_clutter_init (&argc, &argv);
++#endif
++
+   empathy_init ();
+ 
+   optcontext = g_option_context_new (N_("- Empathy IM Client"));
+   g_option_context_add_group (optcontext, gst_init_get_option_group ());
+   g_option_context_add_group (optcontext, gtk_get_option_group (TRUE));
+-#if HAVE_LIBCHAMPLAIN
+-  g_option_context_add_group (optcontext, clutter_get_option_group ());
+-#endif
+   g_option_context_add_main_entries (optcontext, options, GETTEXT_PACKAGE);
+ 
+   if (!g_option_context_parse (optcontext, &argc, &argv, &error)) {
diff --git a/debian/patches/series b/debian/patches/series
index b024ef5..c427bd7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Transition-to-libchamplain-0.8.patch
 0002-port-libnotify-0.7.patch
+0003-use-gtk-clutter-init.patch

-- 
Empathy packaging