Empathy

Merge lp:~sune-keller/empathy/fix-533857 into lp:ubuntu/lucid/empathy

  1. fix-533857
  2. Merge into lucid
Proposed by Sune Keller on 2010-04-03
Status: Merged
Merge reported by: Ken VanDine
Merged at revision: not available
Proposed branch: lp:~sune-keller/empathy/fix-533857
Merge into: lp:ubuntu/lucid/empathy
Diff against target: 46 lines (+21/-15)
1 file modified
debian/patches/20_libindicate.patch (+21/-15)
To merge this branch: bzr merge lp:~sune-keller/empathy/fix-533857
Reviewer Review Type Date Requested Status
Ken VanDine 2010-04-03 Approve on 2010-04-10
VCS imports 2010-04-03 Pending
Review via email: mp+22762@code.launchpad.net

Commit Message

* debian/patches/20_libindicate.patch
  - Fixes LP:533857, "Empathy notification preferences not honored by indicator-messages"

Description of the Change

Fixes bug #533857.
Somehow debian/patches/20_libindicate.patch doesn't apply "all the way", leaving empathy-indicator-manager.c truncated, missing 6 lines after the call to g_hash_table_insert (). Once fully patched by adding the lines manually, everything compiles fine and the issue is resolved.

To post a comment you must log in.
Ken VanDine (ken-vandine) wrote :

Approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/patches/20_libindicate.patch'
2--- debian/patches/20_libindicate.patch 2010-03-16 09:29:13 +0000
3+++ debian/patches/20_libindicate.patch 2010-04-03 18:49:14 +0000
4@@ -836,21 +836,27 @@
5 + GSource *timeout;
6 + EmpathyIndicator *e_indicator;
7 + LoginData *login_data;
8-+
9-+ priv = GET_PRIV (manager);
10-+ e_indicator = empathy_indicator_new (contact, NULL, "login");
11-+ login_data = login_data_new (e_indicator, manager);
12-+
13-+ timeout = g_timeout_source_new_seconds (INDICATOR_LOGIN_TIMEOUT);
14-+ g_source_set_callback (timeout, indicate_login_timeout, login_data,
15-+ indicator_destroy_login_data);
16-+ g_source_attach (timeout, NULL);
17-+
18-+ g_hash_table_insert (priv->login_timeouts, e_indicator, timeout);
19-+
20-+ g_signal_connect (e_indicator, "activate",
21-+ G_CALLBACK (indicate_login_cb), manager);
22-+ empathy_indicator_show (e_indicator);
23++ gboolean preference = FALSE;
24++
25++ empathy_conf_get_bool (empathy_conf_get (),
26++ EMPATHY_PREFS_NOTIFICATIONS_CONTACT_SIGNIN, &preference);
27++ if (preference)
28++ {
29++ priv = GET_PRIV (manager);
30++ e_indicator = empathy_indicator_new (contact, NULL, "login");
31++ login_data = login_data_new (e_indicator, manager);
32++
33++ timeout = g_timeout_source_new_seconds (INDICATOR_LOGIN_TIMEOUT);
34++ g_source_set_callback (timeout, indicate_login_timeout, login_data,
35++ indicator_destroy_login_data);
36++ g_source_attach (timeout, NULL);
37++
38++ g_hash_table_insert (priv->login_timeouts, e_indicator, timeout);
39++
40++ g_signal_connect (e_indicator, "activate",
41++ G_CALLBACK (indicate_login_cb), manager);
42++ empathy_indicator_show (e_indicator);
43++ }
44 +}
45
46 === added file 'src/empathy-indicator-manager.h'

Subscribers

People subscribed via source and target branches

to all changes: