tleenx-cvs Mailing List for TleenX otwarty klient Tlen.pl
Brought to you by:
hsokolow
Menu
▾
▴
tleenx-cvs — lista commitow
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(54) |
Nov
(78) |
Dec
(19) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(7) |
Feb
(28) |
Mar
(7) |
Apr
(19) |
May
|
Jun
(17) |
Jul
(9) |
Aug
(19) |
Sep
(21) |
Oct
(9) |
Nov
(8) |
Dec
(8) |
| 2004 |
Jan
(20) |
Feb
(40) |
Mar
(7) |
Apr
(23) |
May
(13) |
Jun
|
Jul
(7) |
Aug
|
Sep
(16) |
Oct
(6) |
Nov
(33) |
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
(7) |
May
|
Jun
(12) |
Jul
(2) |
Aug
|
Sep
|
Oct
(20) |
Nov
(13) |
Dec
|
| 2006 |
Jan
(2) |
Feb
(7) |
Mar
(12) |
Apr
(8) |
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
(6) |
Nov
|
Dec
|
| 2007 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <hso...@us...> - 2007-01-30 20:24:50
|
Update of /cvsroot/tleenx/tleenx2 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6068 Modified Files: ChangeLog Log Message: poprawienie obslugi bledow Index: ChangeLog =================================================================== RCS file: /cvsroot/tleenx/tleenx2/ChangeLog,v retrieving revision 1.119 retrieving revision 1.120 diff -u -d -r1.119 -r1.120 --- ChangeLog 27 Aug 2006 22:22:43 -0000 1.119 +++ ChangeLog 30 Jan 2007 20:24:37 -0000 1.120 @@ -1,3 +1,7 @@ +wto sty 30 21:22:45 CET 2007 + + * poprawienie obslugi bledow [who_ami] + pon sie 28 00:19:28 CEST 2006 * poprawione wy¶wietlanie kontaktów na li¶cie przy w³±czonej opcji |
|
From: <hso...@us...> - 2007-01-30 20:24:49
|
Update of /cvsroot/tleenx/tleenx2/src In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6068/src Modified Files: users.c Log Message: poprawienie obslugi bledow Index: users.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/users.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- users.c 14 Apr 2006 21:30:32 -0000 1.24 +++ users.c 30 Jan 2007 20:24:38 -0000 1.25 @@ -245,12 +245,16 @@ //usuwa z id slash wraz z resource gchar* user_del_res(const gchar *jid) { - gchar *r = strchr(jid, '/'); + gchar *r; - if(r) - return g_strndup(jid, r-jid); - - return g_strdup(jid); + if (jid == NULL) + return NULL; + r = strchr(jid, '/'); + + if(r) + return g_strndup(jid, r-jid); + + return g_strdup(jid); } struct user *get_user(const gchar *jid) @@ -262,7 +266,7 @@ s = user_del_res(jid); for(list = users_list; list; list = list->next) { user = (struct user*)list->data; - if( !strncmp(user->jid, s, strlen(user->jid)) ) + if(user->jid && !strncmp(user->jid, s, strlen(user->jid)) ) break; user = NULL; } |
|
From: <hso...@us...> - 2006-10-26 13:01:38
|
Update of /cvsroot/tleenx/tleenx2 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21849 Modified Files: Tag: tleenx2-iksemel ChangeLog Makefile.am configure.in Log Message: branch,w ktorym przenoszona jest obsluga jabbera do biblioteki iksemel i obsluga GG do libgadu Index: ChangeLog =================================================================== RCS file: /cvsroot/tleenx/tleenx2/ChangeLog,v retrieving revision 1.119 retrieving revision 1.119.2.1 diff -u -d -r1.119 -r1.119.2.1 --- ChangeLog 27 Aug 2006 22:22:43 -0000 1.119 +++ ChangeLog 26 Oct 2006 13:01:01 -0000 1.119.2.1 @@ -1,3 +1,7 @@ +czw paz 26 14:37:56 CEST 2006 + + * przeniesienie obslugi jabbera/xmpp z modulu tleenx3 [who_ami] + pon sie 28 00:19:28 CEST 2006 * poprawione wy¶wietlanie kontaktów na li¶cie przy w³±czonej opcji Index: Makefile.am =================================================================== RCS file: /cvsroot/tleenx/tleenx2/Makefile.am,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -d -r1.8 -r1.8.2.1 --- Makefile.am 21 Mar 2006 00:00:08 -0000 1.8 +++ Makefile.am 26 Oct 2006 13:01:02 -0000 1.8.2.1 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = iksemel jabby src plugins +SUBDIRS = src plugins man_MANS = tleenx2.1 EXTRA_DIST = \ autogen.sh \ Index: configure.in =================================================================== RCS file: /cvsroot/tleenx/tleenx2/configure.in,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -d -r1.9 -r1.9.2.1 --- configure.in 9 Apr 2006 21:01:46 -0000 1.9 +++ configure.in 26 Oct 2006 13:01:02 -0000 1.9.2.1 @@ -13,7 +13,7 @@ LIBS="$LIBS -L/usr/X11R6/lib/ -lXss -lX11 -lXext", exit -1, -L/usr/X11R6/lib/ -lX11 -lXext -lm) AC_CHECK_LIB(tlen, tlen_login, LIBS="$LIBS -ltlen", exit) -PKG_CHECK_MODULES(DEPS, gmodule-2.0 gthread-2.0,) +PKG_CHECK_MODULES(DEPS, gmodule-2.0 gthread-2.0 iksemel,) AC_SUBST(DEPS_CFLAGS) AC_SUBST(DEPS_LIBS) |
|
From: <hso...@us...> - 2006-10-26 13:01:10
|
Update of /cvsroot/tleenx/tleenx2/plugins In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21849/plugins Modified Files: Tag: tleenx2-iksemel helloworld.c Log Message: branch,w ktorym przenoszona jest obsluga jabbera do biblioteki iksemel i obsluga GG do libgadu Index: helloworld.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/plugins/helloworld.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 --- helloworld.c 5 Oct 2006 17:07:33 -0000 1.2 +++ helloworld.c 26 Oct 2006 13:01:03 -0000 1.2.2.1 @@ -57,7 +57,7 @@ break; case USER_JABBER: case USER_WP: - jabber_message((gchar *)jid, msg, JABBY_MESSAGE_CHAT); + jabber_message((gchar *)jid, msg, TLEN_CHAT); break; case USER_GG: jabber_gg_message((gchar *)jid, msg); |
|
From: <hso...@us...> - 2006-10-26 13:01:08
|
Update of /cvsroot/tleenx/tleenx2/iksemel In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21849/iksemel Removed Files: Tag: tleenx2-iksemel Makefile common.h config.h convert.c core.c iks.c iksemel.h iksid.c ikspool.c io.c jabber.c parser.c sha.c utility.c Log Message: branch,w ktorym przenoszona jest obsluga jabbera do biblioteki iksemel i obsluga GG do libgadu --- Makefile DELETED --- --- common.h DELETED --- --- config.h DELETED --- --- convert.c DELETED --- --- core.c DELETED --- --- iks.c DELETED --- --- iksemel.h DELETED --- --- iksid.c DELETED --- --- ikspool.c DELETED --- --- io.c DELETED --- --- jabber.c DELETED --- --- parser.c DELETED --- --- sha.c DELETED --- --- utility.c DELETED --- |
Update of /cvsroot/tleenx/tleenx2/src In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21849/src Modified Files: Tag: tleenx2-iksemel Makefile.am callbacks.c chat.c conffile.c conffile.h jabber.c jabber.h main.c main.h menu.c utils.c windows.c Added Files: Tag: tleenx2-iksemel jabby.h tsevent.c tsevent.h Log Message: branch,w ktorym przenoszona jest obsluga jabbera do biblioteki iksemel i obsluga GG do libgadu --- NEW FILE: jabby.h --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tsevent.c --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tsevent.h --- (This appears to be a binary file; contents omitted.) Index: Makefile.am =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/Makefile.am,v retrieving revision 1.18 retrieving revision 1.18.2.1 diff -u -d -r1.18 -r1.18.2.1 --- Makefile.am 9 Apr 2006 21:01:46 -0000 1.18 +++ Makefile.am 26 Oct 2006 13:01:03 -0000 1.18.2.1 @@ -4,7 +4,7 @@ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ -DPACKAGE_PLUGINS_DIR=\""$(libdir)/tleenx2/plugins"\" \ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - @PACKAGE_CFLAGS@ @DEPS_CFLAGS@ -I../jabby/ + @PACKAGE_CFLAGS@ @DEPS_CFLAGS@ bin_PROGRAMS = tleenx2 @@ -30,7 +30,8 @@ gg.c gg.h \ xmms-info.c xmms-info.h \ notify.c \ - plugins.c plugins.h + plugins.c plugins.h \ + tsevent.c tsevent.h -tleenx2_LDADD = @PACKAGE_LIBS@ @DEPS_LIBS@ ../jabby/libjabby.a ../iksemel/libiksemel.a -tleenx2_CFLAGS = -I../jabby -I../iksemel -g +tleenx2_LDADD = @PACKAGE_LIBS@ @DEPS_LIBS@ +tleenx2_CFLAGS = -g Index: callbacks.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/callbacks.c,v retrieving revision 1.82 retrieving revision 1.82.2.1 diff -u -d -r1.82 -r1.82.2.1 --- callbacks.c 14 Apr 2006 21:30:32 -0000 1.82 +++ callbacks.c 26 Oct 2006 13:01:03 -0000 1.82.2.1 @@ -29,11 +29,11 @@ #include "search.h" #include "lista.h" #include "menu.h" -#include "jabby.h" #include "jabber.h" #include "users.h" #include "groups.h" #include "plugins.h" +#include "jabby.h" gboolean [...225 lines suppressed...] - label = lookup_widget(window_message, "label_id"); - jid = (gchar *)gtk_label_get_text(GTK_LABEL(label)); - user = get_user(jid); - if(user && user->pending_event) notify_clear(jid); - - return FALSE; + gchar *jid = NULL; + GtkWidget *label = NULL; + // struct user *user = NULL; + + label = lookup_widget(window_message, "label_id"); + jid = (gchar *)gtk_label_get_text(GTK_LABEL(label)); + // user = get_user(jid); + // if(user && user->pending_event) + notify_clear(jid); + + return FALSE; } Index: chat.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/chat.c,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -u -d -r1.21 -r1.21.2.1 --- chat.c 21 Mar 2006 00:00:10 -0000 1.21 +++ chat.c 26 Oct 2006 13:01:03 -0000 1.21.2.1 @@ -16,7 +16,6 @@ #include "conffile.h" #include "support.h" #include "users.h" -#include "jabby.h" #include "jabber.h" #include "chat.h" @@ -273,7 +272,6 @@ if(strlen(message)<=0) return; s = fromutf(message); - g_free(message); if(s) { switch(get_type(talk->jid)) @@ -283,13 +281,13 @@ break; case USER_JABBER: case USER_WP: - jabber_message(talk->jid, s, JABBY_MESSAGE_CHAT); + jabber_message(talk->jid, message, TLEN_CHAT); break; - case USER_GG: - jabber_gg_message(talk->jid, s); + case USER_GG: // fixme +// jabber_gg_message(talk->jid, s); break; case USER_AGENT: - jabber_agent(talk->jid, s); +// jabber_agent(talk->jid, s); break; } chat_set_title(talk, 0); @@ -300,6 +298,7 @@ } else info("Wprowadzi³e¶ nieprawid³owe znaki\n"); + g_free(message); } void chat_remove(struct talk *talk) Index: conffile.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/conffile.c,v retrieving revision 1.36 retrieving revision 1.36.2.1 diff -u -d -r1.36 -r1.36.2.1 --- conffile.c 21 Mar 2006 00:00:10 -0000 1.36 +++ conffile.c 26 Oct 2006 13:01:03 -0000 1.36.2.1 @@ -285,7 +285,7 @@ p->jlogin = g_strdup(jlogin); p->jpassword = g_strdup(jpassword); if((!jresource) || (jresource[0] == '\0')) - p->jresource = g_strdup("jabby"); + p->jresource = g_strdup("tleenx"); else p->jresource = g_strdup(jresource); } @@ -357,6 +357,7 @@ g_free(p->sms); g_free(p->smsid); g_free(p->smspassword); + g_free(p->description); g_free(p); } Index: conffile.h =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/conffile.h,v retrieving revision 1.25 retrieving revision 1.25.2.1 diff -u -d -r1.25 -r1.25.2.1 --- conffile.h 21 Mar 2006 00:00:10 -0000 1.25 +++ conffile.h 26 Oct 2006 13:01:03 -0000 1.25.2.1 @@ -15,6 +15,8 @@ #include <gtk/gtk.h> #include <time.h> +#include "jabber.h" + #define MAX_SNAME 40 //maksymalna dlugosc nazwy sekcji w pliku konf #define MAX_CHATBUF 10000 //maksymalna dlugosc kolejki (ilosc bajtow) //wiadomosci do zapisu @@ -74,6 +76,9 @@ gchar *smsid; //haslo do bramki sms gchar *smspassword; + gchar *description; // opis w UTF-8 + gint status; // status jabberowy + JabberConnection *jc; }; struct chat Index: jabber.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/jabber.c,v retrieving revision 1.45 retrieving revision 1.45.2.1 diff -u -d -r1.45 -r1.45.2.1 --- jabber.c 28 Mar 2006 14:56:10 -0000 1.45 +++ jabber.c 26 Oct 2006 13:01:03 -0000 1.45.2.1 @@ -1,600 +1,971 @@ /* -** TleenX2 (Tlen.pl Client) -** Copyright (c) 2002-2003 Hubert Soko³owski <wh...@tl...> -** Pawe³ Biliñski <ra...@fr...> +** TleenX3 (Tlen.pl Client) +** Copyright (c) 2004 Hubert Soko³owski <wh...@tl...> +** Pawe³ Biliñski <ra...@fr...> ** ** This code is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License. ** [...1406 lines suppressed...] +} + +void jabber_gg_import () +{ + gchar *jid; + iks *x; + +// g_assert (gg_is_logged ()); + + if (!profile->jc || !(profile->jc->state & AUTHORIZED)) + return ; + + jid = g_strconcat (profile->ggserver, "/registered", NULL); + x = iks_new ("message"); + iks_insert_attrib (x, "to", jid); + iks_insert_cdata (iks_insert (x, "body"), "gr", 0); + g_free (jid); + iks_send (profile->jc->prs, x); + iks_delete (x); } Index: jabber.h =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/jabber.h,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -u -d -r1.10 -r1.10.2.1 --- jabber.h 20 May 2004 16:31:48 -0000 1.10 +++ jabber.h 26 Oct 2006 13:01:03 -0000 1.10.2.1 @@ -1,47 +1,59 @@ /* -** TleenX2 (Tlen.pl Client) -** Copyright (c) 2002-2003 Hubert Soko³owski <wh...@tl...> -** Pawe³ Biliñski <ra...@fr...> +** TleenX3 (Tlen.pl Client) +** Copyright (c) 2004 Hubert Soko³owski <wh...@tl...> +** Pawe³ Biliñski <ra...@fr...> ** ** This code is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License. ** */ + + #ifndef __JABBER_H__ #define __JABBER_H__ -#include "jabby.h" +#include <iksemel.h> +#include <glib.h> -void jabber_presence(gint type, gchar *message, gchar *to); -gboolean jabber_logged(); -gboolean jabber_created(); -void jabber_new(); -void jabber_login(); -void jabber_logout(); -void jabber_reconnect(); -void jabber_free(); -void jabber_contact_delete(struct user *user); -void jabber_contact_add(gchar *name, gchar *jid, gchar *group); -void jabber_message(gchar *to, gchar *message, gint type); -void jabber_subscribe_ask(gchar *jid); -void jabber_subscribe_deny(gchar *jid); -void jabber_subscribe_accept(gchar *jid); -void jabber_get_agents(); -//gg part -gboolean jabber_registered_to_gg(); -gboolean jabber_registered_to_sms(); -gboolean jabber_logged_to_gg(); -//gboolean jabber_gg_set(); -void jabber_register_gg(); -void jabber_register_sms(); -void jabber_unregister_gg(); -void jabber_gg_message(gchar *to, gchar *message); -void jabber_gg_agent(gchar *message); -void jabber_agent(gchar *jid, gchar *message); -gboolean jabber_gg_search_start(jabby_search_set *search); +#define IS_EMPTY(s) (!(s) || !iks_strcmp(s, "")) +#define EMPTY_IF_NULL(s) ((s) ? (s) : ("")) -#endif +typedef struct +{ + iksparser *prs; + ikstack *st; + gint state; + iksid *jid; +} JabberConnection; + +void jabber_connect (); +void jabber_disconnect (gboolean endStream); +gint jabber_message (gchar *jid, gchar *message, gint type); +void jabber_contact_add (const gchar *jid, const gchar *name, + const gchar *group); +void jabber_contact_remove (gchar *jid); +void jabber_subscription_request (gchar *jid); +void jabber_subscription_accept (gchar *jid); +void jabber_subscription_deny (gchar *jid); +void jabber_send_status (); +void jabber_agents_request (); +void jabber_send_query (const gchar *to, iks *y, gchar *ns, + enum iksubtype type, gchar *prefix); +void jabber_gg_import (); +gboolean jabber_is_logged (); +/* pseudo functions */ +#define jabber_send_want_register(to) \ + jabber_send_query(to, NULL, IKS_NS_REGISTER, IKS_TYPE_GET, "form_reg") +#define jabber_send_register(to, x) \ + jabber_send_query(to, x, IKS_NS_REGISTER, IKS_TYPE_SET, "result_reg") +#define jabber_send_want_search(to) \ + jabber_send_query(to, NULL, IKS_NS_SEARCH, IKS_TYPE_GET, "form_search") +#define jabber_send_search(to, x) \ + jabber_send_query(to, x, IKS_NS_SEARCH, IKS_TYPE_SET, "result_search") + + +#endif /* __JABBER_H__ */ Index: main.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/main.c,v retrieving revision 1.37 retrieving revision 1.37.2.1 diff -u -d -r1.37 -r1.37.2.1 --- main.c 21 Mar 2006 00:00:11 -0000 1.37 +++ main.c 26 Oct 2006 13:01:03 -0000 1.37.2.1 @@ -52,6 +52,7 @@ #endif #include "utils.h" #include "jabby.h" +#include "tsevent.h" GtkWidget *window1; @@ -349,6 +350,7 @@ create_docklet(); #endif + tsevent_init (); if( (argc == 3) && !strncmp(argv[1], "-p", 2) && argv[2]) { tleenx_print(DEBUG, "Laduje profil %s\n", argv[2]); @@ -365,6 +367,7 @@ my_create_window_login (); gtk_main (); + tsevent_stop (); return 0; } Index: main.h =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/main.h,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -u -d -r1.21 -r1.21.2.1 --- main.h 21 Mar 2006 00:00:11 -0000 1.21 +++ main.h 26 Oct 2006 13:01:03 -0000 1.21.2.1 @@ -16,6 +16,8 @@ #include <gtk/gtk.h> #include <libtlen/libtlen.h> +#include "conffile.h" + #define MAX_ICONS 9 #define J_MAX_ICONS 7 Index: menu.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/menu.c,v retrieving revision 1.22 retrieving revision 1.22.2.1 diff -u -d -r1.22 -r1.22.2.1 --- menu.c 21 Mar 2006 00:00:11 -0000 1.22 +++ menu.c 26 Oct 2006 13:01:03 -0000 1.22.2.1 @@ -66,7 +66,7 @@ case USER_WP: case USER_GG: case USER_AGENT: - jabber_contact_delete(user); + jabber_contact_remove(user->jid); break; case USER_VIRTUAL: break; @@ -188,12 +188,12 @@ on_wyslij_sms_activate (GtkMenuItem *menuitem, gpointer user_data) { - if(!jabber_logged()) + if(!jabber_is_logged()) { info("Brak po³±czenia z jabberem."); return; } - if(!jabber_registered_to_sms()) +// if(!jabber_registered_to_sms()) { info("Musisz siê najpierw zarejestrowaæ, sprawd¼ ustawienia SMS."); return; @@ -237,7 +237,8 @@ on_ustawienia_gg_activate (GtkMenuItem *menuitem, gpointer user_data) { - if(!jabber_logged()) + // fixme GG + if(!jabber_is_logged()) { info("Brak po³±czenia z serwerem jabbera."); return; Index: utils.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/utils.c,v retrieving revision 1.104 retrieving revision 1.104.2.1 diff -u -d -r1.104 -r1.104.2.1 --- utils.c 28 Mar 2006 14:56:10 -0000 1.104 +++ utils.c 26 Oct 2006 13:01:04 -0000 1.104.2.1 @@ -28,10 +28,10 @@ #include "docklet.h" #endif #include "jabber.h" -#include "jabby.h" #include "messages.h" #include "xmms-info.h" #include "plugins.h" +#include "jabby.h" gint t_status_map[] = {0, 0, JABBY_PRESENCE_AVAILABLE, JABBY_PRESENCE_XA, JABBY_PRESENCE_AWAY, JABBY_PRESENCE_DND, @@ -423,10 +423,9 @@ tlen_freesession(session); session=NULL; } - if(jabber_logged()) + if(jabber_is_logged()) { - jabber_logout(); - jabber_free(); + jabber_disconnect (1); } online=FALSE; @@ -1024,8 +1023,7 @@ if(preferences & PREF_JABBER_CONNECT) { - jabber_new(); - jabber_login(); + jabber_connect(); } if(preferences & PREF_XMMS_INFO) xmms_info_enable(TRUE, 0); @@ -1116,7 +1114,7 @@ desc_noutf = desc_get_full(); status_button_set(status); - if(jabber_logged()) + if(jabber_is_logged()) status_jabber_button_set(t_status_map[status]); tleenx_print(DEBUG, "set_status(): online, sending presence\n"); @@ -1135,16 +1133,19 @@ docklet_change_status(status); #endif - if(jabber_logged()) { + if(jabber_is_logged()) { gchar *desc_utf = utf(desc_noutf); - jabber_presence(t_status_map[status], desc_utf, NULL); +// jabber_presence(t_status_map[status], desc_utf, NULL); + g_free (profile->description); + profile->description = desc_utf; + profile->status = t_status_map[status]; + jabber_send_status (); - if(jabber_registered_to_gg() && profile->ggserver) - jabber_presence(t_status_map[status], desc_utf, - profile->ggserver); +// if(jabber_registered_to_gg() && profile->ggserver) +// jabber_presence(t_status_map[status], desc_utf, +// profile->ggserver); - g_free(desc_utf); } g_free(desc_noutf); Index: windows.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/windows.c,v retrieving revision 1.41 retrieving revision 1.41.2.1 diff -u -d -r1.41 -r1.41.2.1 --- windows.c 14 Apr 2006 21:30:32 -0000 1.41 +++ windows.c 26 Oct 2006 13:01:04 -0000 1.41.2.1 @@ -9,6 +9,7 @@ */ +#include <gdk/gdkkeysyms.h> #include "main.h" @@ -27,11 +28,10 @@ #include "chat.h" #include "gg.h" #include "jabber.h" [...109 lines suppressed...] } button = lookup_widget(window_prefs,"checkbutton_list_expanded"); if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) @@ -2104,6 +2106,8 @@ else if (user_type == USER_GG) { + /* + * fixme GG jabby_search_set *search; widget = lookup_widget(window_search,"radiobutton_search_gg"); @@ -2114,6 +2118,7 @@ jabber_gg_search_start(search); jabby_search_set_free(search); + */ } if(s) *s = '@'; |
Update of /cvsroot/tleenx/tleenx2/jabby In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21849/jabby Removed Files: Tag: tleenx2-iksemel Makefile events.c events.h jabber.c jabby.h mem.c mem.h parser.c parser.h search.c search.h Log Message: branch,w ktorym przenoszona jest obsluga jabbera do biblioteki iksemel i obsluga GG do libgadu --- Makefile DELETED --- --- events.c DELETED --- --- events.h DELETED --- --- jabber.c DELETED --- --- jabby.h DELETED --- --- mem.c DELETED --- --- mem.h DELETED --- --- parser.c DELETED --- --- parser.h DELETED --- --- search.c DELETED --- --- search.h DELETED --- |
|
From: <es...@us...> - 2006-10-05 17:07:43
|
Update of /cvsroot/tleenx/tleenx2/plugins In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14047/plugins Modified Files: helloworld.c Log Message: hello world plugin reagujÄ cy na nadejÅcie nowej wiadomoÅci. Index: helloworld.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/plugins/helloworld.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- helloworld.c 21 Mar 2006 00:00:09 -0000 1.1 +++ helloworld.c 5 Oct 2006 17:07:33 -0000 1.2 @@ -13,8 +13,9 @@ { p->name = "Hello World"; p->version = "0.2"; - p->desc = "Yes! it prints \"Hello World\" message. :]"; + p->desc = "Sample plugin. Shows \"Hello World\" message."; p->author = "Kamil Strzelecki"; + p->homepage = "http://tleenx.sf.net/"; p->prefs_func = hello_preferences; return TRUE; @@ -73,12 +74,39 @@ } +gboolean hello_message_cb(gpointer msg) +{ + gchar *s = NULL; + GtkWidget *dialog, *label; + + s = g_new0(gchar, 100); + g_sprintf(s, "Nowa wiadomoÅÄ od %s", msg); + + dialog = gtk_dialog_new_with_buttons( + "Hello World new message notification", + NULL, + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, + GTK_STOCK_CLOSE, + GTK_RESPONSE_NONE, + NULL); + label = gtk_label_new(s); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), label); + g_signal_connect_swapped(dialog, "response", G_CALLBACK(gtk_widget_destroy), dialog); + gtk_widget_show_all (dialog); + + g_free(s); + + return TRUE; +} + + gchar *plugin_load(PluginInfo *p) { gchar *s = "ZaÅadowano plugin Hello World"; GtkWidget *dialog, *label; tleenx_action_register("Say hello", (PluginActionCheck )hello_check, (PluginActionFun )hello_action); + tleenx_callback_register("new-message", (PluginCallbackFun ) hello_message_cb); dialog = gtk_dialog_new_with_buttons( "Hello World", |
|
From: <es...@us...> - 2006-08-27 22:22:48
|
Update of /cvsroot/tleenx/tleenx2/src In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30603/src Modified Files: lista.c Log Message: Stare poprawki które znalazÅem u siebie na dysku. Index: lista.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/lista.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- lista.c 8 Mar 2006 23:26:05 -0000 1.42 +++ lista.c 27 Aug 2006 22:22:43 -0000 1.43 @@ -240,12 +240,29 @@ } +GList *_remove_invisible(GList *list) +{ + struct user *u = NULL; + GList *ret = NULL; + + while(list) { + u = (struct user*)list->data; + if( _is_user_visible(u) ) + ret = g_list_append(ret, (gpointer)u); + list = list->next; + u = NULL; + } + + return ret; +} + + static GtkTreeModel *create_model(GList *list) { GtkTreeStore *store; GtkTreeIter child_iter, iter; - GList *l; + GList *l, *can_show = NULL; struct user *u; struct group *g; gchar *s, *gr, *path; @@ -258,8 +275,6 @@ { for(i=0, l=groups_list; l; l=l->next, i++) { - GList *l2 = NULL, *can_show = NULL; - g=(struct group*)l->data; gr=g_strdup_printf("%s(%d/%d)",g->name,users_list_count_online(g->users), users_list_count(g->users)); @@ -276,24 +291,18 @@ g_free(path); g->users = sort_users(g->users); - - u = NULL; - l2 = g->users; - while(l2) { - u = (struct user*)l2->data; - if( _is_user_visible(u) ) - can_show = g_list_append(can_show, (gpointer)u); - l2 = l2->next; - u = NULL; - } - + + can_show = _remove_invisible(g->users); create_model_add(store, can_show, &child_iter,&iter); g_list_free(can_show); can_show = NULL; } } - else - create_model_add(store, list, &child_iter,NULL); + else { + can_show = _remove_invisible(list); + create_model_add(store, can_show, &child_iter,NULL); + g_list_free(can_show); + } // jabber agents l=list; @@ -593,6 +602,7 @@ refresh_list(GTK_TREE_VIEW(treeview1), &users_list, TRUE); gtk_widget_realize(treeview1); gtk_tree_view_columns_autosize(GTK_TREE_VIEW(treeview1)); + _reloading_gui_atm = FALSE; return; } |
|
From: <es...@us...> - 2006-08-27 22:22:46
|
Update of /cvsroot/tleenx/tleenx2 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30603 Modified Files: ChangeLog Log Message: Stare poprawki które znalazÅem u siebie na dysku. Index: ChangeLog =================================================================== RCS file: /cvsroot/tleenx/tleenx2/ChangeLog,v retrieving revision 1.118 retrieving revision 1.119 diff -u -d -r1.118 -r1.119 --- ChangeLog 14 Apr 2006 21:32:10 -0000 1.118 +++ ChangeLog 27 Aug 2006 22:22:43 -0000 1.119 @@ -1,3 +1,8 @@ +pon sie 28 00:19:28 CEST 2006 + + * poprawione wy¶wietlanie kontaktów na li¶cie przy w³±czonej opcji + "Ukryj/poka¿ nieobecnych" [esack] + pia kwi 14 23:30:55 CEST 2006 * poprawienie sprawdzania obecnosci transportu gg na jabberze [who_ami] |
|
From: <hso...@us...> - 2006-04-14 21:32:13
|
Update of /cvsroot/tleenx/tleenx2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31062 Modified Files: ChangeLog Log Message: changelog Index: ChangeLog =================================================================== RCS file: /cvsroot/tleenx/tleenx2/ChangeLog,v retrieving revision 1.117 retrieving revision 1.118 diff -u -d -r1.117 -r1.118 --- ChangeLog 21 Mar 2006 00:00:07 -0000 1.117 +++ ChangeLog 14 Apr 2006 21:32:10 -0000 1.118 @@ -1,3 +1,7 @@ +pia kwi 14 23:30:55 CEST 2006 + + * poprawienie sprawdzania obecnosci transportu gg na jabberze [who_ami] + wto mar 21 00:10:12 CET 2006 * pierwsza wersja obs³ugi wtyczek (bêd± jeszcze zmiany!) [esack] |
|
From: <hso...@us...> - 2006-04-14 21:30:41
|
Update of /cvsroot/tleenx/tleenx2/jabby In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29277/jabby Modified Files: jabber.c jabby.h parser.c Log Message: poprawienie sprawdzania obecnosci transportu gg na jabberze Index: jabber.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/jabby/jabber.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- jabber.c 8 Mar 2006 23:26:05 -0000 1.20 +++ jabber.c 14 Apr 2006 21:30:32 -0000 1.21 @@ -85,10 +85,26 @@ iks_delete(x); } +void jabby_get_agents2 (jabby_session *ses) +{ + iks *x, *y; + + jabby_log ("get agents2"); + x = iks_new("iq"); + iks_insert_attrib(x,"id","agents2"); + iks_insert_attrib(x,"type","get"); + iks_insert_attrib(x,"to",ses->id->server); + y = iks_insert(x, "query"); + iks_insert_attrib(y, "xmlns", "http://jabber.org/protocol/disco#items"); + iks_send(ses->parser, x); + iks_delete(x); +} + void jabby_get_agents(jabby_session *ses) { iks *x, *y; + jabby_log ("get agents"); x = iks_new("iq"); iks_insert_attrib(x,"id","agents"); iks_insert_attrib(x,"type","get"); Index: jabby.h =================================================================== RCS file: /cvsroot/tleenx/tleenx2/jabby/jabby.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- jabby.h 14 Apr 2006 18:36:34 -0000 1.12 +++ jabby.h 14 Apr 2006 21:30:32 -0000 1.13 @@ -262,6 +262,7 @@ gchar *subject, enum jabby_message_type type); void jabby_session_free(jabby_session *ses); void jabby_get_agents(jabby_session *ses); +void jabby_get_agents2 (jabby_session *ses); void jabby_register_to(jabby_session *ses, gchar *to, gchar *username, gchar *password); Index: parser.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/jabby/parser.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- parser.c 14 Apr 2006 18:36:34 -0000 1.17 +++ parser.c 14 Apr 2006 21:30:32 -0000 1.18 @@ -21,6 +21,9 @@ void jabby_debug_mode (int mode) { debug_mode = mode; + if (mode) + jabby_log ("debug mode enabled"); + iks_debug_mode (mode); } void jabby_log (const gchar *format, ...) @@ -249,6 +252,7 @@ gchar *s; [...86 lines suppressed...] { - if(ses->debug) - g_print("error packet received!!!\n"); + gchar *id; + + jabby_log ("error packet received!!!\n"); + id = iks_find_attrib (pak->x, "id"); + // blad podczas pobierania listy transportow + if (id && !iks_strcmp (id, "agents")) + { + jabby_log ("get agents list failed"); + jabby_get_agents2 (ses); + } x = iks_find(pak->x, "error"); if(x) { - gchar *id; id = iks_find_attrib(pak->x,"id"); s = iks_find_attrib(x,"code"); |
|
From: <hso...@us...> - 2006-04-14 21:30:39
|
Update of /cvsroot/tleenx/tleenx2/iksemel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29277/iksemel Modified Files: iksemel.h io.c utility.c Log Message: poprawienie sprawdzania obecnosci transportu gg na jabberze Index: iksemel.h =================================================================== RCS file: /cvsroot/tleenx/tleenx2/iksemel/iksemel.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- iksemel.h 24 Oct 2005 20:44:31 -0000 1.3 +++ iksemel.h 14 Apr 2006 21:30:32 -0000 1.4 @@ -358,6 +358,8 @@ int iks_save(char *fname, iks *x); +void iks_debug_mode (int mode); +void iks_log (const gchar *format, ...); #ifdef __cplusplus } Index: io.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/iksemel/io.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- io.c 8 Mar 2006 23:26:05 -0000 1.4 +++ io.c 14 Apr 2006 21:30:32 -0000 1.5 @@ -189,6 +189,7 @@ { j->buf[len] = '\0'; if(prs->jLog) CALL_JLOG(j->buf, IKS_DIR_IN); + iks_log ("iks_recv %s", j->buf); iks_parse(prs, j->buf, len, 0); } else if(len <= 0) @@ -218,7 +219,7 @@ int iks_send_raw(iksparser *prs, char *data) { -// printf ("iks_send_raw '%s'\n", data); + iks_log ("iks_send_raw '%s'\n", data); if(!prs || !prs->conn || !prs->conn->sock || !data) return(0); if(send(prs->conn->sock, data, strlen(data), 0) == -1) return(0); Index: utility.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/iksemel/utility.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- utility.c 8 Dec 2002 23:45:26 -0000 1.1 +++ utility.c 14 Apr 2006 21:30:32 -0000 1.2 @@ -13,6 +13,35 @@ /***** NULL-safe Functions *****/ +static int debug_mode; + +void iks_debug_mode (int mode) +{ + debug_mode = mode; + if (mode) + iks_log ("debug mode enabled"); +} + +void iks_log (const gchar *format, ...) +{ + va_list args; + gchar *output = NULL; + + if (!debug_mode) + return; + if(!format) + return; + + va_start(args, format); + output = g_strdup_vprintf(format, args); + va_end(args); + + if(!output) + return; + g_print ("IKSEMEL: %s\n", output); + g_free (output); +} + char *iks_strdup(const char *src) { if(src) return(strdup(src)); |
|
From: <hso...@us...> - 2006-04-14 21:30:39
|
Update of /cvsroot/tleenx/tleenx2/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29277/src Modified Files: callbacks.c users.c users.h windows.c Log Message: poprawienie sprawdzania obecnosci transportu gg na jabberze Index: callbacks.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/callbacks.c,v retrieving revision 1.81 retrieving revision 1.82 diff -u -d -r1.81 -r1.82 --- callbacks.c 21 Mar 2006 00:00:09 -0000 1.81 +++ callbacks.c 14 Apr 2006 21:30:32 -0000 1.82 @@ -1500,7 +1500,7 @@ on_button_authorize_ok_clicked (GtkWidget *window3) { GtkWidget *label; - gchar *jid; + gchar *jid, *sub; struct user *u; gint type; @@ -1523,7 +1523,8 @@ jabber_subscribe_accept(jid); break; } - if(!strcmp(user_subscription(jid),"from") && type != USER_AGENT) + sub = (gchar*) user_subscription(jid); + if(sub && !strcmp (sub, "from") && type != USER_AGENT) contact_add(jid, type); else list_reload_all(); Index: users.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/users.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- users.c 21 Mar 2006 00:00:11 -0000 1.23 +++ users.c 14 Apr 2006 21:30:32 -0000 1.24 @@ -228,7 +228,7 @@ } -gchar *user_subscription(const gchar *jid) +const gchar *user_subscription(const gchar *jid) { GList *list=users_list; struct user *user; @@ -239,7 +239,7 @@ return user->subscription; list=list->next; } - return NULL; + return ""; } //usuwa z id slash wraz z resource Index: users.h =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/users.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- users.h 21 Mar 2006 00:00:11 -0000 1.12 +++ users.h 14 Apr 2006 21:30:32 -0000 1.13 @@ -45,7 +45,7 @@ void del_user(gchar *jid); void add_virtualusers(); struct user *get_user(const gchar *jid); -gchar *user_subscription(const gchar *jid); +const gchar *user_subscription(const gchar *jid); void users_list_clear(); void talks_list_clear(); gint users_list_count(GList *l); Index: windows.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/windows.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- windows.c 21 Mar 2006 00:00:11 -0000 1.40 +++ windows.c 14 Apr 2006 21:30:32 -0000 1.41 @@ -332,7 +332,12 @@ if(!textbg) textbg = g_strdup("#DCDAD5"); if(preferences & PREF_DEBUGON) + { tlen_setdebug(1); + jabby_debug_mode (1); + } + else + jabby_debug_mode (0); if(status != TLEN_STATUS_UNAVAILABLE) work_online(); // else @@ -1262,9 +1267,13 @@ { preferences |= PREF_DEBUGON; tlen_setdebug(1); + jabby_debug_mode (1); } else + { tlen_setdebug(0); + jabby_debug_mode (0); + } button = lookup_widget(window_prefs,"checkbutton_list_expanded"); if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) preferences |= PREF_LIST_EXPANDED; |
|
From: <hso...@us...> - 2006-04-14 18:36:40
|
Update of /cvsroot/tleenx/tleenx2/jabby In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4170 Modified Files: jabby.h parser.c Log Message: tryb debug Index: jabby.h =================================================================== RCS file: /cvsroot/tleenx/tleenx2/jabby/jabby.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- jabby.h 24 Oct 2005 20:44:31 -0000 1.11 +++ jabby.h 14 Apr 2006 18:36:34 -0000 1.12 @@ -271,6 +271,9 @@ void jabby_search_wp(jabby_session *ses, jabby_search_set *search); void jabby_gg_search_start(jabby_session *session, jabby_search_set *search); +void jabby_debug_mode (int mode); +void jabby_log (const gchar *format, ...); + /* * * others Index: parser.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/jabby/parser.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- parser.c 24 Oct 2005 20:59:09 -0000 1.16 +++ parser.c 14 Apr 2006 18:36:34 -0000 1.17 @@ -16,6 +16,33 @@ #include "search.h" #include <stdlib.h> +static int debug_mode; + +void jabby_debug_mode (int mode) +{ + debug_mode = mode; +} + +void jabby_log (const gchar *format, ...) +{ + va_list args; + gchar *output = NULL; + + if (!debug_mode) + return; + if(!format) + return; + + va_start(args, format); + output = g_strdup_vprintf(format, args); + va_end(args); + + if(!output) + return; + g_print ("JABBY: %s\n", output); + g_free (output); +} + gint jabby_parse_message(jabby_session *ses, ikspak *pak) { jabby_event *event; |
|
From: <es...@us...> - 2006-04-09 21:02:02
|
Update of /cvsroot/tleenx/tleenx2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17689 Modified Files: configure.in Log Message: zminy dla wspolpracy z flaga --as-needed Index: configure.in =================================================================== RCS file: /cvsroot/tleenx/tleenx2/configure.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- configure.in 21 Mar 2006 00:00:08 -0000 1.8 +++ configure.in 9 Apr 2006 21:01:46 -0000 1.9 @@ -13,6 +13,9 @@ LIBS="$LIBS -L/usr/X11R6/lib/ -lXss -lX11 -lXext", exit -1, -L/usr/X11R6/lib/ -lX11 -lXext -lm) AC_CHECK_LIB(tlen, tlen_login, LIBS="$LIBS -ltlen", exit) +PKG_CHECK_MODULES(DEPS, gmodule-2.0 gthread-2.0,) +AC_SUBST(DEPS_CFLAGS) +AC_SUBST(DEPS_LIBS) AC_ARG_ENABLE(docklet, [ --enable-docklet turn on docking, default=yes], if test x$enableval = xyes; then |
|
From: <es...@us...> - 2006-04-09 21:01:57
|
Update of /cvsroot/tleenx/tleenx2/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17689/src Modified Files: Makefile.am Log Message: zminy dla wspolpracy z flaga --as-needed Index: Makefile.am =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/Makefile.am,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- Makefile.am 21 Mar 2006 00:00:09 -0000 1.17 +++ Makefile.am 9 Apr 2006 21:01:46 -0000 1.18 @@ -4,7 +4,7 @@ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ -DPACKAGE_PLUGINS_DIR=\""$(libdir)/tleenx2/plugins"\" \ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - @PACKAGE_CFLAGS@ -I../jabby/ + @PACKAGE_CFLAGS@ @DEPS_CFLAGS@ -I../jabby/ bin_PROGRAMS = tleenx2 @@ -32,6 +32,5 @@ notify.c \ plugins.c plugins.h -tleenx2_LDADD = @PACKAGE_LIBS@ ../jabby/libjabby.a ../iksemel/libiksemel.a -tleenx2_LDFLAGS = `pkg-config --libs gthread-2.0 gmodule-2.0` +tleenx2_LDADD = @PACKAGE_LIBS@ @DEPS_LIBS@ ../jabby/libjabby.a ../iksemel/libiksemel.a tleenx2_CFLAGS = -I../jabby -I../iksemel -g |
|
From: <hso...@us...> - 2006-04-08 06:50:10
|
Update of /cvsroot/tleenx/tleenx2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20283 Modified Files: TODO Log Message: cos do zrobienia w przyszlosci ;) Index: TODO =================================================================== RCS file: /cvsroot/tleenx/tleenx2/TODO,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- TODO 29 Apr 2004 07:12:13 -0000 1.17 +++ TODO 8 Apr 2006 06:50:02 -0000 1.18 @@ -1,3 +1,4 @@ + * przycisk 'Dalej' w wyszukiwarce * do poprawienia jest jeszcze wiele bledow, a potem... * reorganizacja okienka kontaktow z mozliwoscia dodawania i usuwania wpisow * zakladki zamiast wielu okien w rozmowami |
|
From: <es...@us...> - 2006-03-28 14:56:24
|
Update of /cvsroot/tleenx/tleenx2/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11088 Modified Files: jabber.c utils.c Log Message: poprawka bÅÄdu zgÅoszonego na forum - miganie ikonki na docklecie mimo, że w wiadomoÅci nie byÅo żadnej treÅci. Index: jabber.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/jabber.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- jabber.c 21 Mar 2006 00:00:11 -0000 1.44 +++ jabber.c 28 Mar 2006 14:56:10 -0000 1.45 @@ -297,7 +297,7 @@ jabber_get_agents(); break; case JABBY_EVENT_MESSAGE: - { + if(event->event.message->body) { gint type; type = event->event.message->type; Index: utils.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/utils.c,v retrieving revision 1.103 retrieving revision 1.104 diff -u -d -r1.103 -r1.104 --- utils.c 21 Mar 2006 00:00:11 -0000 1.103 +++ utils.c 28 Mar 2006 14:56:10 -0000 1.104 @@ -705,6 +705,8 @@ } case TLEN_EVENT_MESSAGE: + if(!event->message->body) + break; message_show( event->message->from, event->message->body, |
Update of /cvsroot/tleenx/tleenx2/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7472/src Modified Files: Makefile.am callbacks.c callbacks.h chat.c conffile.c conffile.h groups.c interface.c interface.h jabber.c main.c main.h menu.c menu.h messages.c support.c support.h users.c users.h utils.c windows.c Added Files: plugins.c plugins.h Log Message: Przez ostatnie kilka dni prawie nie rusza³em, a zaczynam ju¿ traciæ orientacjê powoli co by³o a co nie, wiêc wrzucam jak jest. Generalnie wszystko siê buduje i dzia³a (przynajmniej u mnie). Mam wielk± nadziejê, ¿e nic nie popsu³em/nie zapomnia³êm o jakich¶ plikach. Dawaæ znaæ w razie czego. Oprócz pluginów jest ca³kiem sporo innych zmian - parê funkcji przepisanych, jakies drobne poprawki w makefiles, kosmetyka... Jeszcze bêdzie trochê zmian w pluginowym kodzie, g³ownie odno¶nie gui chyba. No i nag³ówki do uporz±dkowania i wyodrêbnienia z nich cze¶ci do eksportu (niby SDK :]). --- NEW FILE: plugins.c --- /* ** TleenX2 (Tlen.pl Client) - plugin system ** ** Copyright (c) 2006 Kamil Strzelecki ** ** This code is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License. ** */ #include <glib/gstdio.h> #include "main.h" #include "docklet.h" #include "utils.h" #include "support.h" #include "lista.h" #include "interface.h" #include "plugins.h" [...400 lines suppressed...] dialog = gtk_dialog_new_with_buttons( g_strdup(p->info->name), GTK_WINDOW(window_plugins), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CLOSE, GTK_RESPONSE_NONE, NULL); // TODO: markup text + replace label with better widget text = g_strdup_printf("%s (%s)\nby %s\n\n%s", p->info->name, p->info->version, p->info->author, p->info->desc); label = gtk_label_new(text); g_free(text); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), label); g_signal_connect_swapped(dialog, "response", G_CALLBACK(gtk_widget_destroy), dialog); gtk_widget_show_all (dialog); } --- NEW FILE: plugins.h --- /* ** TleenX2 (Tlen.pl Client) - plugin system ** ** Copyright (c) 2006 Kamil Strzelecki ** ** This code is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License. ** */ #include "users.h" // Plugin and PluginAction - struktury wewnÄtrzne typedef struct _Plugin Plugin; typedef struct _PluginAction PluginAction; // Struktura z informacjami o wtyczce // WypeÅnina przez pluginy w funkcji plugin_register() // Co najmniej element name *musi* byÄ ustawiony typedef struct { gchar *name; // Wymagane! gchar *version; gchar *desc; gchar *author; gchar *homepage; void (*prefs_func)(); // jeÅli plugin ma buÄ konfigurowalny } PluginInfo; // Prototypy funkcji wywoÅywanych odpowiednio przy: rejestrowaniu, Åadowaniu i // wyÅadowywaniu wtyczki. // PluginReg *musi* byÄ udostÄpniona reszta jest opcjonalna typedef gboolean (* PluginReg)(PluginInfo *); typedef gboolean (* PluginLoad)(PluginInfo *); typedef gboolean (* PluginUnload)(PluginInfo *); // Funkcje przez które można rejestrowaÄ akcje wywoÅywane w menu przy klikniÄciu // prawym klawiszem myszy na nazwÄ kontaktu. // Pierwsza sprawdza czy akcja odnosi siÄ do kontaktu // Druga wywoÅuje wÅaÅciwÄ akcjÄ. typedef gboolean (* PluginActionCheck)(struct user *user); typedef gboolean (* PluginActionFun)(const gchar *); // Funkcja rejestrujÄ ca akcjÄ w programie przez ustawienie wskaźników do powyższych funkcji // w zmiennej name przekazywana jest nazwa do wyÅwietlenia w menu void tleenx_action_register(const gchar *name, PluginActionCheck check, PluginActionFun func); /*tleenx2:private*/ /* DO NOT CHANGE THE ABOVE LINE!!! * It's used by ./configure script to destinguish between private & public functions */ /* Place here internal functions that shouldn't be used in plugins */ void plugins_gui_create_list(); void tleenx_plugin_info_dialog(Plugin *p); Plugin *tleenx_get_plugin_by_id(const gchar *id); void tleenx_register_plugins_from_dir(gchar *path); typedef GList PluginsActions; typedef GList PluginsList; extern PluginsActions *plugins_actions; extern PluginsList *plugins_list; // actions launched in contact list's popup menu struct _PluginAction { Plugin *plugin; gchar *name; PluginActionCheck check; PluginActionFun action; }; gint file_write_loaded_plugins(); GList *file_get_plugins_to_load(); void tleenx_load_plugins(); Index: Makefile.am =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/Makefile.am,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Makefile.am 18 Nov 2005 19:24:12 -0000 1.16 +++ Makefile.am 21 Mar 2006 00:00:09 -0000 1.17 @@ -2,6 +2,7 @@ INCLUDES = \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ + -DPACKAGE_PLUGINS_DIR=\""$(libdir)/tleenx2/plugins"\" \ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ @PACKAGE_CFLAGS@ -I../jabby/ @@ -28,8 +29,9 @@ jabber.c jabber.h \ gg.c gg.h \ xmms-info.c xmms-info.h \ - notify.c + notify.c \ + plugins.c plugins.h tleenx2_LDADD = @PACKAGE_LIBS@ ../jabby/libjabby.a ../iksemel/libiksemel.a -tleenx2_LDFLAGS = `pkg-config --libs gthread-2.0` +tleenx2_LDFLAGS = `pkg-config --libs gthread-2.0 gmodule-2.0` tleenx2_CFLAGS = -I../jabby -I../iksemel -g Index: callbacks.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/callbacks.c,v retrieving revision 1.80 retrieving revision 1.81 diff -u -d -r1.80 -r1.81 --- callbacks.c 5 Feb 2006 14:50:48 -0000 1.80 +++ callbacks.c 21 Mar 2006 00:00:09 -0000 1.81 @@ -33,6 +33,7 @@ #include "jabber.h" #include "users.h" #include "groups.h" +#include "plugins.h" gboolean on_treeview_button_release_event (GtkWidget *widget, @@ -129,6 +130,24 @@ (gpointer) user->jid); gtk_widget_show (menu_items); + /* Add actions provided with plugins */ + { + PluginsActions *a; + + for(a = plugins_actions; a; a=a->next) { + PluginAction *act = (PluginAction *)a->data; + + if(act->check(user)) { + menu_items = gtk_menu_item_new_with_label(act->name); + gtk_menu_append(GTK_MENU(menu), menu_items); + g_signal_connect_swapped(G_OBJECT(menu_items), "activate", + G_CALLBACK(act->action), + (gpointer)user->jid); + gtk_widget_show(menu_items); + } + } + } + menu_items = gtk_menu_item_new_with_label ("Edycja danych osoby"); gtk_menu_append (GTK_MENU (menu), menu_items); g_signal_connect_swapped (G_OBJECT (menu_items), "activate", @@ -2089,3 +2108,24 @@ return FALSE; } + +gboolean +on_window_plugins_delete_event (GtkWidget *widget, + GdkEvent *event, + gpointer user_data) +{ + gtk_widget_destroy(window_plugins); + window_plugins = NULL; + + return FALSE; +} + + +void +on_plugins_list_close_clicked (GtkButton *button, + gpointer user_data) +{ + gtk_widget_destroy(window_plugins); + window_plugins = NULL; +} + Index: callbacks.h =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/callbacks.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- callbacks.h 3 Nov 2005 01:18:48 -0000 1.26 +++ callbacks.h 21 Mar 2006 00:00:10 -0000 1.27 @@ -434,3 +434,20 @@ on_window_message_enter_notify_event (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data); + +gboolean +on_window_plugins_delete_event (GtkWidget *widget, + GdkEvent *event, + gpointer user_data); + +void +on_plugins_list_close_clicked (GtkButton *button, + gpointer user_data); + +void +on_plugins_prefs_btn_clicked (GtkButton *button, + gpointer user_data); + +void +on_plugins_info_btn_clicked (GtkButton *button, + gpointer user_data); Index: chat.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/chat.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- chat.c 22 Jan 2006 23:13:26 -0000 1.20 +++ chat.c 21 Mar 2006 00:00:10 -0000 1.21 @@ -148,7 +148,7 @@ "foreground", "blue", "underline", PANGO_UNDERLINE_SINGLE, NULL); - g_object_set_data(G_OBJECT(tag), "url", url); + g_object_set_data(G_OBJECT(tag), "url", (gpointer )url); gtk_text_buffer_insert_with_tags(buffer, &end, url, -1, tag, NULL); } Index: conffile.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/conffile.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- conffile.c 22 Jan 2006 23:13:27 -0000 1.35 +++ conffile.c 21 Mar 2006 00:00:10 -0000 1.36 @@ -31,6 +31,7 @@ #include "users.h" #include "lista.h" #include "groups.h" +#include "plugins.h" extern int errno; @@ -988,3 +989,36 @@ return 0; } + + +/* Load cached list of plugins to be loaded + * return: 1 - can't open file, 0 success */ +GList *file_get_plugins_to_load() +{ + gchar *s = NULL; + FILE *file = NULL; + GList *list = NULL; + + s = g_strdup_printf("%s/.tleenx/%s.loaded_plugins", + getenv("HOME"), pname); + file = fopen(s, "r"); + if(!file) { + tleenx_print(WARNING, "file_get_plugins_to_load(): Can't open file %s.", s); + return NULL; + } + s = NULL; + g_free(s); + + while(!feof(file)) { + s = read_line(file); + tleenx_print(DEBUG, "file_get_plugins_to_load(): got %s\n", s); + if(!s) + break; + list = g_list_prepend(list, (gpointer )s); + s = NULL; + } + fclose(file); + + return list; +} + Index: conffile.h =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/conffile.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- conffile.h 27 Nov 2004 22:13:34 -0000 1.24 +++ conffile.h 21 Mar 2006 00:00:10 -0000 1.25 @@ -115,5 +115,6 @@ gint file_write_expanded_groups(); gint file_load_expanded_groups(); +GList *file_get_plugins_to_load(); #endif Index: groups.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/groups.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- groups.c 28 Nov 2004 12:39:27 -0000 1.15 +++ groups.c 21 Mar 2006 00:00:10 -0000 1.16 @@ -117,7 +117,7 @@ if(!path) return NULL; - s = gtk_tree_path_to_string(path); + s = gtk_tree_path_to_string((GtkTreePath *)path); p = atoi(s); g_free(s); Index: interface.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/interface.c,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- interface.c 10 Feb 2006 18:09:08 -0000 1.68 +++ interface.c 21 Mar 2006 00:00:10 -0000 1.69 @@ -58,7 +58,7 @@ tooltips = gtk_tooltips_new (); window1 = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_title (GTK_WINDOW (window1), _("TleenX2")); + gtk_window_set_title (GTK_WINDOW (window1), "TleenX2"); window1_icon_pixbuf = create_pixbuf ("tleenx.png"); if (window1_icon_pixbuf) { @@ -75,7 +75,7 @@ gtk_widget_show (vbox2); gtk_box_pack_end (GTK_BOX (vbox), vbox2, FALSE, FALSE, 0); [...2484 lines suppressed...] + GLADE_HOOKUP_OBJECT_NO_REF (window_plugins, window_plugins, "window_plugins"); + GLADE_HOOKUP_OBJECT (window_plugins, vbox374, "vbox374"); + GLADE_HOOKUP_OBJECT (window_plugins, scrolledwindow17, "scrolledwindow17"); + GLADE_HOOKUP_OBJECT (window_plugins, plugins_treeview, "plugins_treeview"); + GLADE_HOOKUP_OBJECT (window_plugins, hbox174, "hbox174"); + GLADE_HOOKUP_OBJECT (window_plugins, plugins_prefs_btn, "plugins_prefs_btn"); + GLADE_HOOKUP_OBJECT (window_plugins, alignment73, "alignment73"); + GLADE_HOOKUP_OBJECT (window_plugins, hbox207, "hbox207"); + GLADE_HOOKUP_OBJECT (window_plugins, image122, "image122"); + GLADE_HOOKUP_OBJECT (window_plugins, label257, "label257"); + GLADE_HOOKUP_OBJECT (window_plugins, plugins_list_close, "plugins_list_close"); + GLADE_HOOKUP_OBJECT (window_plugins, plugins_info_btn, "plugins_info_btn"); + GLADE_HOOKUP_OBJECT (window_plugins, alignment72, "alignment72"); + GLADE_HOOKUP_OBJECT (window_plugins, hbox206, "hbox206"); + GLADE_HOOKUP_OBJECT (window_plugins, image121, "image121"); + GLADE_HOOKUP_OBJECT (window_plugins, label256, "label256"); + + return window_plugins; +} + Index: interface.h =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/interface.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- interface.h 25 Nov 2004 20:43:10 -0000 1.8 +++ interface.h 21 Mar 2006 00:00:11 -0000 1.9 @@ -25,3 +25,4 @@ GtkWidget* create_window_desc (void); GtkWidget* create_window_gg (void); GtkWidget* create_window_sms (void); +GtkWidget* create_window_plugins (void); Index: jabber.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/jabber.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- jabber.c 6 Feb 2006 00:36:59 -0000 1.43 +++ jabber.c 21 Mar 2006 00:00:11 -0000 1.44 @@ -238,7 +238,7 @@ { GList *l = users_list, *new = NULL; - info("Zerwane po³±czenie z serwerem Jabbera"); + //info("Zerwane po³±czenie z serwerem Jabbera"); // remove jabber contacts from the list while(l) { Index: main.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/main.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- main.c 5 Feb 2006 14:50:48 -0000 1.36 +++ main.c 21 Mar 2006 00:00:11 -0000 1.37 @@ -73,6 +73,7 @@ GtkWidget *status_docklet = NULL; #endif GtkWidget *window_gg; +GtkWidget *window_plugins; GtkWidget *window_sms; struct tlen_session *session;//sesja tlenu @@ -349,10 +350,13 @@ #endif - - - - if(last_login()) + if( (argc == 3) && !strncmp(argv[1], "-p", 2) && argv[2]) { + tleenx_print(DEBUG, "Laduje profil %s\n", argv[2]); + pname = g_strdup(argv[2]); + load_profiles(); + window1_open(); + } + else if(last_login()) { load_profiles(); window1_open(); Index: main.h =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/main.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- main.h 3 Nov 2005 01:18:48 -0000 1.20 +++ main.h 21 Mar 2006 00:00:11 -0000 1.21 @@ -43,6 +43,7 @@ *treeview1, *scroll1, *window_gg, + *window_plugins, *window_sms, *status_docklet; Index: menu.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/menu.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- menu.c 28 Nov 2004 01:27:13 -0000 1.21 +++ menu.c 21 Mar 2006 00:00:11 -0000 1.22 @@ -18,6 +18,7 @@ #endif #include "jabber.h" #include "conffile.h" +#include "plugins.h" void on_menu_user_clipboard (struct user *user) { @@ -247,6 +248,17 @@ } +void +on_menu_plugins_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + if(!window_plugins) { + plugins_gui_create_list(); + } + +} + + #ifndef DISABLE_DOCKLET void on_menu_show_docklet_activate(GtkMenuItem *menuitem, gpointer user_data) { Index: menu.h =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/menu.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- menu.h 25 Nov 2004 20:43:11 -0000 1.9 +++ menu.h 21 Mar 2006 00:00:11 -0000 1.10 @@ -51,7 +51,9 @@ void on_ustawienia_gg_activate (GtkMenuItem *menuitem, gpointer user_data); - +void +on_menu_plugins_activate (GtkMenuItem *menuitem, + gpointer user_data); #ifndef DISABLE_DOCKLET void on_menu_show_docklet_activate(GtkMenuItem *menuitem, gpointer user_data); #endif Index: messages.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/messages.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- messages.c 28 Nov 2004 01:27:13 -0000 1.10 +++ messages.c 21 Mar 2006 00:00:11 -0000 1.11 @@ -25,8 +25,8 @@ if(!body) return; - from = strdup(jid); - from = user_del_res(from); + //from = strdup(jid); + from = user_del_res(jid); utype = get_type(from); if((utype == USER_JABBER) || (utype == USER_WP) || (utype == USER_GG) || (utype == USER_AGENT)) Index: support.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/support.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- support.c 10 Feb 2006 18:09:08 -0000 1.6 +++ support.c 21 Mar 2006 00:00:11 -0000 1.7 @@ -87,7 +87,7 @@ if (!pathname) { - g_warning (_("Couldn't find pixmap file: %s"), filename); + g_warning ("Couldn't find pixmap file: %s", filename); return gtk_image_new (); } @@ -111,7 +111,7 @@ if (!pathname) { - g_warning (_("Couldn't find pixmap file: %s"), filename); + g_warning ("Couldn't find pixmap file: %s", filename); return NULL; } Index: support.h =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/support.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- support.h 10 Feb 2006 18:09:08 -0000 1.4 +++ support.h 21 Mar 2006 00:00:11 -0000 1.5 @@ -9,31 +9,6 @@ #include <gtk/gtk.h> /* - * Standard gettext macros. - */ -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (PACKAGE, String) -# define Q_(String) g_strip_context ((String), gettext (String)) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define Q_(String) g_strip_context ((String), (String)) -# define N_(String) (String) -#endif - - -/* * Public Functions. */ Index: users.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/users.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- users.c 8 Mar 2006 23:26:05 -0000 1.22 +++ users.c 21 Mar 2006 00:00:11 -0000 1.23 @@ -243,95 +243,32 @@ } //usuwa z id slash wraz z resource -gchar* user_del_res(gchar *jid) -{ - gchar *s, *s2; - - s = strdup(jid); - s2 = strchr(s, '/'); - if(s2) - { [...103 lines suppressed...] @@ -371,7 +308,9 @@ gchar *description, gchar *ask, int status, enum user_type type) { struct user *u; - + + if(!jid) return; + u = get_user(jid); if(u) { @@ -413,7 +352,7 @@ } u = (struct user*) g_malloc(sizeof(struct user)); u->name = g_strdup(name); - u->jid = g_strdup(jid); + u->jid = user_del_res(jid); u->group = g_strdup(group); u->description = g_strdup(description); u->subscription = g_strdup(subscription); Index: users.h =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/users.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- users.h 5 Feb 2006 15:12:28 -0000 1.11 +++ users.h 21 Mar 2006 00:00:11 -0000 1.12 @@ -53,7 +53,7 @@ gchar *get_user_name(const gchar *jid); gint get_status(struct user *u); gint get_type(gchar *id); -gchar* user_del_res(gchar *jid); +gchar* user_del_res(const gchar *jid); gboolean subscription_to(struct user *u); gboolean subscription_from(struct user *u); gchar *user_description(struct user *user); Index: utils.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/utils.c,v retrieving revision 1.102 retrieving revision 1.103 diff -u -d -r1.102 -r1.103 --- utils.c 6 Feb 2006 00:36:59 -0000 1.102 +++ utils.c 21 Mar 2006 00:00:11 -0000 1.103 @@ -31,6 +31,7 @@ #include "jabby.h" #include "messages.h" #include "xmms-info.h" +#include "plugins.h" gint t_status_map[] = {0, 0, JABBY_PRESENCE_AVAILABLE, JABBY_PRESENCE_XA, JABBY_PRESENCE_AWAY, JABBY_PRESENCE_DND, @@ -464,6 +465,7 @@ create_file(); save_preferences(); file_write_expanded_groups(); + file_write_loaded_plugins(); if(window_gg) { Index: windows.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/src/windows.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- windows.c 18 Nov 2005 19:24:12 -0000 1.39 +++ windows.c 21 Mar 2006 00:00:11 -0000 1.40 @@ -30,6 +30,7 @@ #include "jabby.h" #include "xmms-info.h" #include "groups.h" +#include "plugins.h" #include <gdk/gdkkeysyms.h> #define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \ @@ -374,6 +375,7 @@ GtkWidget *image31; GtkWidget *ustawienia1; GtkWidget *ustawienia_gg; + GtkWidget *menu_plugins; GtkWidget *image32; #ifndef DISABLE_DOCKLET GtkWidget *menu_show_docklet; @@ -386,6 +388,7 @@ GtkWidget *image34; GtkWidget *wyj__cie1; GtkWidget *image35; + GtkWidget *image36; //menuglowne GtkAccelGroup *accel_group; @@ -476,6 +479,9 @@ gtk_widget_add_accelerator (ustawienia1, "activate", accel_group, GDK_P, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); + image32 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show (image32); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (ustawienia1), image32); ustawienia_gg = gtk_image_menu_item_new_with_mnemonic ("Ustawienia Gadu-Gadu/SMS..."); @@ -486,11 +492,16 @@ GLADE_HOOKUP_OBJECT (window1, image, "gg_offline.png"); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(ustawienia_gg), image); - image32 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); - gtk_widget_show (image32); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (ustawienia1), image32); - - + menu_plugins = gtk_image_menu_item_new_with_mnemonic ("Wtyczki"); + gtk_widget_show (menu_plugins); + gtk_container_add (GTK_CONTAINER (tlen1_menu), menu_plugins); + gtk_widget_add_accelerator (menu_plugins, "activate", accel_group, + GDK_P, GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + image36 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show (image36); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_plugins), image36); + #ifndef DISABLE_DOCKLET menu_show_docklet = gtk_image_menu_item_new_with_mnemonic( "Pokaż/ukryj docklet."); @@ -749,6 +760,9 @@ g_signal_connect (G_OBJECT (ustawienia_gg), "activate", G_CALLBACK (on_ustawienia_gg_activate), NULL); + g_signal_connect (G_OBJECT (menu_plugins), "activate", + G_CALLBACK (on_menu_plugins_activate), + NULL); g_signal_connect (G_OBJECT (o_programie1), "activate", G_CALLBACK (on_o_programie1_activate), NULL); @@ -767,6 +781,9 @@ widget=lookup_widget(window1,"label_info"); gtk_widget_hide(widget); // gtk_widget_show (window1); + + /* Load plugins */ + tleenx_load_plugins(); } void window_unauth_delete(GtkWidget *window) |
|
From: <es...@us...> - 2006-03-21 00:01:20
|
Update of /cvsroot/tleenx/tleenx2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7472 Modified Files: AUTHORS ChangeLog Makefile.am configure.in Log Message: Przez ostatnie kilka dni prawie nie rusza³em, a zaczynam ju¿ traciæ orientacjê powoli co by³o a co nie, wiêc wrzucam jak jest. Generalnie wszystko siê buduje i dzia³a (przynajmniej u mnie). Mam wielk± nadziejê, ¿e nic nie popsu³em/nie zapomnia³êm o jakich¶ plikach. Dawaæ znaæ w razie czego. Oprócz pluginów jest ca³kiem sporo innych zmian - parê funkcji przepisanych, jakies drobne poprawki w makefiles, kosmetyka... Jeszcze bêdzie trochê zmian w pluginowym kodzie, g³ownie odno¶nie gui chyba. No i nag³ówki do uporz±dkowania i wyodrêbnienia z nich cze¶ci do eksportu (niby SDK :]). Index: AUTHORS =================================================================== RCS file: /cvsroot/tleenx/tleenx2/AUTHORS,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- AUTHORS 30 Apr 2004 10:56:24 -0000 1.5 +++ AUTHORS 21 Mar 2006 00:00:06 -0000 1.6 @@ -1,8 +1,11 @@ Autorzy: Hubert Soko³owski <wh...@o2...> - autor, g³owny programista +Kamil Strzelecki <es...@dh...> - programista Pawe³ Biliñski <ra...@fr...> - autor grafiki, WWW Reszta: -Rafa³ Piotrowski <lol...@o2...> - programista, rozwija obs³ugê jabbera -Kamil Strzelecki <es...@dh...> - programista +Rafa³ Piotrowski <lol...@o2...> - programowanie +Jaros³aw Pyszny - poprawki +Marcin Goliszewski - poprawki +Adam Byrtek - poprawki Index: ChangeLog =================================================================== RCS file: /cvsroot/tleenx/tleenx2/ChangeLog,v retrieving revision 1.116 retrieving revision 1.117 diff -u -d -r1.116 -r1.117 --- ChangeLog 8 Mar 2006 23:26:05 -0000 1.116 +++ ChangeLog 21 Mar 2006 00:00:07 -0000 1.117 @@ -1,3 +1,8 @@ +wto mar 21 00:10:12 CET 2006 + + * pierwsza wersja obs³ugi wtyczek (bêd± jeszcze zmiany!) [esack] + * wiele pomniejszych poprawek [esack] + czw mar 9 00:25:35 CET 2006 * Poprawienie rejestracji numeru gg [huami] Index: Makefile.am =================================================================== RCS file: /cvsroot/tleenx/tleenx2/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile.am 22 Jan 2006 23:13:26 -0000 1.7 +++ Makefile.am 21 Mar 2006 00:00:08 -0000 1.8 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = iksemel jabby src +SUBDIRS = iksemel jabby src plugins man_MANS = tleenx2.1 EXTRA_DIST = \ autogen.sh \ Index: configure.in =================================================================== RCS file: /cvsroot/tleenx/tleenx2/configure.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- configure.in 23 Oct 2005 22:40:16 -0000 1.7 +++ configure.in 21 Mar 2006 00:00:08 -0000 1.8 @@ -65,6 +65,7 @@ AC_OUTPUT([ Makefile src/Makefile +plugins/Makefile ]) |
|
From: <es...@us...> - 2006-03-21 00:01:18
|
Update of /cvsroot/tleenx/tleenx2/iksemel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7472/iksemel Modified Files: Makefile sha.c Log Message: Przez ostatnie kilka dni prawie nie rusza³em, a zaczynam ju¿ traciæ orientacjê powoli co by³o a co nie, wiêc wrzucam jak jest. Generalnie wszystko siê buduje i dzia³a (przynajmniej u mnie). Mam wielk± nadziejê, ¿e nic nie popsu³em/nie zapomnia³êm o jakich¶ plikach. Dawaæ znaæ w razie czego. Oprócz pluginów jest ca³kiem sporo innych zmian - parê funkcji przepisanych, jakies drobne poprawki w makefiles, kosmetyka... Jeszcze bêdzie trochê zmian w pluginowym kodzie, g³ownie odno¶nie gui chyba. No i nag³ówki do uporz±dkowania i wyodrêbnienia z nich cze¶ci do eksportu (niby SDK :]). Index: Makefile =================================================================== RCS file: /cvsroot/tleenx/tleenx2/iksemel/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile 24 Oct 2005 20:59:09 -0000 1.5 +++ Makefile 21 Mar 2006 00:00:09 -0000 1.6 @@ -1,5 +1,3 @@ - - CC = gcc CFLAGS = `pkg-config --cflags glib-2.0` -g -Wall -L/usr/local/lib -I/usr/local/include OBJS = convert.o iks.o ikspool.o jabber.o sha.o core.o iksid.o io.o parser.o \ @@ -7,6 +5,8 @@ all: $(OBJS) ar r libiksemel.a $(OBJS) +maintainer-clean: clean + distclean: clean clean: Index: sha.c =================================================================== RCS file: /cvsroot/tleenx/tleenx2/iksemel/sha.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- sha.c 24 Oct 2005 20:44:31 -0000 1.3 +++ sha.c 21 Mar 2006 00:00:09 -0000 1.4 @@ -85,7 +85,7 @@ for(i=0; i<5; i++) { - sprintf(hash, "%08lx", sha->hash[i]); + sprintf(hash, "%08x", sha->hash[i]); hash += 8; } } |
|
From: <es...@us...> - 2006-03-21 00:01:12
|
Update of /cvsroot/tleenx/tleenx2/jabby In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7472/jabby Modified Files: Makefile Log Message: Przez ostatnie kilka dni prawie nie rusza³em, a zaczynam ju¿ traciæ orientacjê powoli co by³o a co nie, wiêc wrzucam jak jest. Generalnie wszystko siê buduje i dzia³a (przynajmniej u mnie). Mam wielk± nadziejê, ¿e nic nie popsu³em/nie zapomnia³êm o jakich¶ plikach. Dawaæ znaæ w razie czego. Oprócz pluginów jest ca³kiem sporo innych zmian - parê funkcji przepisanych, jakies drobne poprawki w makefiles, kosmetyka... Jeszcze bêdzie trochê zmian w pluginowym kodzie, g³ownie odno¶nie gui chyba. No i nag³ówki do uporz±dkowania i wyodrêbnienia z nich cze¶ci do eksportu (niby SDK :]). Index: Makefile =================================================================== RCS file: /cvsroot/tleenx/tleenx2/jabby/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Makefile 2 Sep 2003 14:07:55 -0000 1.6 +++ Makefile 21 Mar 2006 00:00:09 -0000 1.7 @@ -13,6 +13,8 @@ libjabby: $(OBJS) ar r libjabby.a $(OBJS) +maintainer-clean: clean + distclean: clean clean: |
|
From: <es...@us...> - 2006-03-21 00:01:02
|
Update of /cvsroot/tleenx/tleenx2/plugins In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7472/plugins Added Files: Makefile.am README helloworld.c Log Message: Przez ostatnie kilka dni prawie nie rusza³em, a zaczynam ju¿ traciæ orientacjê powoli co by³o a co nie, wiêc wrzucam jak jest. Generalnie wszystko siê buduje i dzia³a (przynajmniej u mnie). Mam wielk± nadziejê, ¿e nic nie popsu³em/nie zapomnia³êm o jakich¶ plikach. Dawaæ znaæ w razie czego. Oprócz pluginów jest ca³kiem sporo innych zmian - parê funkcji przepisanych, jakies drobne poprawki w makefiles, kosmetyka... Jeszcze bêdzie trochê zmian w pluginowym kodzie, g³ownie odno¶nie gui chyba. No i nag³ówki do uporz±dkowania i wyodrêbnienia z nich cze¶ci do eksportu (niby SDK :]). --- NEW FILE: Makefile.am --- PLUGINS = helloworld.so CFLAGS = -g -Wall -O2 `pkg-config --cflags --libs glib-2.0 gtk+-2.0` SUFFIXES = .c .so all: $(PLUGINS) clean-local: rm -f *.so .c.so: $(CC) -shared $(CFLAGS) -I ../src/ -I ../jabby/ $< -o $@ install: $(mkinstalldirs) $(DESTDIR)$(libdir)/tleenx2/plugins/ cp *.so $(DESTDIR)$(libdir)/tleenx2/plugins/ --- NEW FILE: README --- --- NEW FILE: helloworld.c --- #include <gtk/gtk.h> #include "main.h" #include "plugins.h" #include "utils.h" #include "jabber.h" #include "users.h" //#include "tleenx2.h" void hello_preferences(); gint plugin_register(PluginInfo *p) { p->name = "Hello World"; p->version = "0.2"; p->desc = "Yes! it prints \"Hello World\" message. :]"; p->author = "Kamil Strzelecki"; p->prefs_func = hello_preferences; [...79 lines suppressed...] gchar *plugin_unload(PluginInfo *p) { gchar *s = "WyÅadowano plugin Hello World"; GtkWidget *dialog, *label; dialog = gtk_dialog_new_with_buttons( "Hello World shutdown", NULL, GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CLOSE, GTK_RESPONSE_NONE, NULL); label = gtk_label_new(s); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), label); g_signal_connect_swapped(dialog, "response", G_CALLBACK(gtk_widget_destroy), dialog); gtk_widget_show_all (dialog); return NULL; } |
|
From: <es...@us...> - 2006-03-20 23:16:53
|
Update of /cvsroot/tleenx/tleenx2/plugins In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22425/plugins Log Message: Directory /cvsroot/tleenx/tleenx2/plugins added to the repository |
