14 files changed, 240 insertions, 121 deletions

diff --git a/net/gabber/Makefile b/net/gabber/Makefile
index b0225e30ef9d..27a509c1a3d2 100644
--- a/net/gabber/Makefile
+++ b/net/gabber/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gabber
-PORTVERSION=	0.7.0
-PORTREVISION=	2
+PORTVERSION=	0.8.1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +16,8 @@ MAINTAINER=	erich@tacni.net
 LIB_DEPENDS=	gtkmm.1:${PORTSDIR}/x11-toolkits/gtk-- \
 		gnomemm.3:${PORTSDIR}/x11-toolkits/gnome-- \
 		sigc.1:${PORTSDIR}/devel/libsigc++ \
-		gnet.0:${PORTSDIR}/net/gnet \
+		gal.3:${PORTSDIR}/x11-toolkits/gal \
+		giconv.2:${PORTSDIR}/converters/libiconv \
 		glade.4:${PORTSDIR}/devel/libglade
 
 USE_X_PREFIX=	yes
@@ -29,7 +29,7 @@ CONFIGURE_ENV+=	GNOME_LIBCONFIG_PATH="${LOCALBASE}/lib:${X11BASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-pre-patch:
+post-patch:
 	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
diff --git a/net/gabber/distinfo b/net/gabber/distinfo
index 04411b80ecaa..a3f5bcc745ea 100644
--- a/net/gabber/distinfo
+++ b/net/gabber/distinfo
@@ -1 +1 @@
-MD5 (gabber-0.7.0.tar.gz) = 0446b9692de1203515bf3c498c1eb899
+MD5 (gabber-0.8.1.tar.gz) = a0f5d038665cd244b891d998c15791c0
diff --git a/net/gabber/files/patch-aa b/net/gabber/files/patch-aa
deleted file mode 100644
index 68cb7306f123..000000000000
--- a/net/gabber/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- jabberoo/src/sha.c.orig    Wed Jun 21 22:38:30 2000
-+++ jabberoo/src/sha.c Wed Jun 21 22:39:14 2000
-@@ -45,7 +45,7 @@
- #include <sys/stat.h>
- #ifndef WIN32
- #include <unistd.h>
--#include <endian.h>
-+#include <machine/endian.h>
- #define INT64 long long
- #else
- #include <string.h>
diff --git a/net/gabber/files/patch-ac b/net/gabber/files/patch-ac
deleted file mode 100644
index 753083b3e863..000000000000
--- a/net/gabber/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Fri Jun 30 09:25:00 2000
-+++ src/Makefile.in	Fri Jun 30 09:25:25 2000
-@@ -141,7 +141,7 @@
- 
- EXTRA_DIST = Gabber.hh GladeHelper.hh gabber.glade GabberGladeStrings.c GabberConfig.hh
- 
--CXXFLAGS = -g -O2
-+CXXFLAGS = @CXXFLAGS@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES =  GabberConfig.hh
diff --git a/net/gabber/files/patch-ae b/net/gabber/files/patch-ae
index 83489ba9b475..850bd445eed4 100644
--- a/net/gabber/files/patch-ae
+++ b/net/gabber/files/patch-ae
@@ -1,14 +1,15 @@
---- src/GabberConfig.hh.in.orig Sat Jul 29 23:08:26 2000
-+++ src/GabberConfig.hh.in      Fri Nov 17 18:40:15 2000
-@@ -5,8 +5,8 @@
- 
+--- src/GabberConfig.hh.in.orig        Thu Jan 18 12:28:59 2001
++++ src/GabberConfig.hh.in     Thu Jan 18 12:30:07 2001
+@@ -3,9 +3,9 @@
+ #include <config.h>
  static const char* GABBER_PACKAGE   = PACKAGE;
  static const char* GABBER_VERSION   = VERSION;
 -static const char* GABBER_GLADEFILE = "@prefix@/share/gabber/gabber.glade";
