Ubuntu
empathy package

Merge lp:~bcurtiswx/ubuntu/natty/empathy/empathy-2.33.1-0ubuntu3 into lp:~ubuntu-desktop/empathy/ubuntu

  1. Natty (11.04)
  2. empathy-2.33.1-0ubuntu3
  3. Merge into ubuntu
Proposed by Brian Curtis
Status: Merged
Merged at revision: 167
Proposed branch: lp:~bcurtiswx/ubuntu/natty/empathy/empathy-2.33.1-0ubuntu3
Merge into: lp:~ubuntu-desktop/empathy/ubuntu
Diff against target: 322 lines (+290/-1)
4 files modified
debian/changelog (+9/-0)
debian/control (+2/-1)
debian/patches/40_libunity.patch (+278/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~bcurtiswx/ubuntu/natty/empathy/empathy-2.33.1-0ubuntu3
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Review via email: mp+49729@code.launchpad.net

Description of the change

empathy (2.33.1-0ubuntu3) natty; urgency=low

  * debian/patches/40_libunity.patch
    -add launcher support for empathy
  * debian/changelog
    -add libunity-dev to deps

 -- Brian Curtis <email address hidden> Mon, 14 Feb 2011 17:28:40 -0500

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-02-14 21:01:34 +0000
3+++ debian/changelog 2011-02-14 23:03:18 +0000
4@@ -1,3 +1,12 @@
5+empathy (2.33.1-0ubuntu3) natty; urgency=low
6+
7+ * debian/patches/40_libunity.patch
8+ -add launcher support for empathy
9+ * debian/changelog
10+ -add libunity-dev to deps
11+
12+ -- Brian Curtis <bcurtiswx@ubuntu.com> Mon, 14 Feb 2011 17:28:40 -0500
13+
14 empathy (2.33.1-0ubuntu2) natty; urgency=low
15
16 * debian/patches/23_idomessagedialog_for_voip_and_ft.patch
17
18=== modified file 'debian/control'
19--- debian/control 2011-02-02 16:55:07 +0000
20+++ debian/control 2011-02-14 23:03:18 +0000
21@@ -47,7 +47,8 @@
22 libindicate-dev (>= 0.4.91),
23 libindicate-gtk-dev (>= 0.4.91),
24 libido-0.1-dev,
25- liblaunchpad-integration-dev (>= 0.1.17)
26+ liblaunchpad-integration-dev (>= 0.1.17),
27+ libunity-dev (>= 3.4.0)
28 Standards-Version: 3.9.1
29 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/empathy/ubuntu
30 Homepage: http://live.gnome.org/Empathy
31
32=== added file 'debian/patches/40_libunity.patch'
33--- debian/patches/40_libunity.patch 1970-01-01 00:00:00 +0000
34+++ debian/patches/40_libunity.patch 2011-02-14 23:03:18 +0000
35@@ -0,0 +1,278 @@
36+Index: empathy/configure.ac
37+===================================================================
38+--- empathy.orig/configure.ac 2011-02-10 12:53:55.050863028 -0500
39++++ empathy/configure.ac 2011-02-10 15:20:15.230002930 -0500
40+@@ -58,6 +58,7 @@
41+ GNOME_CONTROL_CENTER_GTK3_REQUIRED=2.31.4
42+ INDICATE_REQUIRED=0.4.91
43+ INDICATE_GTK_REQUIRED=0.4.91
44++UNITY_REQUIRED=3.4.0
45+
46+ AC_CONFIG_MACRO_DIR([m4])
47+ AC_CONFIG_HEADERS([config.h])
48+@@ -468,12 +469,41 @@
49+ fi
50+
51+ if test "x$enable_libindicate" = "xyes" -a "x$have_libindicate" != "xyes"; then
52+- AC_MSG_ERROR([Couldn't find libindicate.])
53++ AC_MSG_ERROR([Could not find libindicate.])
54+ fi
55+
56+ AM_CONDITIONAL(HAVE_LIBINDICATE, test "x$have_libindicate" = "xyes")
57+
58+ # -----------------------------------------------------------
59++# libunity
60++# -----------------------------------------------------------
61++AC_ARG_ENABLE(libunity,
62++ AS_HELP_STRING([--enable-libunity=@<:@no/yes/auto@:>@],
63++ [build libunity support]), ,
64++ enable_libunity=auto)
65++
66++if test "x$enable_unity" != "xno"; then
67++ PKG_CHECK_MODULES(UNITY,
68++ [
69++ unity >= $UNITY_REQUIRED
70++ ], have_unity="yes", have_unity="no")
71++
72++ if test "x$have_unity" = "xyes"; then
73++ AC_DEFINE(HAVE_UNITY, 1, [Define if you have unity])
74++ fi
75++else
76++ have_unity=no
77++fi
78++
79++if test "x$enable_unity" = "xyes" -a "x$have_unity" != "xyes"; then
80++ AC_MSG_ERROR([Could not find libunity.])
81++fi
82++
83++AM_CONDITIONAL(HAVE_UNITY, test "x$have_unity" = "xyes")
84++AC_SUBST([UNITY_CFLAGS])
85++AC_SUBST([UNITY_LIBS])
86++
87++# -----------------------------------------------------------
88+ # nautilus-sendto
89+ # -----------------------------------------------------------
90+ AC_ARG_ENABLE(nautilus-sendto,
91+@@ -576,6 +606,7 @@
92+
93+ Features:
94+ Message indicator support (libindicate): ${have_libindicate}
95++ Unity panel support (unity).: ${have_unity}
96+ Spell checking (enchant)....: ${have_enchant}
97+ Display maps (libchamplain).: ${have_libchamplain}
98+ Location awareness (Geoclue): ${have_geoclue}
99+Index: empathy/src/Makefile.am
100+===================================================================
101+--- empathy.orig/src/Makefile.am 2011-02-10 13:19:02.354033754 -0500
102++++ empathy/src/Makefile.am 2011-02-10 13:21:46.893715169 -0500
103+@@ -18,6 +18,7 @@
104+ $(CPPFLAGS_COMMON) \
105+ $(LIBNOTIFY_CFLAGS) \
106+ $(INDICATE_CFLAGS) \
107++ $(UNITY_CFLAGS) \
108+ $(UNIQUE_CFLAGS) \
109+ $(LIBCHAMPLAIN_CFLAGS) \
110+ $(WEBKIT_CFLAGS) \
111+@@ -29,6 +30,7 @@
112+ $(top_builddir)/extensions/libemp-extensions.la \
113+ $(LIBNOTIFY_LIBS) \
114+ $(INDICATE_LIBS) \
115++ $(UNITY_LIBS) \
116+ $(UNIQUE_LIBS) \
117+ $(EMPATHY_LIBS) \
118+ $(GTK_LIBS) \
119+@@ -147,6 +149,7 @@
120+ $(UNIQUE_LIBS) \
121+ $(EMPATHY_LIBS) \
122+ $(INDICATE_LIBS) \
123++ $(UNITY_LIBS) \
124+ $(LIBCHAMPLAIN_LIBS) \
125+ $(WEBKIT_LIBS) \
126+ $(NULL)
127+Index: empathy/src/empathy-chat-window.c
128+===================================================================
129+--- empathy.orig/src/empathy-chat-window.c 2011-02-03 12:17:02 +0000
130++++ empathy/src/empathy-chat-window.c 2011-02-14 19:53:09 +0000
131+@@ -71,6 +71,10 @@
132+ #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
133+ #include <libempathy/empathy-debug.h>
134+
135++#ifdef HAVE_UNITY
136++#include <unity.h>
137++#endif
138++
139+ /* Macro to compare guint32 X timestamps, while accounting for wrapping around
140+ */
141+ #define X_EARLIER_OR_EQL(t1, t2) \
142+@@ -96,6 +100,9 @@
143+ /* EmpathyChat -> EmpathyIndicator for that chat, if any */
144+ GHashTable *indicators;
145+ #endif
146++#ifdef HAVE_UNITY
147++ UnityLauncherEntry *launcher;
148++#endif
149+ GtkTargetList *contact_targets;
150+ GtkTargetList *file_targets;
151+
152+@@ -1304,8 +1311,19 @@
153+ sender, body);
154+ g_signal_connect (indicator, "activate",
155+ G_CALLBACK (chat_window_indicator_activate_cb), chat);
156+-
157+ g_hash_table_insert (priv->indicators, chat, indicator);
158++#ifdef HAVE_UNITY
159++ if (priv->launcher != NULL)
160++ {
161++ gint count = g_hash_table_size (priv->indicators);
162++ g_debug ("LAUNCHER: count is now %d", count);
163++ if (count > 0)
164++ {
165++ unity_launcher_entry_set_count (priv->launcher, count);
166++ unity_launcher_entry_set_count_visible (priv->launcher, TRUE);
167++ }
168++ }
169++#endif
170+ }
171+ empathy_indicator_show (indicator);
172+ }
173+@@ -1322,6 +1340,25 @@
174+ DEBUG ("indicator is %p", indicator);
175+ empathy_indicator_hide (indicator);
176+ g_hash_table_remove (priv->indicators, chat);
177++#ifdef HAVE_UNITY
178++ if (priv->launcher != NULL)
179++ {
180++ gint count = g_hash_table_size (priv->indicators);
181++ g_debug ("LAUNCHER: count is %d", count);
182++ if (count > 0)
183++ {
184++ g_debug ("LAUNCHER: setting count to %d", count);
185++ unity_launcher_entry_set_count (priv->launcher, count);
186++ unity_launcher_entry_set_count_visible (priv->launcher, TRUE);
187++ } else {
188++ unity_launcher_entry_set_count (priv->launcher, count);
189++ g_debug ("LAUNCHER: hiding count");
190++ unity_launcher_entry_set_count_visible (priv->launcher, FALSE);
191++ }
192++ }
193++#endif
194++
195++
196+ } else {
197+ DEBUG ("indicator is NULL, nothing to remove");
198+ }
199+@@ -2053,6 +2090,10 @@
200+ priv->indicators = g_hash_table_new_full (g_direct_hash, g_direct_equal,
201+ NULL, g_object_unref);
202+ #endif
203++#ifdef HAVE_UNITY
204++ const gchar *desktop_id = g_strconcat(g_get_prgname(), ".desktop", NULL);
205++ priv->launcher = unity_launcher_entry_get_for_desktop_id (desktop_id);
206++#endif
207+
208+ priv->notebook = gtk_notebook_new ();
209+ gtk_notebook_set_group (GTK_NOTEBOOK (priv->notebook), "EmpathyChatWindow");
210+Index: empathy/src/empathy-indicator-manager.c
211+===================================================================
212+--- empathy.orig/src/empathy-indicator-manager.c 2011-02-01 12:29:11 +0000
213++++ empathy/src/empathy-indicator-manager.c 2011-02-14 19:13:59 +0000
214+@@ -45,6 +45,10 @@
215+ #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
216+ #include <libempathy/empathy-debug.h>
217+
218++#ifdef HAVE_UNITY
219++#include <unity.h>
220++#endif
221++
222+ #define INDICATOR_LOGIN_TIMEOUT 15
223+ #define EMPATHY_DESKTOP_PATH DESKTOPDIR "/empathy.desktop"
224+
225+@@ -62,6 +66,9 @@
226+ IndicateServer *indicate_server;
227+ GSList *indicator_events;
228+ GHashTable *login_timeouts;
229++#ifdef HAVE_UNITY
230++ UnityLauncherEntry *launcher;
231++#endif
232+ } EmpathyIndicatorManagerPriv;
233+
234+ typedef struct {
235+@@ -172,6 +179,20 @@
236+ g_object_unref (indicator);
237+ priv->indicator_events = g_slist_prepend (priv->indicator_events,
238+ indicator_event);
239++#ifdef HAVE_UNITY
240++ if (priv->launcher == NULL)
241++ {
242++ return;
243++ }
244++ gint count = g_slist_length (priv->indicator_events);
245++ g_debug ("LAUNCHER: count is %d", count);
246++ if (count > 0)
247++ {
248++ unity_launcher_entry_set_count (priv->launcher, count);
249++ unity_launcher_entry_set_count_visible (priv->launcher, TRUE);
250++ }
251++#endif
252++
253+ }
254+
255+ static void
256+@@ -195,6 +216,26 @@
257+ priv->indicator_events = g_slist_remove (priv->indicator_events,
258+ indicator_event);
259+ empathy_indicator_hide (indicator_event->indicator);
260++#ifdef HAVE_UNITY
261++ if (priv->launcher == NULL)
262++ {
263++ g_debug ("LAUNCHER: launcher is NULL");
264++ return;
265++ }
266++
267++ gint count = g_slist_length (priv->indicator_events);
268++ g_debug ("LAUNCHER: count is %d", count);
269++ if (count > 0)
270++ {
271++ g_debug ("LAUNCHER: setting count to %d", count);
272++ unity_launcher_entry_set_count (priv->launcher, count);
273++ unity_launcher_entry_set_count_visible (priv->launcher, TRUE);
274++ } else {
275++ unity_launcher_entry_set_count (priv->launcher, count);
276++ g_debug ("LAUNCHER: hiding count");
277++ unity_launcher_entry_set_count_visible (priv->launcher, FALSE);
278++ }
279++#endif
280+ return;
281+ }
282+ }
283+@@ -211,6 +252,8 @@
284+
285+ priv = GET_PRIV (manager);
286+
287++ DEBUG ("Event updated");
288++
289+ for (l = priv->indicator_events; l; l = l->next)
290+ {
291+ IndicatorEvent *indicator_event;
292+@@ -361,6 +404,7 @@
293+ empathy_indicator_manager_init (EmpathyIndicatorManager *manager)
294+ {
295+ EmpathyIndicatorManagerPriv *priv;
296++ const gchar *desktop_id = g_strconcat(g_get_prgname(), ".desktop", NULL);
297+
298+ priv = G_TYPE_INSTANCE_GET_PRIVATE (manager,
299+ EMPATHY_TYPE_INDICATOR_MANAGER, EmpathyIndicatorManagerPriv);
300+@@ -379,6 +423,13 @@
301+ G_CALLBACK (indicate_server_activate),
302+ manager);
303+
304++#ifdef HAVE_UNITY
305++ priv->launcher = unity_launcher_entry_get_for_desktop_id (desktop_id);
306++/* unity_launcher_entry_set_count (launcher, 0);
307++ g_debug ("LAUNCHER: hiding count");
308++ unity_launcher_entry_set_count_visible (launcher, FALSE);*/
309++#endif
310++
311+ g_signal_connect (priv->event_manager, "event-added",
312+ G_CALLBACK (indicator_manager_event_added_cb),
313+ manager);
314
315=== modified file 'debian/patches/series'
316--- debian/patches/series 2011-02-14 21:01:34 +0000
317+++ debian/patches/series 2011-02-14 23:03:18 +0000
318@@ -11,3 +11,4 @@
319 36_chat_window_default_size.patch
320 37_facebook_default.patch
321 38_lp_569289.patch
322+40_libunity.patch

Subscribers

People subscribed via source and target branches