Remove unmaintained expired ports from net-im

2011-05-01 net-im/aim: Upstream disapear and distfile is no more available
2011-05-01 net-im/jit: Upstream disapear and distfile is no more available
2011-05-01 net-im/kf: Upstream disapear and distfile is no more available
This commit is contained in:
Baptiste Daroussin 2011-05-02 06:09:00 +00:00
parent 4681ca0af3
commit f1b39d2709
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=273445
27 changed files with 3 additions and 877 deletions

3
MOVED
View file

@ -1933,3 +1933,6 @@ net-mgmt/knowlan||2011-05-02|Has expired: Upstream disapear and distfile is no m
net-mgmt/p5-Altoids||2011-05-02|Has expired: Upstream disapear and distfile is no more available
net-mgmt/pktstat||2011-05-02|Has expired: Upstream disapear and distfile is no more available
net-mgmt/scotty3||2011-05-02|Has expired: Upstream disapear and distfile is no more available
net-im/aim||2011-05-02|Has expired: Upstream disapear and distfile is no more available
net-im/jit||2011-05-02|Has expired: Upstream disapear and distfile is no more available
net-im/kf||2011-05-02|Has expired: Upstream disapear and distfile is no more available

View file

@ -3,7 +3,6 @@
COMMENT = Instant messaging
SUBDIR += aim
SUBDIR += amsn
SUBDIR += ari-yahoo
SUBDIR += ayttm
@ -60,9 +59,7 @@
SUBDIR += jabberd
SUBDIR += jarl
SUBDIR += jggtrans
SUBDIR += jit
SUBDIR += jwchat
SUBDIR += kf
SUBDIR += kmerlin
SUBDIR += kmess
SUBDIR += kmess-kde4

View file

@ -1,50 +0,0 @@
# New ports collection makefile for: aim
# Date created: Sat Jan 13 12:40:20 GMT 2001
# Whom: Roger Hardiman <roger@freebsd.org>
#
# $FreeBSD$
#
PORTNAME= aim
PORTVERSION= 1.5.286
PORTREVISION= 4
CATEGORIES= net-im linux
MASTER_SITES= ftp://ftp.newaol.com/aimgen/380469/
DISTNAME= aim-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= AOL's Instant Messenger (AIM) client
DEPRECATED= Upstream disapear and distfile is no more available
EXPIRATION_DATE= 2011-05-01
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX= yes
USE_LINUX_APPS= gtk xorglibs
NO_WRKSUBDIR= yes
NO_BUILD= yes
USE_LDCONFIG= yes
USE_LINUX_PREFIX= yes
PLIST_SUB= LINUXBASE=${LINUXBASE}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/usr/bin/aim ${LINUXBASE}/usr/bin
${BRANDELF} -t Linux ${LINUXBASE}/usr/bin/aim
(cd ${WRKSRC}/usr/lib;exec ${TAR} --exclude aim/source -cf - *)|(cd ${LINUXBASE}/usr/lib;exec ${TAR} -xpf -)
@${ECHO_CMD} "#!/bin/sh" >${PREFIX}/bin/aim
@${ECHO_CMD} "ulimit -Sc 0" >>${PREFIX}/bin/aim
@${ECHO_CMD} -n "exec ${LINUXBASE}/usr/bin/aim" >>${PREFIX}/bin/aim
@${ECHO_CMD} ' "$$@"' >>${PREFIX}/bin/aim
${CHMOD} ${BINMODE} ${PREFIX}/bin/aim
.include <bsd.port.pre.mk>
post-install:
.if !exists(${LINUXBASE}/usr/bin/esdplay) && !exists(${LOCALBASE}/bin/esdplay)
@${ECHO_MSG} "-----------------------------------------------------------------"
@${ECHO_MSG} "Install audio/linux-esound or disable Sounds in aim's Preferences"
@${ECHO_MSG} "-----------------------------------------------------------------"
.endif
.include <bsd.port.post.mk>

View file

@ -1,2 +0,0 @@
SHA256 (aim-1.5.286.tgz) = 6efd45f32eebfd9bbcbd6eac3aca7723552a5198250b87a252f3b658cb5e18ba
SIZE (aim-1.5.286.tgz) = 1118089

View file

@ -1,12 +0,0 @@
AIM is the AOL Instant Messenger.
The AOL Instant Messenger is used to see which of your friends (buddies),
family or co-workers are logged on to the Internet (and registered with AIM)
at the current time.
You can then send messages and chat directly with these people.
This port consists of AOL's Linux AIM client which runs on FreeBSD using the
linux emulation system.
WWW: http://www.aim.aol.com/

View file

@ -1,136 +0,0 @@
bin/aim
@cwd %%LINUXBASE%%/usr
bin/aim
lib/libXpcs.so
lib/libXpcs.so.1
lib/libXprt.so
lib/libXprt.so.1
lib/libXptl.so
lib/libXptl.so.1
lib/libextgtk.so
lib/libextgtk.so.1
lib/aim/CoolBos.so
lib/aim/CoolBos.so.1
lib/aim/CoolBucky.so
lib/aim/CoolBucky.so.1
lib/aim/CoolHttp.so
lib/aim/CoolHttp.so.1
lib/aim/CoolPeer.so
lib/aim/CoolPeer.so.1
lib/aim/CoolSocket.so
lib/aim/CoolSocket.so.1
lib/aim/CoolSos.so
lib/aim/CoolSos.so.1
lib/aim/feed.so
lib/aim/feed.so.1
lib/aim/service.so
lib/aim/service.so.1
lib/aim/ui.so
lib/aim/ui.so.1
lib/aim/extra/AIM.desktop
lib/aim/extra/AOL Instant Messenger (SM).desktop
lib/aim/extra/aim.png
lib/aim/extra/aim.xpm
lib/aim/extra/install.sh
lib/aim/help/about_buddy_privacy.htm
lib/aim/help/about_the_buddy_list.htm
lib/aim/help/adding_a_group_or_buddy.htm
lib/aim/help/after_regis.htm
lib/aim/help/allowing_everyone_to_send_you_me.htm
lib/aim/help/allowing_only_your_buddies_to_se.htm
lib/aim/help/allowing_specific_users_to_conta.htm
lib/aim/help/away_message.htm
lib/aim/help/away_prefs.htm
lib/aim/help/banner.htm
lib/aim/help/banner_2.htm
lib/aim/help/blocking_everyone_from_sending_y.htm
lib/aim/help/blocking_specific_users.htm
lib/aim/help/changing_address.htm
lib/aim/help/changing_password.htm
lib/aim/help/chat.htm
lib/aim/help/chat_invite.htm
lib/aim/help/confirming_account.htm
lib/aim/help/connection_prefs.htm
lib/aim/help/defining_away.htm
lib/aim/help/deleting_a_group.htm
lib/aim/help/deleting_away.htm
lib/aim/help/format_messages.htm
lib/aim/help/fs_about_bl.htm
lib/aim/help/fs_about_buddy_privacy.htm
lib/aim/help/fs_about_the_buddy_list.htm
lib/aim/help/fs_adding_a_group_or_buddy.htm
lib/aim/help/fs_after_regis.htm
lib/aim/help/fs_allowing_only_your_buddies.htm
lib/aim/help/fs_allowing_specific_users_to_con.htm
lib/aim/help/fs_away_message.htm
lib/aim/help/fs_away_prefs.htm
lib/aim/help/fs_blocking_specific_users.htm
lib/aim/help/fs_changing_address.htm
lib/aim/help/fs_changing_password.htm
lib/aim/help/fs_chat.htm
lib/aim/help/fs_chat_invite.htm
lib/aim/help/fs_confirming_account.htm
lib/aim/help/fs_connection_prefs.htm
lib/aim/help/fs_deleting_a_group.htm
lib/aim/help/fs_everyone_from_sending.htm
lib/aim/help/fs_format_messages.htm
lib/aim/help/fs_general_prefs.htm
lib/aim/help/fs_im.htm
lib/aim/help/fs_insert_hyperlink.htm
lib/aim/help/fs_insert_smileys.htm
lib/aim/help/fs_installing.htm
lib/aim/help/fs_privacy_prefs.htm
lib/aim/help/fs_registering.htm
lib/aim/help/fs_sending_chat.htm
lib/aim/help/fs_sending_im.htm
lib/aim/help/fs_signing_on.htm
lib/aim/help/fs_sounds.htm
lib/aim/help/fs_sounds_prefs.htm
lib/aim/help/fs_turning_an_away.htm
lib/aim/help/fs_uninstalling.htm
lib/aim/help/general_prefs.htm
lib/aim/help/help_contents.htm
lib/aim/help/im.htm
lib/aim/help/im_hyperlink.htm
lib/aim/help/index.htm
lib/aim/help/insert_hyperlink.htm
lib/aim/help/insert_smileys.htm
lib/aim/help/installing.htm
lib/aim/help/inviting.htm
lib/aim/help/overview.htm
lib/aim/help/privacy_prefs.htm
lib/aim/help/registering.htm
lib/aim/help/saving_im.htm
lib/aim/help/sending_chat.htm
lib/aim/help/sending_im.htm
lib/aim/help/signing_on.htm
lib/aim/help/sounds_prefs.htm
lib/aim/help/turning_an_away.htm
lib/aim/help/uninstalling.htm
lib/aim/help/images/add_buddy.gif
lib/aim/help/images/aimheaderleft.gif
lib/aim/help/images/away.gif
lib/aim/help/images/buddyList.gif
lib/aim/help/images/chat_invite_scr.gif
lib/aim/help/images/chat_message.gif
lib/aim/help/images/chat_message2.gif
lib/aim/help/images/im.gif
lib/aim/help/images/sign_on.gif
lib/aim/sounds/cashregister.wav
lib/aim/sounds/dooropen.wav
lib/aim/sounds/doorslam.wav
lib/aim/sounds/imrcv.wav
lib/aim/sounds/imsend.wav
lib/aim/sounds/moo.wav
lib/aim/sounds/newalert.wav
lib/aim/sounds/newmail.wav
lib/aim/sounds/phone.wav
lib/aim/sounds/ring.wav
lib/aim/sounds/talkbeg.wav
lib/aim/sounds/talkend.wav
lib/aim/sounds/talkstop.wav
@dirrm lib/aim/extra
@dirrm lib/aim/help/images
@dirrm lib/aim/help
@dirrm lib/aim/sounds
@dirrm lib/aim

View file

@ -1,42 +0,0 @@
# New ports collection makefile for: jit
# Date created: 20 July 2004
# Whom: Alexander Timoshenko <gonzo@univ.kiev.ua>
#
# $FreeBSD$
#
PORTNAME= jit
PORTVERSION= 1.1.7
PORTREVISION= 1
CATEGORIES= net-im
MASTER_SITES= http://www.penza-gsm.ru/snake/xmpp/
DIST_SUBDIR= jabber
MAINTAINER= ports@FreeBSD.org
COMMENT= Jabber ICQ Transport
DEPRECATED= Upstream disapear and distfile is no more available
EXPIRATION_DATE= 2011-05-01
USE_GMAKE= yes
USE_RC_SUBR= jabber_jit.sh
HAS_CONFIGURE= yes
CFLAGS+= -fPIC
MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
post-patch:
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
${WRKSRC}/jit/jabber-icq.example
do-install:
@${MKDIR} ${PREFIX}/lib/jabber/jit
@${INSTALL_DATA} ${WRKSRC}/jit/jit.so ${PREFIX}/lib/jabber/jit
@${INSTALL_DATA} ${WRKSRC}/xdb_file/xdb_file.so ${PREFIX}/lib/jabber/jit
@${INSTALL_PROGRAM} ${WRKSRC}/jabberd/jabberd-jit ${PREFIX}/sbin/jit
@${INSTALL_DATA} ${WRKSRC}/jit/jabber-icq.example ${PREFIX}/etc
post-install:
@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>

View file

@ -1,2 +0,0 @@
SHA256 (jabber/jit-1.1.7.tar.gz) = f0cebfaea38721ce3f6aad24940ad8826a052818f3c298b903f506c27d03df31
SIZE (jabber/jit-1.1.7.tar.gz) = 277018

View file

@ -1,34 +0,0 @@
#!/bin/sh
#
# Startup script for JIT ICQ transport.
#
# $FreeBSD$
#
# PROVIDE: jabber_jit
# REQUIRE: DAEMON
# Define these jabber_jit_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
# /etc/rc.conf.d/jabber_jit
#
# jabber_jit_enable : bool
# Enable the transport ("YES") or not ("NO", the default).
#
. /etc/rc.subr
name="jabber_jit"
rcvar=`set_rcvar`
command="%%PREFIX%%/sbin/jit"
command_args="-c %%PREFIX%%/etc/jabber-icq.xml -d"
required_files="%%PREFIX%%/etc/jabber-icq.xml"
load_rc_config "$name"
: ${jabber_jit_enable="NO"}
: ${jabber_jit_user="jabber"}
run_rc_command "$1"

View file

@ -1,13 +0,0 @@
--- configure.orig Mon Apr 25 14:41:07 2005
+++ configure Mon Apr 25 14:42:05 2005
@@ -60,8 +60,8 @@
CFLAGS="$CFLAGS -I/usr/include -fPIC"
LIBS="$LIBS -ldl -lpthread";;
FreeBSD)
- CFLAGS="$CFLAGS -I/usr/local/include -I/usr/src/contrib/libstdc++ -D_THREAD_SAFE -DSUNOS"
- LIBS="$LIBS -pthread -lcompat -lc_r -L/usr/local/lib -liconv";;
+ CFLAGS="$CFLAGS -I/usr/local/include -I/usr/src/contrib/libstdc++ \${PTHREAD_CFLAGS} -DSUNOS"
+ LIBS="$LIBS \${PTHREAD_LIBS} -lcompat -L/usr/local/lib -liconv";;
OpenBSD)
CFLAGS="$CFLAGS -I/usr/local/include -I/usr/src/contrib/libstdc++ -D_THREAD_SAFE -DSUNOS"
LIBS="$LIBS -pthread -lcompat -lc_r -L/usr/local/lib -liconv";;

View file

@ -1,63 +0,0 @@
--- jit/jit/wp_client.cpp.orig 2004-11-10 18:23:27.000000000 +0000
+++ jit/jit/wp_client.cpp 2007-10-31 03:39:39.000000000 +0000
@@ -152,22 +152,31 @@
switch(ev->getReason()){
case DisconnectedEvent::FAILED_BADUSERNAME:
+ {
e = (terror){400,"Bad username"};
+ }
break;
case DisconnectedEvent::FAILED_TURBOING:
+ {
e = (terror){503,"Turboing, connect later"};
+ }
break;
case DisconnectedEvent::FAILED_BADPASSWORD:
+ {
e = (terror){400,"Bad (non mismatched) registration password"};
+ }
break;
case DisconnectedEvent::FAILED_MISMATCH_PASSWD:
+ {
e = (terror){401,"Password does not match"};
+ }
break;
case DisconnectedEvent::FAILED_DUALLOGIN: {
+ {
/* maybe we should explicitly notify due importance */
char *body=LNG_DUAL_LOGIN;
@@ -180,21 +189,28 @@
it_deliver(sesja->ti,msg);
e = (terror){409,"Dual login"};
+ }
break;
}
case DisconnectedEvent::FAILED_LOWLEVEL:
+ {
e = (terror){502,"Low level network error"};
+ }
break;
case DisconnectedEvent::REQUESTED:
+ {
log_debug(ZONE,"Disconnected on request");
e = (terror){0,""};
+ }
break;
case DisconnectedEvent::FAILED_UNKNOWN:
default:
+ {
e = (terror){502,"Disconnected by unknown reason"};
+ }
break;
}

View file

@ -1,66 +0,0 @@
--- jit/jabber-icq.example.orig Mon Jan 19 23:30:03 2004
+++ jit/jabber-icq.example Thu Feb 17 20:38:49 2005
@@ -2,20 +2,20 @@
<!-- you can add elogger and rlogger entries here if
you don't want the main Jabber server do the
- logging
+ logging -->
<log id='elogger'>
<host/>
<logtype/>
<format>%d: [%t] (%h): %s</format>
- <file>icqerror</file>
+ <file>/var/log/jabber/icqerror</file>
</log>
<log id='rlogger'>
<host/>
<logtype>record</logtype>
<format>%d %h %s</format>
- <file>icqrecord</file>
- </log> -->
+ <file>/var/log/jabber/icqrecord</file>
+ </log>
<!-- Some Jabber server implementations do not
provide XDB services (for example jabberd 2.0).
@@ -23,16 +23,16 @@
XDB requests. This is strongly recommended if
you use xdb_ldap, xdb_sql or other non-file XDB
implementations, too.
- See xdb_file directory for more information.
+ See xdb_file directory for more information. -->
<xdb id="xdb">
<host/>
<load>
- <xdb_file>xdb_file/xdb_file.so</xdb_file>
+ <xdb_file>%%PREFIX%%/lib/jabber/jit/xdb_file.so</xdb_file>
</load>
<xdb_file xmlns="jabber:config:xdb_file">
- <spool><jabberd:cmdline flag='s'>./spool</jabberd:cmdline></spool>
+ <spool><jabberd:cmdline flag='s'>/var/spool/jit</jabberd:cmdline></spool>
</xdb_file>
- </xdb> -->
+ </xdb>
<!--
localhost is your jabber host.
@@ -103,7 +103,7 @@
<session_timeout>18000</session_timeout>
<!-- Charset -->
- <charset>windows-1252</charset>
+ <charset>windows-1251</charset>
<!-- You may want to replace login.icq.com by the corresponding
IPs to speed up JIT but keep in mind the IPs may change -->
@@ -115,7 +115,7 @@
<!-- JIT module -->
<load>
- <icqtrans>jit/jit.so</icqtrans>
+ <icqtrans>%%PREFIX%%/lib/jabber/jit/jit.so</icqtrans>
</load>
</service>

View file

@ -1,19 +0,0 @@
#!/bin/sh
if [ "$2" != "POST-DEINSTALL" ]; then
exit 0
fi
USER=jabber
if pw usershow "${USER}" 2>/dev/null 1>&2; then
echo "To delete Jabber user permanently, use 'pw userdel ${USER}'"
fi
if pw groupshow "${USER}" 2>/dev/null 1>&2; then
echo "To delete Jabber group permanently, use 'pw groupdel ${USER}'"
fi
echo "If you wish to delete jit data files, remove '/var/spool/jit' directory."
exit 0

View file

@ -1,5 +0,0 @@
JIT - Jabber ICQ Transport - is a working and stable Jabber
transport which provides interoperability between ICQ and
Jabber IM systems.
WWW: http://jit.jabberstudio.org/

View file

@ -1,53 +0,0 @@
#!/bin/sh
if [ "$2" != "POST-INSTALL" ]; then
exit 0
fi
USER=jabber
GROUP=${USER}
UID=93
GID=${UID}
SPOOLDIR="/var/spool/jit"
LOGDIR="/var/log/jabber"
if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
if pw groupadd ${GROUP} -g ${GID}; then
echo "Added group \"${GROUP}\"."
else
echo "Adding group \"${GROUP}\" failed..."
exit 1
fi
fi
if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-s "/sbin/nologin" -d "/nonexistent" \
-c "Jabber Daemon"; \
then
echo "Added user \"${USER}\"."
else
echo "Adding user \"${USER}\" failed..."
exit 1
fi
fi
if [ ! -d ${SPOOLDIR} ]; then
echo "Creating \"${SPOOLDIR}\"."
mkdir -p ${SPOOLDIR}
fi
if [ ! -d ${LOGDIR} ]; then
echo "Creating \"${LOGDIR}\"."
mkdir -p ${LOGDIR}
fi
echo "Fixing ownerships and modes in \"${SPOOLDIR}\"."
chown -R ${USER}:${GROUP} ${SPOOLDIR}
chmod -R go= ${SPOOLDIR}
echo "Fixing ownerships and modes in \"${LOGDIR}\"."
chown -R ${USER}:${GROUP} ${LOGDIR}
chmod -R go= ${LOGDIR}

View file

@ -1,6 +0,0 @@
lib/jabber/jit/jit.so
lib/jabber/jit/xdb_file.so
sbin/jit
etc/jabber-icq.example
@dirrm lib/jabber/jit
@dirrmtry lib/jabber

View file

@ -1,50 +0,0 @@
# New ports collection makefile for: kf
# Date created: Tue Oct 19 01:48:30 UTC 2004
# Whom: Andrey Slusar <anray@FreeBSD.org>
#
# $FreeBSD$
#
PORTNAME= kf
PORTVERSION= 0.5.4.1
PORTREVISION= 8
CATEGORIES= net-im
MASTER_SITES= http://files.jabberstudio.org/kf/ \
http://jabberstudio.rediris.es/kf/ \
http://freebsd.unixfreunde.de/sources/
MAINTAINER= ports@FreeBSD.org
COMMENT= A simple Jabber client using the GTK+ 2.0 toolkit
DEPRECATED= Upstream disapear and distfile is no more available
EXPIRATION_DATE= 2011-05-01
LIB_DEPENDS= loudmouth-1.0:${PORTSDIR}/net-im/loudmouth
USE_XORG= x11 xscrnsaver
USE_GNOME= libglade2
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
OPTIONS=GTKSPELL "Spell checking support" on \
NLS "Native Language Support" on
.include <bsd.port.pre.mk>
.ifndef(WITHOUT_GTKSPELL)
LIB_DEPENDS+= gtkspell.0:${PORTSDIR}/textproc/gtkspell
CONFIGURE_ARGS+= --enable-gtkspell
.endif
.ifndef(WITHOUT_NLS)
USE_GETTEXT= yes
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB= NLS="@comment "
.endif
.include <bsd.port.post.mk>

View file

@ -1,2 +0,0 @@
SHA256 (kf-0.5.4.1.tar.gz) = 70068af405b4a18c84babded6a1d3fee1b87687d725c1c0456570f06c3841ef3
SIZE (kf-0.5.4.1.tar.gz) = 512040

View file

@ -1,12 +0,0 @@
--- src/archive_viewer.c.orig Sat Jan 8 18:43:37 2005
+++ src/archive_viewer.c Sat Jan 8 18:44:12 2005
@@ -340,8 +340,8 @@
return;
}
for (node = node->children; node; node = node->next) {
- foo_debug ("Reading item %s\n", node->name);
KfArchiveConversation *conversation = NULL;
+ foo_debug ("Reading item %s\n", node->name);
if (xmlStrcmp (node->name, (const xmlChar *) "item") == 0) {
GtkTreeIter iter;
xmlChar *name;

View file

@ -1,11 +0,0 @@
--- configure.old Thu Nov 24 19:50:09 2005
+++ configure Thu Nov 24 19:51:04 2005
@@ -4060,7 +4060,7 @@
MODULES="gtk+-2.0 >= 2.0.0 libglade-2.0 >= 1.110.0 loudmouth-1.0 >= 0.16"
-if test "x$enable_gtkspell" == "xyes"
+if test "x$enable_gtkspell" = "xyes"
then
succeeded=no

View file

@ -1,47 +0,0 @@
--- src/jispman.c.orig Sun Apr 10 19:03:54 2005
+++ src/jispman.c Mon Aug 28 20:11:49 2006
@@ -25,12 +25,6 @@
#include "emoticons.h"
#include "kf.h"
-struct _KfJispManager {
- GHashTable *jisps; /** A hash-table of all JISP pachages managed by this object, indexed by their filename */
- GList *patterns; /** A list of patterns */
-};
-
-
/**
* \brief create a new instance of KfJispManager
* \return a new instance of KfJispManager
@@ -162,13 +156,14 @@
**/
KfJisp *kf_jisp_manager_get_jisp_for_jid (KfJispManager *jispman, const gchar *jid)
{
+ GList *tmp;
+ KfJispPattern *pattern;
+
g_return_val_if_fail (jispman, NULL);
g_return_val_if_fail (jid, NULL);
- GList *tmp;
-
for (tmp = jispman->patterns; tmp; tmp = tmp->next) {
- KfJispPattern *pattern = tmp->data;
+ pattern = tmp->data;
if (g_pattern_match_string (pattern->gpat, jid))
return pattern->jisp;
@@ -188,10 +183,12 @@
**/
KfJispPattern *kf_jisp_pattern_new (const gchar *pattern, KfJisp *jisp)
{
+ KfJispPattern *pat;
+
g_return_val_if_fail (pattern, NULL);
g_return_val_if_fail (jisp, NULL);
- KfJispPattern *pat = g_new0 (KfJispPattern, 1);
+ pat = g_new0 (KfJispPattern, 1);
pat->pattern = g_strdup (pattern);
pat->jisp = kf_jisp_ref (jisp);
pat->gpat = g_pattern_spec_new (pattern);

View file

@ -1,11 +0,0 @@
--- src/jispman.h.orig Sun Apr 10 19:03:54 2005
+++ src/jispman.h Mon Aug 28 20:11:39 2006
@@ -25,6 +25,8 @@
#include "jisp.h"
typedef struct _KfJispManager {
+ GHashTable *jisps;
+ GList *patterns;
} KfJispManager;
/**

View file

@ -1,21 +0,0 @@
--- src/muc.c.orig Thu Nov 24 23:32:00 2005
+++ src/muc.c Thu Nov 24 23:34:10 2005
@@ -1807,13 +1807,16 @@
static void kf_muc_close (KfMUC *self) {
- GtkWidget *win = gtk_message_dialog_new (GTK_WINDOW (self->window),
+ GtkWidget *win;
+ gint response;
+
+ win = gtk_message_dialog_new (GTK_WINDOW (self->window),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_OK_CANCEL,
_("Are you sure you want to leave this conference?"));
gtk_dialog_set_default_response (GTK_DIALOG (win), GTK_RESPONSE_CANCEL);
- gint response = gtk_dialog_run (GTK_DIALOG (win));
+ response = gtk_dialog_run (GTK_DIALOG (win));
gtk_widget_destroy (win);
if (response == GTK_RESPONSE_OK)
gtk_widget_destroy (self->window);

View file

@ -1,25 +0,0 @@
--- src/muc_join.c.orig Thu Nov 24 23:39:22 2005
+++ src/muc_join.c Thu Nov 24 23:40:29 2005
@@ -294,6 +294,9 @@
GtkTreeIter iter;
GtkTreeModel *model;
gint n_selected;
+ GList *list;
+ GtkTreePath *path;
+ KfPrefMUCBookmark *bookmark;
n_selected = gtk_tree_selection_count_selected_rows (selection);
self->multiple = (n_selected > 1);
@@ -303,10 +306,9 @@
if (n_selected == 1) {
// if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
- GList *list = gtk_tree_selection_get_selected_rows (selection, &model);
- GtkTreePath *path = list->data;
+ list = gtk_tree_selection_get_selected_rows (selection, &model);
+ path = list->data;
gtk_tree_model_get_iter (model, &iter, path);
- KfPrefMUCBookmark *bookmark;
gtk_tree_model_get (model, &iter, 0, &bookmark, -1);
if (bookmark->server)

View file

@ -1,58 +0,0 @@
--- src/settings_icons.c.orig Thu Nov 24 23:44:55 2005
+++ src/settings_icons.c Thu Nov 24 23:47:11 2005
@@ -53,6 +53,7 @@
GtkCellRenderer *renderer;
GtkTreeViewColumn *column;
GtkTreeSelection *select;
+ GtkTreeIter iter;
tv = glade_xml_get_widget (glade, "icons_treeview");
if ((model = gtk_tree_view_get_model (GTK_TREE_VIEW (tv)))) {
@@ -98,7 +99,6 @@
foo_debug ("evil things happen!\n");
}
- GtkTreeIter iter;
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter,
0, _("Default icon set"),
@@ -152,6 +152,10 @@
static void install_cb (GtkWidget *button, GtkListStore *store) {
GtkWidget *win;
gint response;
+ GtkFileFilter *filter;
+ gchar *filename;
+ KfJisp *jisp;
+ GtkTreeIter iter;
#if GTK_CHECK_VERSION(2,4,0)
win = gtk_file_chooser_dialog_new (_("Select icon set file to open"),
@@ -160,7 +164,7 @@
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_OK,
NULL);
- GtkFileFilter *filter = gtk_file_filter_new ();
+ filter = gtk_file_filter_new ();
gtk_file_filter_set_name (filter, _("Jabber icon sets"));
gtk_file_filter_add_pattern (filter, "*.jisp");
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (win), filter);
@@ -175,18 +179,15 @@
response = gtk_dialog_run (GTK_DIALOG (win));
if (response == GTK_RESPONSE_OK) {
#if GTK_CHECK_VERSION(2,4,0)
- gchar *filename;
- KfJisp *jisp;
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (win));
jisp = kf_jisp_install (filename);
g_free (filename);
#else
- KfJisp *jisp = kf_jisp_install (
+ jisp = kf_jisp_install (
gtk_file_selection_get_filename (GTK_FILE_SELECTION (win)));
#endif
if (jisp) {
- GtkTreeIter iter;
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter,
0, jisp->name,

View file

@ -1,5 +0,0 @@
kf is Open Source Jabber client for GNU/Linux operating system.
It aims to be both simple and powerful and is designed for
advanced user.
WWW: http://kf.jabberstudio.org/

View file

@ -1,129 +0,0 @@
bin/kf
share/applications/kf.desktop
%%DATADIR%%/add_contact.png
%%DATADIR%%/archive.glade
%%DATADIR%%/archive.glade.h
%%DATADIR%%/away.png
%%DATADIR%%/bass.wav
%%DATADIR%%/browse.glade
%%DATADIR%%/browse.glade.h
%%DATADIR%%/browse_aim.png
%%DATADIR%%/browse_book.png
%%DATADIR%%/browse_gg.png
%%DATADIR%%/browse_icq.png
%%DATADIR%%/browse_jud.png
%%DATADIR%%/browse_mail.png
%%DATADIR%%/browse_msn.png
%%DATADIR%%/browse_news.png
%%DATADIR%%/browse_room.png
%%DATADIR%%/browse_sms.png
%%DATADIR%%/browse_tlen.png
%%DATADIR%%/browse_user.png
%%DATADIR%%/browse_user2.png
%%DATADIR%%/browse_weather.png
%%DATADIR%%/browse_yahoo.png
%%DATADIR%%/button.wav
%%DATADIR%%/button_search.png
%%DATADIR%%/chat.glade
%%DATADIR%%/chat.glade.h
%%DATADIR%%/chat.png
%%DATADIR%%/contacts.glade
%%DATADIR%%/dnd.png
%%DATADIR%%/dock.glade
%%DATADIR%%/dock.glade.h
%%DATADIR%%/emoticons/beer.png
%%DATADIR%%/emoticons/bigsmile.png
%%DATADIR%%/emoticons/broken_heart.png
%%DATADIR%%/emoticons/cool.png
%%DATADIR%%/emoticons/cry.png
%%DATADIR%%/emoticons/emoticons.def
%%DATADIR%%/emoticons/evil.png
%%DATADIR%%/emoticons/heart.png
%%DATADIR%%/emoticons/icon_arrow.gif
%%DATADIR%%/emoticons/icon_biggrin.gif
%%DATADIR%%/emoticons/icon_confused.gif
%%DATADIR%%/emoticons/icon_cool.gif
%%DATADIR%%/emoticons/icon_cry.gif
%%DATADIR%%/emoticons/icon_eek.gif
%%DATADIR%%/emoticons/icon_evil.gif
%%DATADIR%%/emoticons/icon_exclaim.gif
%%DATADIR%%/emoticons/icon_frown.gif
%%DATADIR%%/emoticons/icon_idea.gif
%%DATADIR%%/emoticons/icon_lol.gif
%%DATADIR%%/emoticons/icon_mad.gif
%%DATADIR%%/emoticons/icon_mrgreen.gif
%%DATADIR%%/emoticons/icon_neutral.gif
%%DATADIR%%/emoticons/icon_question.gif
%%DATADIR%%/emoticons/icon_razz.gif
%%DATADIR%%/emoticons/icon_redface.gif
%%DATADIR%%/emoticons/icon_rolleyes.gif
%%DATADIR%%/emoticons/icon_sad.gif
%%DATADIR%%/emoticons/icon_smile.gif
%%DATADIR%%/emoticons/icon_surprised.gif
%%DATADIR%%/emoticons/icon_twisted.gif
%%DATADIR%%/emoticons/icon_wink.gif
%%DATADIR%%/emoticons/mad.png
%%DATADIR%%/emoticons/neutral.png
%%DATADIR%%/emoticons/online.png
%%DATADIR%%/emoticons/s.png
%%DATADIR%%/emoticons/sad.png
%%DATADIR%%/emoticons/smile.png
%%DATADIR%%/emoticons/tongue.png
%%DATADIR%%/emoticons/tux.png
%%DATADIR%%/emoticons/twisted.png
%%DATADIR%%/emoticons/wink.png
%%DATADIR%%/harp.wav
%%DATADIR%%/invisible.png
%%DATADIR%%/kf.glade
%%DATADIR%%/kf.glade.h
%%DATADIR%%/kf.png
%%DATADIR%%/logo.png
%%DATADIR%%/menu_configure.png
%%DATADIR%%/menu_register.png
%%DATADIR%%/menu_search.png
%%DATADIR%%/msg.glade
%%DATADIR%%/msg.glade.h
%%DATADIR%%/muc.glade
%%DATADIR%%/muc.glade.h
%%DATADIR%%/muc.png
%%DATADIR%%/muc_join.glade
%%DATADIR%%/muc_join.glade.h
%%DATADIR%%/network.png
%%DATADIR%%/new_account.glade
%%DATADIR%%/new_account.glade.h
%%DATADIR%%/online.png
%%DATADIR%%/password.png
%%DATADIR%%/people16.png
%%DATADIR%%/people24.png
%%DATADIR%%/pix_chat.png
%%DATADIR%%/pix_message.png
%%DATADIR%%/pix_system.png
%%DATADIR%%/plus.png
%%DATADIR%%/privacy.glade
%%DATADIR%%/privacy.glade.h
%%DATADIR%%/privacy_list.glade
%%DATADIR%%/privacy_list.glade.h
%%DATADIR%%/register.glade
%%DATADIR%%/register.glade.h
%%DATADIR%%/search.glade
%%DATADIR%%/search.glade.h
%%DATADIR%%/show_offline.png
%%DATADIR%%/status.glade
%%DATADIR%%/status.glade.h
%%DATADIR%%/subscribe.glade
%%DATADIR%%/subscribe.glade.h
%%DATADIR%%/unavailable.png
%%DATADIR%%/unavailable_desc.png
%%DATADIR%%/unknown.png
%%DATADIR%%/vcard.glade
%%DATADIR%%/vcard.glade.h
%%DATADIR%%/vcard.png
%%DATADIR%%/www.png
%%DATADIR%%/xa.png
%%NLS%%share/locale/bg/LC_MESSAGES/kf.mo
%%NLS%%share/locale/pl/LC_MESSAGES/kf.mo
%%NLS%%share/locale/ru/LC_MESSAGES/kf.mo
%%NLS%%share/pixmaps/kf.png
@dirrm %%DATADIR%%/emoticons
@dirrm %%DATADIR%%
@dirrmtry share/applications