+-static const char* GABBER_SHAREDIR  = "@prefix@/share/gabber/";
 +static const char* GABBER_GLADEFILE = "@prefix@/share/gnome/gabber/gabber.glade";
++static const char* GABBER_SHAREDIR  = "@prefix@/share/gnome/gabber/";
  static const char* GABBER_CONFIG    = "/Gabber/";
 -static const char* GABBER_PIXPATH   = "@prefix@/share/pixmaps/gabber/";
 +static const char* GABBER_PIXPATH   = "@datadir@/pixmaps/gabber/";
- 
--#endif
-+#endif
+ static const char* GABBER_CSSFILE   = "@prefix@/share/gabber/gabber-logs.css";
+ #endif
diff --git a/net/gabber/files/patch-ag b/net/gabber/files/patch-ag
deleted file mode 100644
index 122152059342..000000000000
--- a/net/gabber/files/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
---- jabberoo/test/jidtest.cc.orig	Thu Aug 17 16:31:50 2000
-+++ jabberoo/test/jidtest.cc	Thu Aug 17 16:32:35 2000
-@@ -4,7 +4,7 @@
- #include <iostream>
- using namespace std;
- 
--void main(int argc, char** argv)
-+int main(int argc, char** argv)
- {
-      string jid = "user@host.com/resource";
-      cerr << "JID: " << jid << endl
-@@ -20,4 +20,5 @@
- 	  << "2: " << jid2 << "\t" << JID::getHost(jid2) << endl
- 	  << "3: " << jid3 << "\t" << JID::getHost(jid3) << endl
- 	  << "4: " << jid4 << "\t" << JID::getHost(jid4) << endl;
-+     return 0;
- }
diff --git a/net/gabber/files/patch-ah b/net/gabber/files/patch-ah
deleted file mode 100644
index 592f013846b8..000000000000
--- a/net/gabber/files/patch-ah
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/RegistrationWin.cc.orig	Sat Jul 29 23:08:27 2000
-+++ src/RegistrationWin.cc	Tue Sep 12 13:32:24 2000
-@@ -86,4 +86,4 @@
- 
--     append_button_with_pixmap(_("Ok"), GNOME_STOCK_BUTTON_OK);
--     append_button_with_pixmap(_("Cancel"), GNOME_STOCK_BUTTON_CANCEL);
-+     append_button(_("Ok"), GNOME_STOCK_BUTTON_OK);
-+     append_button(_("Cancel"), GNOME_STOCK_BUTTON_CANCEL);
-      
diff --git a/net/gabber/files/patch-aj b/net/gabber/files/patch-aj
new file mode 100644
index 000000000000..4d3bae2d00af
--- /dev/null
+++ b/net/gabber/files/patch-aj
@@ -0,0 +1,68 @@
+--- configure.in.orig	Thu Jan 18 08:22:50 2001
++++ configure.in	Mon Jan 29 23:48:54 2001
+@@ -70,15 +70,15 @@
+ save_CFLAGS="$CFLAGS"
+ save_LDFLAGS="$LDFLAGS"
+ CFLAGS="$CFLAGS $ICONV_CFLAGS"
+-LDFLAGS="$LDFLAGS $ICONV_LIBS -liconv"
+-AC_CACHE_CHECK(for iconv in -liconv, ac_cv_libiconv, AC_TRY_LINK([
+-#include <iconv.h>
++LDFLAGS="$LDFLAGS $ICONV_LIBS -lgiconv"
++AC_CACHE_CHECK(for iconv in -lgiconv, ac_cv_libiconv, AC_TRY_LINK([
++#include <giconv.h>
+ ], [
+ 	iconv_t cd;
+ 	cd = iconv_open ("UTF-8", "ISO-8859-1");
+ ], ac_cv_libiconv=yes, ac_cv_libiconv=no))
+ if test $ac_cv_libiconv = yes; then
+-	ICONV_LIBS="$ICONV_LIBS -liconv"
++	ICONV_LIBS="$ICONV_LIBS -lgiconv"
+ 	have_iconv=yes
+ else
+ 	CFLAGS="$save_CFLAGS"
+@@ -91,7 +91,7 @@
+ 		AC_CHECK_FUNCS(gnu_get_libc_version)
+ 	fi
+ 	AC_CACHE_CHECK([if iconv() handles UTF-8], ac_cv_libiconv_utf8, AC_TRY_RUN([
+-#include <iconv.h>
++#include <giconv.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #ifdef HAVE_GNU_GET_LIBC_VERSION
+@@ -151,22 +151,22 @@
+ dnl ******************************
+ dnl Gnome App Lib checking
+ dnl ******************************
+-dnl AC_MSG_CHECKING(for Gnome App libraries (GAL) >= 0.3)
+-dnl if $GNOME_CONFIG --libs gal > /dev/null 2>&1; then 
+-dnl    vers=`$GNOME_CONFIG --modversion gal | sed -e "s/gal-//" -e 's/cvs$//' -e 's/pre$//' | \
+-dnl        awk 'BEGIN { FS = "."; } { print $1 * 1000000 + $2 * 10000 + $3 * 100 + $4;}'`
+-dnl    if test "$vers" -ge 30000; then
+-dnl        AC_MSG_RESULT(found)
+-dnl    else
+-dnl        AC_MSG_ERROR(You need at least GNOME Application Lib (GAL) 0.3)
+-dnl    fi
+-dnl else
+-dnl    AC_MSG_ERROR(Did not find GnomeAppLib (GAL) installed)
+-dnl fi
++AC_MSG_CHECKING(for Gnome App libraries (GAL) >= 0.3)
++if $GNOME_CONFIG --libs gal > /dev/null 2>&1; then 
++   vers=`$GNOME_CONFIG --modversion gal | sed -e "s/gal-//" -e 's/cvs$//' -e 's/pre$//' | \
++       awk 'BEGIN { FS = "."; } { print $1 * 1000000 + $2 * 10000 + $3 * 100 + $4;}'`
++   if test "$vers" -ge 30000; then
++       AC_MSG_RESULT(found)
++   else
++       AC_MSG_ERROR(You need at least GNOME Application Lib (GAL) 0.3)
++   fi
++else
++   AC_MSG_ERROR(Did not find GnomeAppLib (GAL) installed)
++fi
+ 
+ dnl add 'gal' to both of these if you want gal dependency
+-EXTRA_GNOME_LIBS="`$GNOME_CONFIG --libs libglade gnomeui` $ICONV_LIBS $UNICODE_LIBS"
+-EXTRA_GNOME_CFLAGS="`$GNOME_CONFIG --cflags libglade` $ICONV_CFLAGS $UNICODE_CFLAGS"
++EXTRA_GNOME_LIBS="`$GNOME_CONFIG --libs libglade gnomeui gal` $ICONV_LIBS $UNICODE_LIBS"
++EXTRA_GNOME_CFLAGS="`$GNOME_CONFIG --cflags libglade gal` $ICONV_CFLAGS $UNICODE_CFLAGS"
+ 
+ AC_SUBST(EXTRA_GNOME_LIBS)
+ AC_SUBST(EXTRA_GNOME_CFLAGS)
diff --git a/net/gabber/files/patch-ak b/net/gabber/files/patch-ak
new file mode 100644
index 000000000000..6edc8c35475d
--- /dev/null
+++ b/net/gabber/files/patch-ak
@@ -0,0 +1,11 @@
+--- src/GabberUtility.cc.orig  Thu Jan 18 12:39:58 2001
++++ src/GabberUtility.cc       Thu Jan 18 12:40:12 2001
+@@ -1,7 +1,7 @@
+   
+ #include "GabberUtility.hh"
+ #include "Gabber.hh"
+-#include "e-unicode.h"
++#include <gal/widgets/e-unicode.h>
+
+ using namespace jabberoo;
+
diff --git a/net/gabber/files/patch-al b/net/gabber/files/patch-al
new file mode 100644
index 000000000000..ee8e5d30071f
--- /dev/null
+++ b/net/gabber/files/patch-al
@@ -0,0 +1,42 @@
+--- configure.orig	Thu Jan 18 08:27:41 2001
++++ configure	Mon Jan 29 23:54:52 2001
+@@ -4900,9 +4900,9 @@
+ save_CFLAGS="$CFLAGS"
+ save_LDFLAGS="$LDFLAGS"
+ CFLAGS="$CFLAGS $ICONV_CFLAGS"
+-LDFLAGS="$LDFLAGS $ICONV_LIBS -liconv"
+-echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
+-echo "configure:4906: checking for iconv in -liconv" >&5
++LDFLAGS="$LDFLAGS $ICONV_LIBS -lgiconv"
++echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6
++echo "configure:4906: checking for iconv in -lgiconv" >&5
+ if eval "test \"`echo '$''{'ac_cv_libiconv'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4910,7 +4910,7 @@
+ #line 4911 "configure"
+ #include "confdefs.h"
+ 
+-#include <iconv.h>
++#include <giconv.h>
+ 
+ int main() {
+ 
+@@ -4933,7 +4933,7 @@
+ 
+ echo "$ac_t""$ac_cv_libiconv" 1>&6
+ if test $ac_cv_libiconv = yes; then
+-	ICONV_LIBS="$ICONV_LIBS -liconv"
++	ICONV_LIBS="$ICONV_LIBS -lgiconv"
+ 	have_iconv=yes
+ else
+ 	CFLAGS="$save_CFLAGS"
+@@ -5059,7 +5059,7 @@
+ #line 5060 "configure"
+ #include "confdefs.h"
+ 
+-#include <iconv.h>
++#include <giconv.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #ifdef HAVE_GNU_GET_LIBC_VERSION
diff --git a/net/gabber/files/patch-am b/net/gabber/files/patch-am
new file mode 100644
index 000000000000..2aef3a0a4ea5
--- /dev/null
+++ b/net/gabber/files/patch-am
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Thu Jan 18 08:32:41 2001
++++ src/Makefile.in	Mon Jan 29 23:59:01 2001
+@@ -148,7 +148,7 @@
+ gabber_SOURCES = main.cc           xtext.h xtext.c 	  e-cache.h e-cache.c 	  e-font.h e-font.c 	  e-unicode.h e-unicode.c           TCPTransmitter.hh TCPTransmitter.cc           GabberLogger.hh GabberLogger.cc           GabberUtility.hh GabberUtility.cc           ConfigManager.hh ConfigManager.cc           GabberApp.hh GabberApp.cc           BaseGabberWindow.hh BaseGabberWindow.cc           GabberWin.hh GabberWin.cc           ChatView.hh ChatView.cc           RosterView.hh RosterView.cc           LoginDlg.hh LoginDlg.cc           SubscriptionRequestDlg.hh SubscriptionRequestDlg.cc           PrefsWin.hh PrefsWin.cc           GCJoinDlg.hh GCJoinDlg.cc           EditUserDlg.hh EditUserDlg.cc           EasyOptionMenu.hh EasyOptionMenu.cc           StatusDlg.hh StatusDlg.cc           AddToGroupDlg.hh AddToGroupDlg.cc           AddUserDruid.hh AddUserDruid.cc           WelcomeDruid.hh WelcomeDruid.cc 	  UserInfoWin.hh UserInfoWin.cc 	  StatusDock.hh StatusDock.cc 	  RawXML.hh RawXML.cc 	  HistoryDlg.hh HistoryDlg.cc           TransInfoDlg.hh TransInfoDlg.cc           AgentInterface.hh AgentInterface.cc           FilterInterface.hh FilterInterface.cc 	  EditGroupsDlg.hh EditGroupsDlg.cc           MessageManager.hh MessageManager.cc           MessageViews.hh MessageViews.cc 	  GPGInterface.hh GPGInterface.cc 	  GabberGPG.hh GabberGPG.cc 	  $(ssl_sources)
+ 
+ 
+-gabber_LDADD = @EXTRA_GNOME_LIBS@ @GNOMEMM_LIBS@ @SSL_LIBS@                ../jabberoo/src/libjabberoo.a                ../jabberoo/expat/libexpat.a                -lxml
++gabber_LDADD = @EXTRA_GNOME_LIBS@ @GNOMEMM_LIBS@ @SSL_LIBS@                ../jabberoo/src/libjabberoo.a                ../jabberoo/expat/libexpat.a			 -lxml -liconv 
+ 
+ gabber_LDFLAGS = @GABBER_STATIC@
+ 
diff --git a/net/gabber/files/patch-an b/net/gabber/files/patch-an
new file mode 100644
index 000000000000..33ceba08d1e4
--- /dev/null
+++ b/net/gabber/files/patch-an
@@ -0,0 +1,11 @@
+--- src/TCPTransmitter.cc.orig Thu Jan 18 15:08:39 2001
++++ src/TCPTransmitter.cc      Thu Jan 18 15:09:13 2001
+@@ -33,6 +33,8 @@
+ #include <string.h>
+ #include <sys/wait.h>
+
++#define TRANSMITTER_DEBUG
++
+ using namespace std;
+
+
diff --git a/net/gabber/files/patch-ao b/net/gabber/files/patch-ao
new file mode 100644
index 000000000000..673ba27ee2c3
--- /dev/null
+++ b/net/gabber/files/patch-ao
@@ -0,0 +1,11 @@
+--- jabberoo/src/Makefile.in.orig	Tue Jan 30 02:10:13 2001
++++ jabberoo/src/Makefile.in	Tue Jan 30 02:10:32 2001
+@@ -74,7 +74,7 @@
+ libjabberoo_a_LIBS = ../expat/libexpat.a @SIGC_LIBS@ 
+ INCLUDES = -I../include @SIGC_CFLAGS@
+ 
+-CXXFLAGS = -O2
++#CXXFLAGS = -O2
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_CLEAN_FILES = 
+ LIBRARIES =  $(noinst_LIBRARIES)
diff --git a/net/gabber/pkg-plist b/net/gabber/pkg-plist
index 6490e1ac00d2..6af8f7bfe356 100644
--- a/net/gabber/pkg-plist
+++ b/net/gabber/pkg-plist
@@ -1,48 +1,62 @@
 bin/gabber
-share/gnome/apps/Internet/gabber.desktop
+etc/sound/events/gabber.soundlist
+share/locale/da/LC_MESSAGES/gabber.mo
+share/locale/de/LC_MESSAGES/gabber.mo
+share/locale/fr/LC_MESSAGES/gabber.mo
+share/locale/ru/LC_MESSAGES/gabber.mo
 share/gnome/gabber/gabber.glade
-share/gnome/gabber/glade-delete-user-menu.xpm
-share/gnome/gabber/glade-delete-user.xpm
-share/gnome/gabber/glade-edit-user-menu.xpm
-share/gnome/gabber/glade-edit-user.xpm
+share/gnome/gabber/gabber-logs.css
 share/gnome/gabber/glade-gabber-logo.png
 share/gnome/gabber/glade-message.xpm
-share/gnome/gabber/glade-new-user-menu.xpm
-share/gnome/gabber/glade-new-user.xpm
-share/gnome/gabber/glade-noclose.xpm
 share/gnome/gabber/glade-ooochat.xpm
+share/gnome/gabber/glade-blank.xpm
 share/gnome/gabber/glade-s10n.xpm
-share/gnome/gabber/glade-sendasooo.xpm
+share/gnome/gabber/glade-new-user.xpm   
+share/gnome/gabber/glade-new-user-menu.xpm
+share/gnome/gabber/glade-edit-user.xpm
+share/gnome/gabber/glade-edit-user-menu.xpm
+share/gnome/gabber/glade-edit-group-menu.xpm
+share/gnome/gabber/glade-delete-user.xpm
+share/gnome/gabber/glade-delete-user-menu.xpm
+share/gnome/gabber/glade-groupchat.xpm
+share/gnome/gabber/glade-groupchat-menu.xpm
 share/gnome/gabber/glade-users.xpm
-share/gnome/help/gabber/C/agents-available.png
-share/gnome/help/gabber/C/agents-register.png
-share/gnome/help/gabber/C/agents.html
-share/gnome/help/gabber/C/authors.html
-share/gnome/help/gabber/C/bugs.html
-share/gnome/help/gabber/C/docbook.css
-share/gnome/help/gabber/C/first.html
-share/gnome/help/gabber/C/first.png
-share/gnome/help/gabber/C/gabber.sgml
+share/gnome/gabber/glade-sendasooo.xpm
+share/gnome/gabber/glade-sendasnormal.xpm
+share/gnome/gabber/glade-noclose.xpm   
+share/gnome/gabber/glade-gabber-sideways.png
+share/gnome/gabber/gpg-encrypted.xpm
+share/gnome/gabber/gpg-unencrypted.xpm
+share/gnome/gabber/gpg-signed.xpm
+share/gnome/gabber/gpg-badsigned.xpm
+share/gnome/gabber/gpg-unsigned.xpm
+share/gnome/gabber/glade-alert.xpm
+share/gnome/gabber/glade-unlock-key.xpm
+share/gnome/pixmaps/gabber.png
+share/gnome/pixmaps/gabber/away.xpm
+share/gnome/pixmaps/gabber/chat.xpm
+share/gnome/pixmaps/gabber/dnd.xpm      
+share/gnome/pixmaps/gabber/offline.xpm
+share/gnome/pixmaps/gabber/online.xpm
+share/gnome/pixmaps/gabber/stalker.xpm
+share/gnome/pixmaps/gabber/xa.xpm   
+share/gnome/pixmaps/gabber/gnome-gabber.xpm
+share/gnome/pixmaps/gabber/gnome-message.xpm
+share/gnome/pixmaps/gabber/gnome-ooochat.xpm
+share/gnome/pixmaps/gabber/gnome-s10n.xpm
+share/gnome/sounds/Gabber/gabber_message_queue.wav
+share/gnome/sounds/Gabber/gabber_message_recv.wav
+share/gnome/sounds/Gabber/gabber_ooochat_queue.wav
+share/gnome/sounds/Gabber/gabber_ooochat_recv.wav
+share/gnome/sounds/Gabber/gabber_online.wav
+share/gnome/sounds/Gabber/gabber_offline.wav
+share/gnome/sounds/Gabber/gabber_encrypted.wav
+share/gnome/sounds/Gabber/gabber_subrequest.wav
+share/gnome/sounds/Gabber/gabber_startup.wav
+share/gnome/sounds/Gabber/gabber_connected.wav
 share/gnome/help/gabber/C/index.html
-share/gnome/help/gabber/C/license.html
-share/gnome/help/gabber/C/ln7.html
-share/gnome/help/gabber/C/login.html
-share/gnome/help/gabber/C/login.png
-share/gnome/help/gabber/C/main-status-roster.png
-share/gnome/help/gabber/C/main-status-user-dialog.png
-share/gnome/help/gabber/C/main-status-user-show.png
-share/gnome/help/gabber/C/main-toolbar.png
-share/gnome/help/gabber/C/main.html
-share/gnome/help/gabber/C/main.png
-share/gnome/help/gabber/C/mainshot.png
-share/gnome/help/gabber/C/msg-gc-join.png
-share/gnome/help/gabber/C/msg-gc-main.png
-share/gnome/help/gabber/C/msg-normal-reply.png
-share/gnome/help/gabber/C/msg-normal.png
-share/gnome/help/gabber/C/msg-ooo.png
-share/gnome/help/gabber/C/msg.html
-share/gnome/help/gabber/C/panel.html
-share/gnome/help/gabber/C/pref.html
+share/gnome/help/gabber/C/topic.dat
+share/gnome/help/gabber/C/gabber.sgml
 share/gnome/help/gabber/C/stylesheet-images/caution.gif
 share/gnome/help/gabber/C/stylesheet-images/home.gif
 share/gnome/help/gabber/C/stylesheet-images/important.gif
@@ -55,33 +69,31 @@ share/gnome/help/gabber/C/stylesheet-images/toc-minus.gif
 share/gnome/help/gabber/C/stylesheet-images/toc-plus.gif
 share/gnome/help/gabber/C/stylesheet-images/up.gif
 share/gnome/help/gabber/C/stylesheet-images/warning.gif
-share/gnome/help/gabber/C/topic.dat
-share/gnome/help/gabber/C/userinfo-general.png
-share/gnome/help/gabber/C/userinfo-jud.png
+share/gnome/help/gabber/C/agents.html 
+share/gnome/help/gabber/C/authors.html   
+share/gnome/help/gabber/C/bugs.html
+share/gnome/help/gabber/C/first.html
+share/gnome/help/gabber/C/license.html     
+share/gnome/help/gabber/C/ln7.html   
+share/gnome/help/gabber/C/login.html
+share/gnome/help/gabber/C/main.html
+share/gnome/help/gabber/C/msg.html
+share/gnome/help/gabber/C/panel.html
+share/gnome/help/gabber/C/pref.html
 share/gnome/help/gabber/C/userinfo.html
-share/gnome/help/gabber/C/users-adduser.png
-share/gnome/help/gabber/C/users-edituser-client.png
-share/gnome/help/gabber/C/users-edituser-groups-add.png
-share/gnome/help/gabber/C/users-edituser-groups.png
-share/gnome/help/gabber/C/users-edituser-info.png
-share/gnome/help/gabber/C/users-edituser-s10n.png
-share/gnome/help/gabber/C/users-subscriptionrequest.png
 share/gnome/help/gabber/C/users.html
-share/gnome/pixmaps/gabber.png
-share/gnome/pixmaps/gabber/away.xpm
-share/gnome/pixmaps/gabber/chat.xpm
-share/gnome/pixmaps/gabber/dnd.xpm
-share/gnome/pixmaps/gabber/gnome-gabber.xpm
-share/gnome/pixmaps/gabber/gnome-message.xpm
-share/gnome/pixmaps/gabber/gnome-ooochat.xpm
-share/gnome/pixmaps/gabber/gnome-s10n.xpm
-share/gnome/pixmaps/gabber/offline.xpm
-share/gnome/pixmaps/gabber/online.xpm
-share/gnome/pixmaps/gabber/stalker.xpm
-share/gnome/pixmaps/gabber/xa.xpm
-share/locale/en_SE/LC_MESSAGES/gabber.mo
+share/gnome/help/gabber/C/docbook.css
+share/gnome/help/gabber/C/first.png
+share/gnome/help/gabber/C/login.png
+share/gnome/help/gabber/C/main.png
+share/gnome/help/gabber/C/msg-normal.png    
+share/gnome/help/gabber/C/msg-ooo.png
+share/gnome/apps/Internet/gabber.desktop
+@unexec rmdir %D/etc/sound/events 2>/dev/null || true
+@unexec rmdir %D/etc/sound 2>/dev/null || true
+@dirrm share/gnome/gabber
 @dirrm share/gnome/pixmaps/gabber
+@dirrm share/gnome/sounds/Gabber
 @dirrm share/gnome/help/gabber/C/stylesheet-images
 @dirrm share/gnome/help/gabber/C
 @dirrm share/gnome/help/gabber
-@dirrm share/gnome/gabber