gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.24, 1.25

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv25082

Modified Files:
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
Update combined patch.

Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- horde-webmail-1.2.0_kolab_openpkg.patch	7 Feb 2009 16:40:53 -0000	1.24
+++ horde-webmail-1.2.0_kolab_openpkg.patch	9 Feb 2009 10:02:26 -0000	1.25
@@ -14937,19 +14937,20 @@
 Signed-off-by: Gunnar Wrobel <p at rdus.de>
 
 ---
- horde-webmail/config/conf.php            |  118 ++++++++++++++
+ horde-webmail/.gitignore                 |    2 +
+ horde-webmail/config/conf.php            |  116 ++++++++++++++
  horde-webmail/config/hooks.php           |   52 +++----
- horde-webmail/config/kolab.php           |   37 +++++
+ horde-webmail/config/kolab.php           |   40 +++++
  horde-webmail/config/prefs.php           |    4 +-
  horde-webmail/config/registry.php        |    2 +-
[...2560 lines suppressed...]
++            $html .= '<div>' . _createMEntry(_("Accept and update in my calendar"), 'kronolith.png', 'ctx_itippopdown_accept_import', '', true, 'kronolith') . '</div>';
++            $html .= '<div>' . _createMEntry(_("Update in my calendar"), 'kronolith.png', 'ctx_itippopdown_import', '', true, 'kronolith') . '</div>';
++            $html .= '<div>' . _createMEntry(_("Accept request"), 'kronolith.png', 'ctx_itippopdown_accept', '', true, 'kronolith') . '</div>';
++            $html .= '<div>' . _createMEntry(_("Tentatively Accept request"), 'kronolith.png', 'ctx_itippopdown_tentative', '', true, 'kronolith') . '</div>';
++            $html .= '<div>' . _createMEntry(_("Deny request"), 'kronolith.png', 'ctx_itippopdown_deny', '', true, 'kronolith') . '</div>';
++            $html .= '</div>';
++
++            if ($this->_msgs) {
++                global $notification;
++                foreach ($this->_msgs[$id] as $msg) {
++                    $notification->push($msg[1], 'horde.' . $msg[0]);
++                }
++            }
++        }
++
+         $html .= '<h2 class="header">' . $desc . '</h2>';
+ 
+         if ($this->_msgs) {
+-- 
+tg: (12a42ba..) t/dimp/HK/GW/ItipHandling (depends on: master t/dimp/H/MS/FixBrokenFolderImages)