← Back to branch summary

~ubuntu-branches/ubuntu/trusty/ejabberd/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/shared_roster_online.patch

  • Committer: Bazaar Package Importer
  • Author(s): Konstantin Khomoutov, Konstantin Khomoutov
  • Date: 2010-08-03 19:55:25 UTC
  • mfrom: (1.1.16 upstream)
  • Revision ID: james.westby@ubuntu.com-20100803195525-dix2icz1w2fkew0n
Tags: 2.1.5-1
http://bugs.debian.org/591431
[ Konstantin Khomoutov ]
* New upstream release.
* Remove obsolete erlang-otp-r14-ssl.patch
* Refresh patches: reopen-log.patch, shared_roster_online.patch
  shared_roster_recent.patch
* Bump standards version to 3.9.0.
* Remove COPYING file installed by upstream Makefile
* Remove autogenerated src/ejabberd.init
* Add upstream patch fixing EJAB-1284 (closes: #591431).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/shared_roster_online.patch
6
6
This patch must be applied after shared_roster_recent.patch
7
7
as it depends on the functionality provided by that patch.
8
8
 
9
 
Index: pkg-ejabberd/src/mod_shared_roster.erl
10
 
===================================================================
11
 
--- pkg-ejabberd.orig/src/mod_shared_roster.erl 2010-04-06 12:54:44.000000000 +0400
12
 
+++ pkg-ejabberd/src/mod_shared_roster.erl      2010-04-06 12:54:58.000000000 +0400
 
9
--- a/src/mod_shared_roster.erl
 
10
+++ b/src/mod_shared_roster.erl
13
11
@@ -39,6 +39,8 @@
14
12
         out_subscription/4,
15
13
         register_user/2,
91
89
       end,
92
90
       list_groups(Host)).
93
91
 
94
 
@@ -720,6 +746,103 @@
 
92
@@ -721,6 +747,103 @@
95
93
                        push_roster_item(U, S, LUser, LServer, GroupName, Subscription)
96
94
                end, get_group_users(LUser, LServer, Group, GroupOpts))
97
95
       end, lists:usort(SpecialGroups++UserGroups)).
195
193
 
196
194
 push_user_to_displayed(LUser, LServer, Group, Subscription) ->
197
195
     GroupsOpts = groups_with_opts(LServer),
198
 
@@ -918,6 +1041,7 @@
 
196
@@ -919,6 +1042,7 @@
199
197
     Description = get_opt(GroupOpts, description, ""),
200
198
     AllUsers = get_opt(GroupOpts, all_users, false),
201
199
     RecentUsersDays = get_opt(GroupOpts, recent_users_days, 0),
203
201
     %%Disabled = false,
204
202
     DisplayedGroups = get_opt(GroupOpts, displayed_groups, []),
205
203
     Members = mod_shared_roster:get_group_explicit_users(Host, Group),
206
 
@@ -934,6 +1058,12 @@
 
204
@@ -935,6 +1059,12 @@
207
205
            true ->
208
206
                []
209
207
        end ++
216
214
        [[us_to_list(Member), $\n] || Member <- Members],
217
215
     FDisplayedGroups = [[DG, $\n] || DG <- DisplayedGroups],
218
216
     DescNL = length(element(2, regexp:split(Description, "\n"))),
219
 
@@ -1020,6 +1150,8 @@
 
217
@@ -1021,6 +1151,8 @@
220
218
                                  USs;
221
219
                              "@recent@" ->
222
220
                                  USs;
225
223
                              _ ->
226
224
                                  case jlib:string_to_jid(SJID) of
227
225
                                      JID when is_record(JID, jid) ->
228
 
@@ -1040,11 +1172,16 @@
 
226
@@ -1041,11 +1173,16 @@
229
227
                    true -> [{recent_users_days, 7}];
230
228
                    false -> []
231
229
                end,