← 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_recent.patch

  • Committer: Bazaar Package Importer
  • Author(s): Gerfried Fuchs, Konstantin Khomoutov, Gerfried Fuchs
  • Date: 2010-01-14 20:40:53 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20100114204053-knme5bdbp0etweq9
Tags: 2.1.1-1
http://bugs.debian.org/560824
http://bugs.debian.org/560889
[ Konstantin Khomoutov ]
* New upstream release.
  This also fixes a bug in ejabberdctl (closes: #560824).
* Update mod_admin_extra to upstream revision 1049.
* Remove obsolete patches (those backported from 2.1.1).
* Suggest imagemagick instead of recommending it (closes: #560889).

[ Gerfried Fuchs ]
* Switch Vcs-* fields to point to new git repository. All the conversion
  work was actually done by Konstantin.
* Call debconf-updatepo.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/shared_roster_recent.patch
4
4
 
5
5
See http://wiki.laptop.org/go/Ejabberd_Configuration
6
6
 
7
 
diff --git a/src/mod_shared_roster.erl b/src/mod_shared_roster.erl
8
 
index 4d323b7..6622496 100644
9
 
--- a/src/mod_shared_roster.erl
10
 
+++ b/src/mod_shared_roster.erl
11
 
@@ -439,13 +439,63 @@ get_group_opt(Host, Group, Opt, Default) ->
 
7
Index: pkg-ejabberd/src/mod_shared_roster.erl
 
8
===================================================================
 
9
--- pkg-ejabberd.orig/src/mod_shared_roster.erl 2010-01-13 05:19:53.000000000 +0300
 
10
+++ pkg-ejabberd/src/mod_shared_roster.erl      2010-01-13 05:20:11.000000000 +0300
 
11
@@ -440,13 +440,63 @@
12
12
            false
13
13
     end.
14
14
 
73
73
 
74
74
 get_group_users(_User, Host, Group, GroupOpts) ->
75
75
     case proplists:get_value(all_users, GroupOpts, false) of
76
 
@@ -453,7 +503,14 @@ get_group_users(_User, Host, Group, GroupOpts) ->
 
76
@@ -454,7 +504,14 @@
77
77
            ejabberd_auth:get_vh_registered_users(Host);
78
78
        false ->
79
79
            []
89
89
 
90
90
 %% @spec (Host::string(), Group::string()) -> [{User::string(), Server::string()}]
91
91
 get_group_explicit_users(Host, Group) ->
92
 
@@ -475,7 +532,8 @@ get_group_name(Host, Group) ->
 
92
@@ -476,7 +533,8 @@
93
93
 get_special_users_groups(Host) ->
94
94
     lists:filter(
95
95
       fun(Group) ->
99
99
       end,
100
100
       list_groups(Host)).
101
101
 
102
 
@@ -828,6 +886,7 @@ shared_roster_group(Host, Group, Query, Lang) ->
 
102
@@ -829,6 +887,7 @@
103
103
     Name = get_opt(GroupOpts, name, ""),
104
104
     Description = get_opt(GroupOpts, description, ""),
105
105
     AllUsers = get_opt(GroupOpts, all_users, false),
107
107
     %%Disabled = false,
108
108
     DisplayedGroups = get_opt(GroupOpts, displayed_groups, []),
109
109
     Members = mod_shared_roster:get_group_explicit_users(Host, Group),
110
 
@@ -837,7 +896,14 @@ shared_roster_group(Host, Group, Query, Lang) ->
 
110
@@ -838,7 +897,14 @@
111
111
                "@all@\n";
112
112
            true ->
113
113
                []
123
123
     FDisplayedGroups = [[DG, $\n] || DG <- DisplayedGroups],
124
124
     DescNL = length(element(2, regexp:split(Description, "\n"))),
125
125
     FGroup =
126
 
@@ -921,6 +987,8 @@ shared_roster_group_parse_query(Host, Group, Query) ->
 
126
@@ -922,6 +988,8 @@
127
127
                          case SJID of
128
128
                              "@all@" ->
129
129
                                  USs;
132
132
                              _ ->
133
133
                                  case jlib:string_to_jid(SJID) of
134
134
                                      JID when is_record(JID, jid) ->
135
 
@@ -935,10 +1003,17 @@ shared_roster_group_parse_query(Host, Group, Query) ->
 
135
@@ -936,10 +1004,17 @@
136
136
                    true -> [{all_users, true}];
137
137
                    false -> []
138
138
                end,