Menu
▾
▴
pidgin-commits — DO NOT USE. See https://pidgin.im/cgi-bin/mailman/listinfo/commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(106) |
Oct
(334) |
Nov
(246) |
Dec
(145) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(42) |
Feb
(53) |
Mar
(232) |
Apr
(109) |
May
(137) |
Jun
(63) |
Jul
(26) |
Aug
(263) |
Sep
(193) |
Oct
(507) |
Nov
(440) |
Dec
(241) |
| 2003 |
Jan
(567) |
Feb
(195) |
Mar
(504) |
Apr
(481) |
May
(524) |
Jun
(522) |
Jul
(594) |
Aug
(502) |
Sep
(643) |
Oct
(508) |
Nov
(430) |
Dec
(377) |
| 2004 |
Jan
(361) |
Feb
(251) |
Mar
(219) |
Apr
(499) |
May
(461) |
Jun
(419) |
Jul
(314) |
Aug
(519) |
Sep
(416) |
Oct
(247) |
Nov
(305) |
Dec
(382) |
| 2005 |
Jan
(267) |
Feb
(282) |
Mar
(327) |
Apr
(338) |
May
(189) |
Jun
(400) |
Jul
(462) |
Aug
(530) |
Sep
(316) |
Oct
(523) |
Nov
(481) |
Dec
(650) |
| 2006 |
Jan
(536) |
Feb
(361) |
Mar
(287) |
Apr
(146) |
May
(101) |
Jun
(169) |
Jul
(221) |
Aug
(498) |
Sep
(300) |
Oct
(236) |
Nov
(209) |
Dec
(205) |
| 2007 |
Jan
(30) |
Feb
(23) |
Mar
(26) |
Apr
(15) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <de...@us...> - 2006-10-18 16:43:32
|
Revision: 17521
http://svn.sourceforge.net/gaim/?rev=17521&view=rev
Author: deryni9
Date: 2006-10-18 08:45:22 -0700 (Wed, 18 Oct 2006)
Log Message:
-----------
Fix a couple of issues I ran into while running make distcheck. It still isn't
successfully completing but it is getting farther.
Right now I'm getting:
/usr/bin/xgettext: error while opening
"../../po/../gtk/plugins/crazychat/cc_gaim_plugin.c" for reading: No such file
or directory
ERROR: xgettext failed to generate PO template file. Please consult
error message above if there is any.
while in the /home/deryni/gaim/clean/gaim-2.0.0beta4/_build/po directory.
I think we either need to remove crazy chat from the po files or add it to
DIST_SUBDIRS, but I don't have time to test that right now.
Modified Paths:
--------------
trunk/Makefile.am
trunk/console/plugins/Makefile.am
trunk/gtk/plugins/perl/Makefile.am
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2006-10-18 15:27:38 UTC (rev 17520)
+++ trunk/Makefile.am 2006-10-18 15:45:22 UTC (rev 17521)
@@ -42,7 +42,7 @@
cp gaim.spec $(distdir)
rm $(distdir)/config.h
-distcheck-hook: libgaim/plugins/perl/common/Gaim.pm
+distcheck-hook: libgaim/plugins/perl/common/Gaim.pm gtk/plugins/perl/common/GtkUI.pm
# cp libgaim/plugins/perl/common/Gaim.pm $(distdir)/libgaim/plugins/perl/common
appsdir = $(datadir)/applications
Modified: trunk/console/plugins/Makefile.am
===================================================================
--- trunk/console/plugins/Makefile.am 2006-10-18 15:27:38 UTC (rev 17520)
+++ trunk/console/plugins/Makefile.am 2006-10-18 15:45:22 UTC (rev 17521)
@@ -28,6 +28,7 @@
-DVERSION=\"$(VERSION)\" \
-I$(top_builddir)/libgaim \
-I$(top_srcdir)/libgaim \
+ -I$(top_srcdir) \
-I$(top_srcdir)/console \
-I$(top_srcdir)/console/libgnt \
$(DEBUG_CFLAGS) \
Modified: trunk/gtk/plugins/perl/Makefile.am
===================================================================
--- trunk/gtk/plugins/perl/Makefile.am 2006-10-18 15:27:38 UTC (rev 17520)
+++ trunk/gtk/plugins/perl/Makefile.am 2006-10-18 15:45:22 UTC (rev 17521)
@@ -37,6 +37,11 @@
$(common_sources)
common/Makefile: common/Makefile.PL
+ @if test "x${top_srcdir}" != "x${top_builddir}"; then \
+ for f in ${common_sources}; do \
+ ${LN_S} -f ../${srcdir}/$$f $$f; \
+ done; \
+ fi
@cd common && $(perlpath) Makefile.PL $(PERL_MM_PARAMS)
common/Makefile.PL: common/Makefile.PL.in $(top_builddir)/config.status
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lsc...@us...> - 2006-10-18 16:42:59
|
Revision: 17525
http://svn.sourceforge.net/gaim/?rev=17525&view=rev
Author: lschiere
Date: 2006-10-18 09:42:53 -0700 (Wed, 18 Oct 2006)
Log Message:
-----------
a similar error, unless we want to ship ciphertest.c? in which case the correct fix would be to make sure we have it in the tarball...
Modified Paths:
--------------
trunk/po/POTFILES.in
Modified: trunk/po/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in 2006-10-18 16:31:31 UTC (rev 17524)
+++ trunk/po/POTFILES.in 2006-10-18 16:42:53 UTC (rev 17525)
@@ -97,7 +97,6 @@
libgaim/gconf/gaim.schemas.in
libgaim/log.c
libgaim/plugin.c
-libgaim/plugins/ciphertest.c
libgaim/plugins/dbus-example.c
libgaim/plugins/filectl.c
libgaim/plugins/idle.c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lsc...@us...> - 2006-10-18 16:31:35
|
Revision: 17524
http://svn.sourceforge.net/gaim/?rev=17524&view=rev
Author: lschiere
Date: 2006-10-18 09:31:31 -0700 (Wed, 18 Oct 2006)
Log Message:
-----------
(11:52:24) nosnilmot: files that are not DIST'ed should not be in POTFILES.in
(11:52:36) nosnilmot: such as gtk/plugins/crazychat/cc_gaim_plugin.c :)
(12:29:41) LSchiere: nosnilmot: so I should remove it from POTFILES.in? or add it to the DIST SUBDIRs for plugins?
(12:30:14) nosnilmot: I think remove it from POTFILES.in, I don't think crazy chat is shippable
Modified Paths:
--------------
trunk/po/POTFILES.in
Modified: trunk/po/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in 2006-10-18 16:28:51 UTC (rev 17523)
+++ trunk/po/POTFILES.in 2006-10-18 16:31:31 UTC (rev 17524)
@@ -61,7 +61,6 @@
gtk/gtkwhiteboard.c
gtk/plugins/cap/cap.c
gtk/plugins/contact_priority.c
-gtk/plugins/crazychat/cc_gaim_plugin.c
gtk/plugins/docklet/docklet.c
gtk/plugins/extplacement.c
gtk/plugins/gaiminc.c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <may...@us...> - 2006-10-18 16:28:59
|
Revision: 17523
http://svn.sourceforge.net/gaim/?rev=17523&view=rev
Author: mayuan2006
Date: 2006-10-18 09:28:51 -0700 (Wed, 18 Oct 2006)
Log Message:
-----------
accurate with the Offline Message send's Fault Code recognize and resend the OIM Get Message.
committed by MaYuan<may...@gm...>
Modified Paths:
--------------
branches/soc-2006-msnp13/src/protocols/msn/msg.c
branches/soc-2006-msnp13/src/protocols/msn/notification.c
branches/soc-2006-msnp13/src/protocols/msn/oim.c
Modified: branches/soc-2006-msnp13/src/protocols/msn/msg.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/msg.c 2006-10-18 15:53:26 UTC (rev 17522)
+++ branches/soc-2006-msnp13/src/protocols/msn/msg.c 2006-10-18 16:28:51 UTC (rev 17523)
@@ -215,7 +215,7 @@
char **elems, **cur, **tokens;
g_return_if_fail(payload != NULL);
- gaim_debug_info("MaYuan","payload:{%s}\n",payload);
+// gaim_debug_info("MaYuan","payload:{%s}\n",payload);
tmp_base = tmp = g_malloc0(payload_len + 1);
memcpy(tmp_base, payload, payload_len);
Modified: branches/soc-2006-msnp13/src/protocols/msn/notification.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/notification.c 2006-10-18 15:53:26 UTC (rev 17522)
+++ branches/soc-2006-msnp13/src/protocols/msn/notification.c 2006-10-18 16:28:51 UTC (rev 17523)
@@ -1409,7 +1409,7 @@
const char *passport, *psm_str;
/*get the payload content*/
- gaim_debug_info("MaYuan","UBX {%s} payload{%s}\n",cmd->params[0], cmd->payload);
+// gaim_debug_info("MaYuan","UBX {%s} payload{%s}\n",cmd->params[0], cmd->payload);
session = cmdproc->session;
account = session->account;
Modified: branches/soc-2006-msnp13/src/protocols/msn/oim.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/oim.c 2006-10-18 15:53:26 UTC (rev 17522)
+++ branches/soc-2006-msnp13/src/protocols/msn/oim.c 2006-10-18 16:28:51 UTC (rev 17523)
@@ -157,8 +157,10 @@
void
msn_oim_send_process(MsnOim *oim,char *body,int len)
{
- xmlnode *responseNode,*bodyNode,*faultNode;
+ xmlnode *responseNode,*bodyNode;
+ xmlnode *faultNode,*faultCodeNode,*faultstringNode;
xmlnode *detailNode,*challengeNode;
+ char *faultCodeStr,*faultstring;
char *challenge;
responseNode = xmlnode_from_str(body,len);
@@ -178,18 +180,43 @@
return;
}
/*get the challenge,and repost it*/
+ faultCodeNode = xmlnode_get_child(faultNode,"faultcode");
+ if(faultCodeNode == NULL){
+ gaim_debug_info("MaYuan","faultcode Node is NULL\n");
+ goto oim_send_process_fail;
+ }
+ faultCodeStr = xmlnode_get_data(faultCodeNode);
+ gaim_debug_info("MaYuan","fault code:{%s}\n",faultCodeStr);
+
+ if(strcmp(faultCodeStr,"q0:AuthenticationFailed")){
+ /*other Fault Reason?*/
+ goto oim_send_process_fail;
+ }
+
+ faultstringNode = xmlnode_get_child(faultNode,"faultstring");
+ faultstring = xmlnode_get_data(faultstringNode);
+ gaim_debug_info("MaYuan","fault string :{%s}\n",faultstring);
+
+ /* lock key fault reason,
+ * compute the challenge and resend it
+ */
detailNode = xmlnode_get_child(faultNode, "detail");
+ if(detailNode == NULL){
+ goto oim_send_process_fail;
+ }
challengeNode = xmlnode_get_child(detailNode,"LockKeyChallenge");
g_free(oim->challenge);
oim->challenge = xmlnode_get_data(challengeNode);
gaim_debug_info("MaYuan","lockkey:{%s}\n",oim->challenge);
- xmlnode_free(responseNode);
-
/*repost the send*/
gaim_debug_info("MaYuan","prepare to repost the send...\n");
msn_oim_send_msg(oim);
+
+oim_send_process_fail:
+ xmlnode_free(responseNode);
+ return ;
}
static void
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2006-10-18 15:57:35
|
Revision: 17522
http://svn.sourceforge.net/gaim/?rev=17522&view=rev
Author: deryni9
Date: 2006-10-18 08:53:26 -0700 (Wed, 18 Oct 2006)
Log Message:
-----------
Here's my NEWS, I'm off for the day, happy release everybody.
Modified Paths:
--------------
trunk/NEWS
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2006-10-18 15:45:22 UTC (rev 17521)
+++ trunk/NEWS 2006-10-18 15:53:26 UTC (rev 17522)
@@ -12,6 +12,10 @@
Nathan: I don't have much to say, but yay for another beta!
+ Etan: I did a bunch of perl work for this beta again, there is now
+ some support for perl scripts to call functions in the gtk ui, it
+ still needs work.
+
2.0.0beta3 (03/25/2006):
Mark: Yeah, I know, another beta. Don't worry, we'll get this
puppy out the door eventually.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-10-18 15:27:50
|
Revision: 17520
http://svn.sourceforge.net/gaim/?rev=17520&view=rev
Author: thekingant
Date: 2006-10-18 08:27:38 -0700 (Wed, 18 Oct 2006)
Log Message:
-----------
This is no longer an issue as of datallah's commit,
revision #17509
Revision Links:
--------------
http://svn.sourceforge.net/gaim/?rev=17509&view=rev
Modified Paths:
--------------
trunk/libgaim/protocols/msn/user.c
Modified: trunk/libgaim/protocols/msn/user.c
===================================================================
--- trunk/libgaim/protocols/msn/user.c 2006-10-18 06:02:39 UTC (rev 17519)
+++ trunk/libgaim/protocols/msn/user.c 2006-10-18 15:27:38 UTC (rev 17520)
@@ -55,12 +55,6 @@
{
g_return_if_fail(user != NULL);
- /*
- * TODO: If any GaimBuddy->proto_data pointers point to this
- * MsnUser then set them to NULL. Or possibly even better,
- * don't set GaimBuddy->proto_data in the first place.
- */
-
if (user->clientcaps != NULL)
g_hash_table_destroy(user->clientcaps);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fac...@us...> - 2006-10-18 06:02:42
|
Revision: 17519
http://svn.sourceforge.net/gaim/?rev=17519&view=rev
Author: faceprint
Date: 2006-10-17 23:02:39 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
b4
Modified Paths:
--------------
trunk/NEWS
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2006-10-18 05:03:15 UTC (rev 17518)
+++ trunk/NEWS 2006-10-18 06:02:39 UTC (rev 17519)
@@ -10,6 +10,8 @@
using libao for sound! There are no doubt bugs here, but hopefully
nothing major.
+ Nathan: I don't have much to say, but yay for another beta!
+
2.0.0beta3 (03/25/2006):
Mark: Yeah, I know, another beta. Don't worry, we'll get this
puppy out the door eventually.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2006-10-18 05:03:18
|
Revision: 17518
http://svn.sourceforge.net/gaim/?rev=17518&view=rev
Author: deryni9
Date: 2006-10-17 22:03:15 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
Does this work better? Not that I'm really sure what this was for nor think
that it does anything at this point, but I'll deal with that later.
Modified Paths:
--------------
trunk/Makefile.am
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2006-10-18 04:39:59 UTC (rev 17517)
+++ trunk/Makefile.am 2006-10-18 05:03:15 UTC (rev 17518)
@@ -42,8 +42,8 @@
cp gaim.spec $(distdir)
rm $(distdir)/config.h
-distcheck-hook: plugins/perl/common/Gaim.pm
-# cp plugins/perl/common/Gaim.pm $(distdir)/plugins/perl/common
+distcheck-hook: libgaim/plugins/perl/common/Gaim.pm
+# cp libgaim/plugins/perl/common/Gaim.pm $(distdir)/libgaim/plugins/perl/common
appsdir = $(datadir)/applications
apps_in_files = gaim.desktop.in
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-10-18 04:40:05
|
Revision: 17517
http://svn.sourceforge.net/gaim/?rev=17517&view=rev
Author: sadrul
Date: 2006-10-17 21:39:59 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
Patch from Richard Nelson (wabz). This is not necessary right now, but it's
probably going to be necessary for workspaces (wabz is doing a WM for that).
Modified Paths:
--------------
trunk/console/libgnt/gntmain.c
Modified: trunk/console/libgnt/gntmain.c
===================================================================
--- trunk/console/libgnt/gntmain.c 2006-10-18 04:21:10 UTC (rev 17516)
+++ trunk/console/libgnt/gntmain.c 2006-10-18 04:39:59 UTC (rev 17517)
@@ -271,8 +271,7 @@
GNT_WIDGET_UNSET_FLAGS(w, GNT_WIDGET_URGENT);
if (wm.window_update) {
GntNode *node = g_hash_table_lookup(nodes, w);
- if (node)
- wm.window_update(node->panel, w);
+ wm.window_update(node ? node->panel : NULL, w);
}
} else if (GNT_WIDGET_IS_FLAG_SET(w, GNT_WIDGET_URGENT)) {
/* This is a window with the URGENT hint set */
@@ -1318,7 +1317,7 @@
if (wm.window_update) {
GntNode *node = g_hash_table_lookup(nodes, widget);
- wm.window_update(node->panel, widget);
+ wm.window_update(node ? node->panel : NULL, widget);
}
draw_taskbar(FALSE);
@@ -1382,7 +1381,7 @@
if (wm.window_update) {
GntNode *node = g_hash_table_lookup(nodes, widget);
- wm.window_update(node->panel, widget);
+ wm.window_update(node ? node->panel : NULL, widget);
}
draw_taskbar(FALSE);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-10-18 04:21:17
|
Revision: 17516
http://svn.sourceforge.net/gaim/?rev=17516&view=rev
Author: sadrul
Date: 2006-10-17 21:21:10 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
Memleak fixes in gtkimhtml. Thanks to henningn for reporting exactly where the leaks were happening.
Modified Paths:
--------------
trunk/gtk/gtkimhtml.c
Modified: trunk/gtk/gtkimhtml.c
===================================================================
--- trunk/gtk/gtkimhtml.c 2006-10-18 04:15:43 UTC (rev 17515)
+++ trunk/gtk/gtkimhtml.c 2006-10-18 04:21:10 UTC (rev 17516)
@@ -2599,23 +2599,21 @@
if (font->face && (imhtml->format_functions & GTK_IMHTML_FACE)) {
gtk_imhtml_toggle_fontface(imhtml, NULL);
- g_free (font->face);
}
+ g_free (font->face);
if (font->fore && (imhtml->format_functions & GTK_IMHTML_FORECOLOR)) {
gtk_imhtml_toggle_forecolor(imhtml, NULL);
- g_free (font->fore);
}
+ g_free (font->fore);
if (font->back && (imhtml->format_functions & GTK_IMHTML_BACKCOLOR)) {
gtk_imhtml_toggle_backcolor(imhtml, NULL);
- g_free (font->back);
}
- if (font->sml)
- g_free (font->sml);
+ g_free (font->back);
+ g_free (font->sml);
if ((font->size != 3) && (imhtml->format_functions & (GTK_IMHTML_GROW|GTK_IMHTML_SHRINK)))
gtk_imhtml_font_set_size(imhtml, 3);
-
fonts = g_slist_remove (fonts, font);
g_free(font);
@@ -2680,17 +2678,20 @@
if (color && !(options & GTK_IMHTML_NO_COLOURS) && (imhtml->format_functions & GTK_IMHTML_FORECOLOR)) {
font->fore = color;
gtk_imhtml_toggle_forecolor(imhtml, font->fore);
- }
+ } else
+ g_free(color);
if (back && !(options & GTK_IMHTML_NO_COLOURS) && (imhtml->format_functions & GTK_IMHTML_BACKCOLOR)) {
font->back = back;
gtk_imhtml_toggle_backcolor(imhtml, font->back);
- }
+ } else
+ g_free(back);
if (face && !(options & GTK_IMHTML_NO_FONTS) && (imhtml->format_functions & GTK_IMHTML_FACE)) {
font->face = face;
gtk_imhtml_toggle_fontface(imhtml, font->face);
- }
+ } else
+ g_free(face);
if (sml)
font->sml = sml;
@@ -2706,7 +2707,7 @@
font->size = MAX (0, 3 - font->size);
} else if (isdigit (*size)) {
sscanf (size, "%hd", &font->size);
- }
+ }
if (font->size > 100)
font->size = 100;
} else if (oldfont)
@@ -2729,7 +2730,8 @@
g_free(bg);
bg = bgcolor;
gtk_imhtml_toggle_background(imhtml, bg);
- }
+ } else
+ g_free(bgcolor);
}
break;
case 45: /* A (opt) */
@@ -2809,29 +2811,32 @@
if (fonts)
oldfont = fonts->data;
- if (color && !(options & GTK_IMHTML_NO_COLOURS) && (imhtml->format_functions & GTK_IMHTML_FORECOLOR))
- {
+ if (color && !(options & GTK_IMHTML_NO_COLOURS) && (imhtml->format_functions & GTK_IMHTML_FORECOLOR)) {
font->fore = color;
gtk_imhtml_toggle_forecolor(imhtml, font->fore);
+ } else {
+ if (oldfont && oldfont->fore)
+ font->fore = g_strdup(oldfont->fore);
+ g_free(color);
}
- else if (oldfont && oldfont->fore)
- font->fore = g_strdup(oldfont->fore);
- if (background && !(options & GTK_IMHTML_NO_COLOURS) && (imhtml->format_functions & GTK_IMHTML_BACKCOLOR))
- {
+ if (background && !(options & GTK_IMHTML_NO_COLOURS) && (imhtml->format_functions & GTK_IMHTML_BACKCOLOR)) {
font->back = background;
gtk_imhtml_toggle_backcolor(imhtml, font->back);
+ } else {
+ if (oldfont && oldfont->back)
+ font->back = g_strdup(oldfont->back);
+ g_free(background);
}
- else if (oldfont && oldfont->back)
- font->back = g_strdup(oldfont->back);
- if (family && !(options & GTK_IMHTML_NO_FONTS) && (imhtml->format_functions & GTK_IMHTML_FACE))
- {
+ if (family && !(options & GTK_IMHTML_NO_FONTS) && (imhtml->format_functions & GTK_IMHTML_FACE)) {
font->face = family;
gtk_imhtml_toggle_fontface(imhtml, font->face);
+ } else {
+ if (oldfont && oldfont->face)
+ font->face = g_strdup(oldfont->face);
+ g_free(family);
}
- else if (oldfont && oldfont->face)
- font->face = g_strdup(oldfont->face);
if (font->face && (atoi(font->face) > 100)) {
/* WTF is this? */
/* Maybe it sets a max size on the font face? I seem to
@@ -2878,7 +2883,8 @@
{
gtk_imhtml_toggle_underline(imhtml);
font->underline = 1;
- }
+ } else
+ g_free(textdec);
if (oldfont)
{
@@ -2906,6 +2912,7 @@
{
gtk_imhtml_toggle_bold(imhtml);
}
+ g_free(weight);
}
g_free(style);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-10-18 04:15:56
|
Revision: 17515
http://svn.sourceforge.net/gaim/?rev=17515&view=rev
Author: datallah
Date: 2006-10-17 21:15:43 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
Don't include the qq smileys in wingaim.
Modified Paths:
--------------
trunk/gtk/pixmaps/smileys/default/Makefile.mingw
trunk/gtk/pixmaps/status/default/Makefile.mingw
Modified: trunk/gtk/pixmaps/smileys/default/Makefile.mingw
===================================================================
--- trunk/gtk/pixmaps/smileys/default/Makefile.mingw 2006-10-18 04:07:47 UTC (rev 17514)
+++ trunk/gtk/pixmaps/smileys/default/Makefile.mingw 2006-10-18 04:15:43 UTC (rev 17515)
@@ -12,9 +12,11 @@
.PHONY: install
+#Exclude 132k of qq smileys that aren't used on wingaim
install:
if test '$(gaimsmileypix_DATA)'; then \
mkdir -p $(gaimsmileypixdir); \
cp $(gaimsmileypix_DATA) $(gaimsmileypixdir); \
+ rm -f $(gaimsmileypixdir)/qq_*; \
fi;
Modified: trunk/gtk/pixmaps/status/default/Makefile.mingw
===================================================================
--- trunk/gtk/pixmaps/status/default/Makefile.mingw 2006-10-18 04:07:47 UTC (rev 17514)
+++ trunk/gtk/pixmaps/status/default/Makefile.mingw 2006-10-18 04:15:43 UTC (rev 17515)
@@ -10,9 +10,11 @@
datadir = $(GAIM_INSTALL_DIR)
include ./Makefile.am
+#Exclude 264k of qq icons that aren't used on wingaim
install:
if test '$(gaimstatuspix_DATA)'; then \
mkdir -p $(gaimstatuspixdir); \
cp $(gaimstatuspix_DATA) $(gaimstatuspixdir); \
+ rm -f $(gaimstatuspixdir)/qq*; \
fi;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lsc...@us...> - 2006-10-18 04:07:50
|
Revision: 17514
http://svn.sourceforge.net/gaim/?rev=17514&view=rev
Author: lschiere
Date: 2006-10-17 21:07:47 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
lets release
Modified Paths:
--------------
trunk/NEWS
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2006-10-18 04:02:43 UTC (rev 17513)
+++ trunk/NEWS 2006-10-18 04:07:47 UTC (rev 17514)
@@ -2,9 +2,14 @@
2.0.0beta4 (10/17/2006)
Sean: Still beta. Maybe the next one should be a gamma.. :)
+
Daniel: I'm super chuffed to announce that this will work with newer
(i.e. >= 2.8.0) versions of GTK+ on Windows.
+ Luke: Several significant changes in this one, including no longer
+ using libao for sound! There are no doubt bugs here, but hopefully
+ nothing major.
+
2.0.0beta3 (03/25/2006):
Mark: Yeah, I know, another beta. Don't worry, we'll get this
puppy out the door eventually.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-10-18 04:02:47
|
Revision: 17513
http://svn.sourceforge.net/gaim/?rev=17513&view=rev
Author: sadrul
Date: 2006-10-17 21:02:43 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
Changelog the change in gaim_find_buddies.
Modified Paths:
--------------
trunk/ChangeLog.API
Modified: trunk/ChangeLog.API
===================================================================
--- trunk/ChangeLog.API 2006-10-18 04:00:27 UTC (rev 17512)
+++ trunk/ChangeLog.API 2006-10-18 04:02:43 UTC (rev 17513)
@@ -134,6 +134,8 @@
create) a default gtkxfer dialog.
* CHAT_USERS_BUDDY_COLUMN became CHAT_USERS_WEIGHT_COLUMN, along with
a change in the values stored in the column.
+ * gaim_find_buddies() returns a list of all buddies in the account if name
+ is NULL.
Removed:
* gaim_gtk_sound_{get,set}_mute() (replaced by the /gaim/gtk/sound/mute
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-10-18 04:00:35
|
Revision: 17512
http://svn.sourceforge.net/gaim/?rev=17512&view=rev
Author: sadrul
Date: 2006-10-17 21:00:27 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
Rocking patch (#1574228) from Richard Nelson (wabz) to fix the behaviour of the
status-windows for transient statuses. I butchered it a little, and might have
broke something in the process. I take the blames if this causes any problems.
Modified Paths:
--------------
trunk/console/gntstatus.c
trunk/console/libgnt/gnttree.c
trunk/console/libgnt/gnttree.h
Modified: trunk/console/gntstatus.c
===================================================================
--- trunk/console/gntstatus.c 2006-10-18 03:57:50 UTC (rev 17511)
+++ trunk/console/gntstatus.c 2006-10-18 04:00:27 UTC (rev 17512)
@@ -56,12 +56,19 @@
typedef struct
{
+ GaimAccount *account;
+ const GaimStatusType *type;
+ char *message;
+} RowInfo;
+
+typedef struct
+{
GntWidget *window;
GntWidget *type;
GntWidget *message;
EditStatus *parent;
- GaimAccount *account;
+ RowInfo *key;
} EditSubStatus;
static GList *edits; /* List of opened edit-status dialogs */
@@ -213,15 +220,38 @@
}
static void
+free_key(gpointer key, gpointer n)
+{
+ RowInfo *row = key;
+ g_free(row->message);
+ g_free(key);
+}
+
+
+static void
update_edit_list(GntWidget *widget, EditStatus *edit)
{
edits = g_list_remove(edits, edit);
gaim_notify_close_with_handle(edit);
g_hash_table_foreach(edit->hash, (GHFunc)destroy_substatus_win, NULL);
+ g_list_foreach((GList*)gnt_tree_get_rows(GNT_TREE(edit->tree)), free_key, NULL);
g_free(edit);
}
static void
+set_substatuses(EditStatus *edit)
+{
+ const GList *iter;
+ for (iter = gnt_tree_get_rows(GNT_TREE(edit->tree)); iter; iter = iter->next) {
+ RowInfo *key = iter->data;
+ if (gnt_tree_get_choice(GNT_TREE(edit->tree), key)) {
+ gaim_savedstatus_set_substatus(edit->saved, key->account, key->type, key->message);
+ }
+ }
+}
+
+
+static void
use_trans_status_cb(GntWidget *button, EditStatus *edit)
{
const char *message;
@@ -234,6 +264,8 @@
saved = gaim_savedstatus_find_transient_by_type_and_message(prim, message);
if (saved == NULL) {
saved = gaim_savedstatus_new(NULL, prim);
+ edit->saved = saved;
+ set_substatuses(edit);
}
gaim_savedstatus_set_message(saved, message);
gaim_savedstatus_activate(saved);
@@ -273,6 +305,7 @@
{
edit->saved = gaim_savedstatus_new(title, prim);
gaim_savedstatus_set_message(edit->saved, message);
+ set_substatuses(edit);
if (statuses.tree)
gnt_tree_add_row_last(GNT_TREE(statuses.tree), edit->saved,
gnt_tree_create_row(GNT_TREE(statuses.tree), title,
@@ -304,33 +337,39 @@
char *name;
const char *type = NULL, *message = NULL;
GaimSavedStatusSub *sub = NULL;
+ RowInfo *key;
if (!edit || !edit->tree)
return;
if (edit->saved)
sub = gaim_savedstatus_get_substatus(edit->saved, account);
-
+
+ key = g_new0(RowInfo, 1);
+ key->account = account;
+
if (sub)
{
- type = gaim_status_type_get_name(gaim_savedstatus_substatus_get_type(sub));
+ key->type = gaim_savedstatus_substatus_get_type(sub);
+ type = gaim_status_type_get_name(key->type);
message = gaim_savedstatus_substatus_get_message(sub);
+ key->message = g_strdup(message);
}
name = g_strdup_printf("%s (%s)", gaim_account_get_username(account),
gaim_account_get_protocol_name(account));
- gnt_tree_add_choice(GNT_TREE(edit->tree), account,
+ gnt_tree_add_choice(GNT_TREE(edit->tree), key,
gnt_tree_create_row(GNT_TREE(edit->tree), name, type, message), NULL, NULL);
if (sub)
- gnt_tree_set_choice(GNT_TREE(edit->tree), account, TRUE);
+ gnt_tree_set_choice(GNT_TREE(edit->tree), key, TRUE);
g_free(name);
}
static void
substatus_window_destroy_cb(GntWidget *window, EditSubStatus *sub)
{
- g_hash_table_remove(sub->parent->hash, sub->account);
+ g_hash_table_remove(sub->parent->hash, sub->key->account);
g_free(sub);
}
@@ -338,19 +377,23 @@
save_substatus_cb(GntWidget *widget, EditSubStatus *sub)
{
GaimSavedStatus *saved = sub->parent->saved;
- GaimAccount *account = sub->account;
+ RowInfo *row = sub->key;
const char *message;
GaimStatusType *type;
type = gnt_combo_box_get_selected_data(GNT_COMBO_BOX(sub->type));
message = gnt_entry_get_text(GNT_ENTRY(sub->message));
- gaim_savedstatus_set_substatus(saved, account, type, message);
+ row->type = type;
+ row->message = g_strdup(message);
- gnt_tree_set_choice(GNT_TREE(sub->parent->tree), account, TRUE);
- gnt_tree_change_text(GNT_TREE(sub->parent->tree), account, 1,
+ if (saved) /* Save the substatus if the savedstatus actually exists. */
+ gaim_savedstatus_set_substatus(saved, row->account, type, message);
+
+ gnt_tree_set_choice(GNT_TREE(sub->parent->tree), row, TRUE);
+ gnt_tree_change_text(GNT_TREE(sub->parent->tree), row, 1,
gaim_status_type_get_name(type));
- gnt_tree_change_text(GNT_TREE(sub->parent->tree), account, 2, message);
+ gnt_tree_change_text(GNT_TREE(sub->parent->tree), row, 2, message);
gnt_widget_destroy(sub->window);
}
@@ -365,11 +408,16 @@
GaimSavedStatusSub *substatus = NULL;
const GList *iter;
char *name;
- GaimAccount *account = gnt_tree_get_selection_data(tree);
+ RowInfo *selected = gnt_tree_get_selection_data(tree);
+ GaimAccount *account = selected->account;
- if (gnt_tree_get_choice(tree, account))
+ if (gnt_tree_get_choice(tree, selected))
{
/* There was a savedstatus for this account. Now remove it. */
+ g_free(selected->message);
+ selected->type = NULL;
+ selected->message = NULL;
+ /* XXX: should we really be saving it right now? */
gaim_savedstatus_unset_substatus(edit->saved, account);
gnt_tree_change_text(tree, account, 1, NULL);
gnt_tree_change_text(tree, account, 2, NULL);
@@ -384,7 +432,7 @@
sub = g_new0(EditSubStatus, 1);
sub->parent = edit;
- sub->account = account;
+ sub->key = selected;
sub->window = window = gnt_vbox_new(FALSE);
gnt_box_set_toplevel(GNT_BOX(window), TRUE);
Modified: trunk/console/libgnt/gnttree.c
===================================================================
--- trunk/console/libgnt/gnttree.c 2006-10-18 03:57:50 UTC (rev 17511)
+++ trunk/console/libgnt/gnttree.c 2006-10-18 04:00:27 UTC (rev 17512)
@@ -795,6 +795,11 @@
return ret;
}
+const GList *gnt_tree_get_rows(GntTree *tree)
+{
+ return tree->list;
+}
+
void gnt_tree_scroll(GntTree *tree, int count)
{
GntTreeRow *row;
Modified: trunk/console/libgnt/gnttree.h
===================================================================
--- trunk/console/libgnt/gnttree.h 2006-10-18 03:57:50 UTC (rev 17511)
+++ trunk/console/libgnt/gnttree.h 2006-10-18 04:00:27 UTC (rev 17512)
@@ -88,6 +88,8 @@
GList *gnt_tree_get_selection_text_list(GntTree *tree);
+const GList *gnt_tree_get_rows(GntTree *tree);
+
void gnt_tree_remove(GntTree *tree, gpointer key);
void gnt_tree_remove_all(GntTree *tree);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-10-18 03:57:55
|
Revision: 17511
http://svn.sourceforge.net/gaim/?rev=17511&view=rev
Author: datallah
Date: 2006-10-17 20:57:50 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
I'm feeling newsy
Modified Paths:
--------------
trunk/NEWS
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2006-10-18 03:51:12 UTC (rev 17510)
+++ trunk/NEWS 2006-10-18 03:57:50 UTC (rev 17511)
@@ -2,6 +2,8 @@
2.0.0beta4 (10/17/2006)
Sean: Still beta. Maybe the next one should be a gamma.. :)
+ Daniel: I'm super chuffed to announce that this will work with newer
+ (i.e. >= 2.8.0) versions of GTK+ on Windows.
2.0.0beta3 (03/25/2006):
Mark: Yeah, I know, another beta. Don't worry, we'll get this
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sea...@us...> - 2006-10-18 03:51:14
|
Revision: 17510
http://svn.sourceforge.net/gaim/?rev=17510&view=rev
Author: seanegan
Date: 2006-10-17 20:51:12 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
beta4
Modified Paths:
--------------
trunk/NEWS
trunk/configure.ac
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2006-10-18 03:32:14 UTC (rev 17509)
+++ trunk/NEWS 2006-10-18 03:51:12 UTC (rev 17510)
@@ -1,5 +1,8 @@
-=[ Gaim ]=- The Pimpin' Penguin IM Client That's Good For The Soul!
+2.0.0beta4 (10/17/2006)
+ Sean: Still beta. Maybe the next one should be a gamma.. :)
+
2.0.0beta3 (03/25/2006):
Mark: Yeah, I know, another beta. Don't worry, we'll get this
puppy out the door eventually.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-10-18 03:32:14 UTC (rev 17509)
+++ trunk/configure.ac 2006-10-18 03:51:12 UTC (rev 17510)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([gaim], [2.0.0dev], [gai...@li...])
+AC_INIT([gaim], [2.0.0beta4], [gai...@li...])
AC_CANONICAL_SYSTEM
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-10-18 03:32:21
|
Revision: 17509
http://svn.sourceforge.net/gaim/?rev=17509&view=rev
Author: datallah
Date: 2006-10-17 20:32:14 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
Fix the situation (I think it will only happen while shutting down) where GaimBuddy->proto_data could be accessed after it is freed.
Specifically, it happened when gtkblist was requesting the emblems from the msn prpl.
Big thanks to henningn for noticing the funkiness in valgrind.
I discovered that there is no function to retrieve all the buddies for an account (shock, horror) - so I modified gaim_find_buddies() to return all the account buddies if "name" is NULL.
Modified Paths:
--------------
trunk/libgaim/blist.c
trunk/libgaim/blist.h
trunk/libgaim/connection.c
Modified: trunk/libgaim/blist.c
===================================================================
--- trunk/libgaim/blist.c 2006-10-18 03:27:43 UTC (rev 17508)
+++ trunk/libgaim/blist.c 2006-10-18 03:32:14 UTC (rev 17509)
@@ -65,6 +65,11 @@
return gaim_blist_get_last_sibling(node->child);
}
+struct _list_account_buddies {
+ GSList *list;
+ GaimAccount *account;
+};
+
struct _gaim_hbuddy {
char *name;
GaimAccount *account;
@@ -2119,26 +2124,46 @@
return ret;
}
+static void find_acct_buddies(gpointer key, gpointer value, gpointer data)
+{
+ struct _gaim_hbuddy *hb = key;
+ GaimBuddy *buddy = value;
+ struct _list_account_buddies *ab = data;
+
+ if (hb->account == ab->account) {
+ ab->list = g_slist_prepend(ab->list, buddy);
+ }
+}
+
GSList *gaim_find_buddies(GaimAccount *account, const char *name)
{
- struct buddy *buddy;
- struct _gaim_hbuddy hb;
+ GaimBuddy *buddy;
GaimBlistNode *node;
GSList *ret = NULL;
g_return_val_if_fail(gaimbuddylist != NULL, NULL);
g_return_val_if_fail(account != NULL, NULL);
- g_return_val_if_fail((name != NULL) && (*name != '\0'), NULL);
- hb.name = g_strdup(gaim_normalize(account, name));
- hb.account = account;
- for (node = gaimbuddylist->root; node != NULL; node = node->next) {
- hb.group = node;
- if ((buddy = g_hash_table_lookup(gaimbuddylist->buddies, &hb)) != NULL)
- ret = g_slist_append(ret, buddy);
+ if ((name != NULL) && (*name != '\0')) {
+ struct _gaim_hbuddy hb;
+
+ hb.name = g_strdup(gaim_normalize(account, name));
+ hb.account = account;
+
+ for (node = gaimbuddylist->root; node != NULL; node = node->next) {
+ hb.group = node;
+ if ((buddy = g_hash_table_lookup(gaimbuddylist->buddies, &hb)) != NULL)
+ ret = g_slist_prepend(ret, buddy);
+ }
+ g_free(hb.name);
+ } else {
+ struct _list_account_buddies *ab = g_new0(struct _list_account_buddies, 1);
+ ab->account = account;
+ g_hash_table_foreach(gaimbuddylist->buddies, find_acct_buddies, ab);
+ ret = ab->list;
+ g_free(ab);
}
- g_free(hb.name);
return ret;
}
Modified: trunk/libgaim/blist.h
===================================================================
--- trunk/libgaim/blist.h 2006-10-18 03:27:43 UTC (rev 17508)
+++ trunk/libgaim/blist.h 2006-10-18 03:32:14 UTC (rev 17509)
@@ -616,7 +616,7 @@
* Finds all GaimBuddy structs given a screenname and an account
*
* @param account The account this buddy belongs to
- * @param name The buddy's screenname
+ * @param name The buddy's screenname (or NULL to return all buddies in the account)
*
* @return A GSList of buddies (which must be freed), or NULL if the buddy doesn't exist
*/
Modified: trunk/libgaim/connection.c
===================================================================
--- trunk/libgaim/connection.c 2006-10-18 03:27:43 UTC (rev 17508)
+++ trunk/libgaim/connection.c 2006-10-18 03:32:14 UTC (rev 17509)
@@ -160,6 +160,7 @@
gaim_connection_destroy(GaimConnection *gc)
{
GaimAccount *account;
+ GSList *buddies, *tmp;
#if 0
GList *wins;
#endif
@@ -195,6 +196,14 @@
(prpl_info->close)(gc);
}
+ /* Clear out the proto data that was freed in the prpl close method*/
+ buddies = gaim_find_buddies(account, NULL);
+ for (tmp = buddies; tmp; tmp = tmp->next) {
+ GaimBuddy *buddy = tmp->data;
+ buddy->proto_data = NULL;
+ }
+ g_slist_free(buddies);
+
connections = g_list_remove(connections, gc);
gaim_connection_set_state(gc, GAIM_DISCONNECTED);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sea...@us...> - 2006-10-18 03:27:47
|
Revision: 17508
http://svn.sourceforge.net/gaim/?rev=17508&view=rev
Author: seanegan
Date: 2006-10-17 20:27:43 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
docklet conversion fixes from charkins. Thanks
Modified Paths:
--------------
trunk/gtk/gtkdocklet-x11.c
trunk/gtk/gtkdocklet.c
trunk/gtk/win32/gtkdocklet-win32.c
Modified: trunk/gtk/gtkdocklet-x11.c
===================================================================
--- trunk/gtk/gtkdocklet-x11.c 2006-10-18 02:16:50 UTC (rev 17507)
+++ trunk/gtk/gtkdocklet-x11.c 2006-10-18 03:27:43 UTC (rev 17508)
@@ -56,7 +56,7 @@
static void
docklet_x11_embedded_cb(GtkWidget *widget, void *data)
{
- gaim_debug(GAIM_DEBUG_INFO, "tray icon", "embedded\n");
+ gaim_debug(GAIM_DEBUG_INFO, "docklet", "embedded\n");
g_source_remove(embed_timeout);
embed_timeout = 0;
@@ -66,7 +66,7 @@
static void
docklet_x11_destroyed_cb(GtkWidget *widget, void *data)
{
- gaim_debug(GAIM_DEBUG_INFO, "tray icon", "destroyed\n");
+ gaim_debug(GAIM_DEBUG_INFO, "docklet", "destroyed\n");
gaim_gtk_docklet_remove();
@@ -222,7 +222,7 @@
image = NULL;
- gaim_debug(GAIM_DEBUG_INFO, "tray icon", "destroyed\n");
+ gaim_debug(GAIM_DEBUG_INFO, "docklet", "destroyed\n");
}
static gboolean
@@ -233,7 +233,7 @@
* loaded so that it can embed automatically if/when a notification
* area becomes available.
*/
- gaim_debug_info("tray icon", "failed to embed within timeout\n");
+ gaim_debug_info("docklet", "failed to embed within timeout\n");
gaim_gtk_docklet_remove();
return FALSE;
@@ -248,7 +248,7 @@
/* if this is being called when a tray icon exists, it's because
something messed up. try destroying it before we proceed,
although docklet_refcount may be all hosed. hopefully won't happen. */
- gaim_debug(GAIM_DEBUG_WARNING, "tray icon", "trying to create icon but it already exists?\n");
+ gaim_debug(GAIM_DEBUG_WARNING, "docklet", "trying to create icon but it already exists?\n");
docklet_x11_destroy();
}
@@ -281,7 +281,7 @@
gaim_gtk_docklet_embedded();
embed_timeout = g_timeout_add(EMBED_TIMEOUT, docklet_x11_embed_timeout_cb, NULL);
- gaim_debug(GAIM_DEBUG_INFO, "tray icon", "created\n");
+ gaim_debug(GAIM_DEBUG_INFO, "docklet", "created\n");
}
static struct docklet_ui_ops ui_ops =
Modified: trunk/gtk/gtkdocklet.c
===================================================================
--- trunk/gtk/gtkdocklet.c 2006-10-18 02:16:50 UTC (rev 17507)
+++ trunk/gtk/gtkdocklet.c 2006-10-18 03:27:43 UTC (rev 17508)
@@ -89,30 +89,16 @@
static GList *
get_pending_list(guint max)
{
- const char *im = gaim_prefs_get_string("/plugins/gtk/docklet/blink_im");
- const char *chat = gaim_prefs_get_string("/plugins/gtk/docklet/blink_chat");
GList *l_im = NULL;
GList *l_chat = NULL;
- if (im != NULL && strcmp(im, "always") == 0) {
- l_im = gaim_gtk_conversations_find_unseen_list(GAIM_CONV_TYPE_IM,
- GAIM_UNSEEN_TEXT,
- FALSE, max);
- } else if (im != NULL && strcmp(im, "hidden") == 0) {
- l_im = gaim_gtk_conversations_find_unseen_list(GAIM_CONV_TYPE_IM,
- GAIM_UNSEEN_TEXT,
- TRUE, max);
- }
+ l_im = gaim_gtk_conversations_find_unseen_list(GAIM_CONV_TYPE_IM,
+ GAIM_UNSEEN_TEXT,
+ FALSE, max);
- if (chat != NULL && strcmp(chat, "always") == 0) {
- l_chat = gaim_gtk_conversations_find_unseen_list(GAIM_CONV_TYPE_CHAT,
- GAIM_UNSEEN_TEXT,
- FALSE, max);
- } else if (chat != NULL && strcmp(chat, "nick") == 0) {
- l_chat = gaim_gtk_conversations_find_unseen_list(GAIM_CONV_TYPE_CHAT,
- GAIM_UNSEEN_NICK,
- FALSE, max);
- }
+ l_chat = gaim_gtk_conversations_find_unseen_list(GAIM_CONV_TYPE_CHAT,
+ GAIM_UNSEEN_NICK,
+ FALSE, max);
if (l_im != NULL && l_chat != NULL)
return g_list_concat(l_im, l_chat);
@@ -601,10 +587,6 @@
void *accounts_handle = gaim_accounts_get_handle();
void *docklet_handle = gaim_gtk_docklet_get_handle();
- gaim_prefs_add_none("/plugins/gtk/docklet");
- gaim_prefs_add_string("/plugins/gtk/docklet/blink_im", "hidden");
- gaim_prefs_add_string("/plugins/gtk/docklet/blink_chat", "never");
-
docklet_ui_init();
if (ui_ops && ui_ops->create)
ui_ops->create();
@@ -627,11 +609,6 @@
docklet_handle, GAIM_CALLBACK(gaim_quit_cb), NULL);
#endif
-/* gaim_prefs_connect_callback(plugin, "/plugins/gtk/docklet/blink_im",
- docklet_prefs_cb, NULL);
- gaim_prefs_connect_callback(plugin, "/plugins/gtk/docklet/blink_chat",
- docklet_prefs_cb, NULL);
-*/
enable_join_chat = online_account_supports_chat();
}
@@ -641,40 +618,3 @@
if (ui_ops && ui_ops->destroy)
ui_ops->destroy();
}
-
-#if 0
-static GtkWidget *
-plugin_config_frame(GaimPlugin *plugin)
-{
- GtkWidget *frame;
- GtkWidget *vbox;
- GtkSizeGroup *sg;
- GtkWidget *dd;
-
- frame = gtk_vbox_new(FALSE, 18);
- gtk_container_set_border_width(GTK_CONTAINER(frame), 12);
-
- vbox = gaim_gtk_make_frame(frame, _("Blink tray icon for unread..."));
- sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-
- dd = gaim_gtk_prefs_dropdown(vbox, _("_Instant Messages:"),
- GAIM_PREF_STRING, "/plugins/gtk/docklet/blink_im",
- _("Never"), "never",
- _("In hidden conversations"), "hidden",
- _("Always"), "always",
- NULL);
- gtk_size_group_add_widget(sg, dd);
-
- dd = gaim_gtk_prefs_dropdown(vbox, _("C_hat Messages:"),
- GAIM_PREF_STRING, "/plugins/gtk/docklet/blink_chat",
- _("Never"), "never",
- _("When my nick is said"), "nick",
- _("Always"), "always",
- NULL);
- gtk_size_group_add_widget(sg, dd);
-
- gtk_widget_show_all(frame);
- return frame;
-}
-#endif
-
Modified: trunk/gtk/win32/gtkdocklet-win32.c
===================================================================
--- trunk/gtk/win32/gtkdocklet-win32.c 2006-10-18 02:16:50 UTC (rev 17507)
+++ trunk/gtk/win32/gtkdocklet-win32.c 2006-10-18 03:27:43 UTC (rev 17508)
@@ -58,16 +58,16 @@
switch(msg) {
case WM_CREATE:
- gaim_debug(GAIM_DEBUG_INFO, "tray icon", "WM_CREATE\n");
+ gaim_debug(GAIM_DEBUG_INFO, "docklet", "WM_CREATE\n");
taskbarRestartMsg = RegisterWindowMessage("TaskbarCreated");
break;
case WM_TIMER:
- gaim_debug(GAIM_DEBUG_INFO, "tray icon", "WM_TIMER\n");
+ gaim_debug(GAIM_DEBUG_INFO, "docklet", "WM_TIMER\n");
break;
case WM_DESTROY:
- gaim_debug(GAIM_DEBUG_INFO, "tray icon", "WM_DESTROY\n");
+ gaim_debug(GAIM_DEBUG_INFO, "docklet", "WM_DESTROY\n");
break;
case WM_TRAYMESSAGE:
@@ -233,7 +233,7 @@
gaim_signal_connect(gaim_gtk_blist_get_handle(), "gtkblist-unhiding",
gaim_gtk_docklet_get_handle(), GAIM_CALLBACK(wgaim_tray_maximize), NULL);
- gaim_debug(GAIM_DEBUG_INFO, "tray icon", "created\n");
+ gaim_debug(GAIM_DEBUG_INFO, "docklet", "created\n");
}
static void wgaim_tray_destroy() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-10-18 02:16:59
|
Revision: 17507
http://svn.sourceforge.net/gaim/?rev=17507&view=rev
Author: datallah
Date: 2006-10-17 19:16:50 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
Exclude config.h from the dist tarball. nodist_foo_HEADERS is apparently Automake 1.6+ so I did it manually instead.
Modified Paths:
--------------
trunk/Makefile.am
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2006-10-18 01:21:51 UTC (rev 17506)
+++ trunk/Makefile.am 2006-10-18 02:16:50 UTC (rev 17507)
@@ -40,6 +40,7 @@
dist-hook: gaim.spec
cp gaim.spec $(distdir)
+ rm $(distdir)/config.h
distcheck-hook: plugins/perl/common/Gaim.pm
# cp plugins/perl/common/Gaim.pm $(distdir)/plugins/perl/common
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sea...@us...> - 2006-10-18 01:21:52
|
Revision: 17506
http://svn.sourceforge.net/gaim/?rev=17506&view=rev
Author: seanegan
Date: 2006-10-17 18:21:51 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
This icon is better as a default no-icon-set icon.
Modified Paths:
--------------
trunk/gtk/pixmaps/insert-image.png
Modified: trunk/gtk/pixmaps/insert-image.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-10-18 01:04:14
|
Revision: 17505
http://svn.sourceforge.net/gaim/?rev=17505&view=rev
Author: datallah
Date: 2006-10-17 18:04:07 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
Cleanup and debug output deconfusifying.
Modified Paths:
--------------
trunk/gtk/win32/win_gaim.c
trunk/libgaim/win32/win32dep.c
Modified: trunk/gtk/win32/win_gaim.c
===================================================================
--- trunk/gtk/win32/win_gaim.c 2006-10-18 00:54:57 UTC (rev 17504)
+++ trunk/gtk/win32/win_gaim.c 2006-10-18 01:04:07 UTC (rev 17505)
@@ -81,7 +81,7 @@
NULL, retv, 0,
(LPTSTR) &szBuf, sizeof(szBuf), NULL);
- printf("Could not read reg key '%s' subkey '%s' value: '%s'\nError: (%ld) %s\n",
+ printf("Could not read reg key '%s' subkey '%s' value: '%s'.\nMessage: (%ld) %s\n",
((key == HKEY_LOCAL_MACHINE) ? "HKLM" :
(key == HKEY_CURRENT_USER) ? "HKCU" :
"???"),
Modified: trunk/libgaim/win32/win32dep.c
===================================================================
--- trunk/libgaim/win32/win32dep.c 2006-10-18 00:54:57 UTC (rev 17504)
+++ trunk/libgaim/win32/win32dep.c 2006-10-18 01:04:07 UTC (rev 17505)
@@ -57,24 +57,7 @@
static HINSTANCE libgaimdll_hInstance = 0;
-
/*
- * STATIC CODE
- */
-
-static void wgaim_debug_print(GaimDebugLevel level, const char *category,
- const char *arg_s) {
- if(category)
- printf("%s: %s", category, arg_s);
- else
- printf(arg_s);
-}
-
-static GaimDebugUiOps ops = {
- wgaim_debug_print
-};
-
-/*
* PUBLIC CODE
*/
@@ -115,9 +98,9 @@
FARPROC proc = 0;
if(!(hmod = GetModuleHandle(dllname))) {
- gaim_debug(GAIM_DEBUG_WARNING, "wgaim", "%s not already loaded; loading it...\n", dllname);
+ gaim_debug_warning("wgaim", "%s not already loaded; loading it...\n", dllname);
if(!(hmod = LoadLibrary(dllname))) {
- gaim_debug(GAIM_DEBUG_ERROR, "wgaim", "Could not load: %s\n", dllname);
+ gaim_debug_error("wgaim", "Could not load: %s\n", dllname);
return NULL;
}
else
@@ -125,12 +108,12 @@
}
if((proc = GetProcAddress(hmod, procedure))) {
- gaim_debug(GAIM_DEBUG_INFO, "wgaim", "This version of %s contains %s\n",
+ gaim_debug_info("wgaim", "This version of %s contains %s\n",
dllname, procedure);
return proc;
}
else {
- gaim_debug(GAIM_DEBUG_WARNING, "wgaim", "Function %s not found in dll %s\n",
+ gaim_debug_warning("wgaim", "Function %s not found in dll %s\n",
procedure, dllname);
if(did_load) {
/* unload dll */
@@ -203,7 +186,7 @@
if (tmp == NULL) {
tmp = g_win32_error_message(GetLastError());
- gaim_debug(GAIM_DEBUG_ERROR, "wgaim",
+ gaim_debug_error("wgaim",
"GetModuleFileName error: %s\n", tmp);
g_free(tmp);
return NULL;
@@ -261,7 +244,7 @@
if (!app_data_dir)
app_data_dir = g_strdup("C:");
}
- gaim_debug(GAIM_DEBUG_INFO, "wgaim", "Gaim settings dir: %s\n",
+ gaim_debug_info("wgaim", "Gaim settings dir: %s\n",
app_data_dir);
}
@@ -414,9 +397,10 @@
const char *perlenv;
char *newenv;
- gaim_debug_set_ui_ops(&ops);
gaim_debug_info("wgaim", "wgaim_init start\n");
+ gaim_debug_info("wgaim", "libgaim version: " VERSION "\n");
+
gaim_debug_info("wgaim", "Glib:%u.%u.%u\n",
glib_major_version, glib_minor_version, glib_micro_version);
@@ -429,7 +413,7 @@
2.2 in addition to 2.2, it will still return 2.2 in
wVersion since that is the version we requested. */
if(LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 2) {
- gaim_debug(GAIM_DEBUG_WARNING, "wgaim", "Could not find a usable WinSock DLL. Oh well.\n");
+ gaim_debug_error("wgaim", "Could not find a usable WinSock DLL. Oh well.\n");
WSACleanup();
}
@@ -441,19 +425,19 @@
perlenv ? ";" : "",
wgaim_install_dir());
if (!g_setenv("PERL5LIB", newenv, TRUE))
- gaim_debug(GAIM_DEBUG_WARNING, "wgaim", "putenv failed\n");
+ gaim_debug_warning("wgaim", "putenv failed for PERL5LIB\n");
g_free(newenv);
if (!g_thread_supported())
g_thread_init(NULL);
- gaim_debug(GAIM_DEBUG_INFO, "wgaim", "wgaim_init end\n");
+ gaim_debug_info("wgaim", "wgaim_init end\n");
}
/* Windows Cleanup */
void wgaim_cleanup(void) {
- gaim_debug(GAIM_DEBUG_INFO, "wgaim", "wgaim_cleanup\n");
+ gaim_debug_info("wgaim", "wgaim_cleanup\n");
/* winsock cleanup */
WSACleanup();
@@ -465,7 +449,7 @@
}
/* DLL initializer */
-BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ) {
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
libgaimdll_hInstance = hinstDLL;
return TRUE;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-10-18 00:55:03
|
Revision: 17504
http://svn.sourceforge.net/gaim/?rev=17504&view=rev
Author: datallah
Date: 2006-10-17 17:54:57 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
Don't exclude the current popular status from the popular statuses list.
Also, fix selecting a saved status that doesn't apply to the token status account.
Modified Paths:
--------------
trunk/gtk/gtkstatusbox.c
trunk/libgaim/savedstatuses.c
Modified: trunk/gtk/gtkstatusbox.c
===================================================================
--- trunk/gtk/gtkstatusbox.c 2006-10-17 21:47:48 UTC (rev 17503)
+++ trunk/gtk/gtkstatusbox.c 2006-10-18 00:54:57 UTC (rev 17504)
@@ -687,15 +687,13 @@
* dropdown using a loop. Otherwise select from the default list.
*/
primitive = gaim_savedstatus_get_type(saved_status);
- if (!status_box->token_status_account)
+ if (!status_box->token_status_account && gaim_savedstatus_is_transient(saved_status) &&
+ ((primitive == GAIM_STATUS_AVAILABLE) || (primitive == GAIM_STATUS_AWAY) ||
+ (primitive == GAIM_STATUS_INVISIBLE) || (primitive == GAIM_STATUS_OFFLINE)) &&
+ (!gaim_savedstatus_has_substatuses(saved_status)))
{
- if (gaim_savedstatus_is_transient(saved_status)) {
- index = get_statusbox_index(status_box, saved_status);
- gtk_combo_box_set_active(GTK_COMBO_BOX(status_box),
- index);
- } else {
- gtk_gaim_status_box_refresh(status_box);
- }
+ index = get_statusbox_index(status_box, saved_status);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(status_box), index);
}
else
{
@@ -715,7 +713,11 @@
TYPE_COLUMN, &type,
DATA_COLUMN, &data,
-1);
- if (type == GTK_GAIM_STATUS_BOX_TYPE_PRIMITIVE && primitive == GPOINTER_TO_INT(data))
+
+ /* This is a special case because Primitives for the token_status_account are actually
+ * saved statuses with substatuses for the enabled accounts */
+ if (status_box->token_status_account && gaim_savedstatus_is_transient(saved_status)
+ && type == GTK_GAIM_STATUS_BOX_TYPE_PRIMITIVE && primitive == GPOINTER_TO_INT(data))
{
char *name;
const char *acct_status_name = gaim_status_get_name(
@@ -724,7 +726,8 @@
gtk_tree_model_get(GTK_TREE_MODEL(status_box->dropdown_store), &iter,
TEXT_COLUMN, &name, -1);
- if (!strcmp(name, acct_status_name))
+ if (!gaim_savedstatus_has_substatuses(saved_status)
+ || !strcmp(name, acct_status_name))
{
/* Found! */
gtk_combo_box_set_active_iter(GTK_COMBO_BOX(status_box), &iter);
@@ -733,6 +736,13 @@
}
g_free(name);
}
+ else if ((type == GTK_GAIM_STATUS_BOX_TYPE_POPULAR) &&
+ (GPOINTER_TO_INT(data) == gaim_savedstatus_get_creation_time(saved_status)))
+ {
+ /* Found! */
+ gtk_combo_box_set_active_iter(GTK_COMBO_BOX(status_box), &iter);
+ break;
+ }
}
while (gtk_tree_model_iter_next(GTK_TREE_MODEL(status_box->dropdown_store), &iter));
}
@@ -1770,7 +1780,16 @@
{
/* Selected status and previous status is the same */
if (!message_changed(message, gaim_status_get_attr_string(status, "message")))
- changed = FALSE;
+ {
+ GaimSavedStatus *ss = gaim_savedstatus_get_current();
+ /* Make sure that statusbox displays the correct thing.
+ * It can get messed up if the previous selection was a
+ * saved status that wasn't supported by this account */
+ if ((gaim_savedstatus_get_type(ss) == primitive)
+ && gaim_savedstatus_is_transient(ss)
+ && gaim_savedstatus_has_substatuses(ss))
+ changed = FALSE;
+ }
}
} else {
saved_status = gaim_savedstatus_get_current();
@@ -1790,12 +1809,11 @@
GList *tmp, *active_accts = gaim_accounts_get_all_active();
for (; iter != NULL; iter = iter->next) {
- GaimSavedStatus *ss= iter->data;
+ GaimSavedStatus *ss = iter->data;
const char *ss_msg = gaim_savedstatus_get_message(ss);
if ((gaim_savedstatus_get_type(ss) == primitive) && gaim_savedstatus_is_transient(ss) &&
gaim_savedstatus_has_substatuses(ss) && /* Must have substatuses */
- (((ss_msg == NULL) && (message == NULL)) ||
- ((ss_msg != NULL) && (message != NULL) && !strcmp(ss_msg, message))))
+ !message_changed(ss_msg, message))
{
gboolean found = FALSE;
/* The currently enabled accounts must have substatuses for all the active accts */
Modified: trunk/libgaim/savedstatuses.c
===================================================================
--- trunk/libgaim/savedstatuses.c 2006-10-17 21:47:48 UTC (rev 17503)
+++ trunk/libgaim/savedstatuses.c 2006-10-18 00:54:57 UTC (rev 17504)
@@ -700,18 +700,15 @@
GList *popular = NULL;
GList *cur;
int i;
- GaimSavedStatus *current, *next;
+ GaimSavedStatus *next;
- /* We don't want the current status to be in the GList */
- current = gaim_savedstatus_get_current();
-
/* Copy 'how_many' elements to a new list */
i = 0;
cur = saved_statuses;
while ((i < how_many) && (cur != NULL))
{
next = cur->data;
- if ((next != current) && (!gaim_savedstatus_is_transient(next)
+ if ((!gaim_savedstatus_is_transient(next)
|| gaim_savedstatus_get_message(next) != NULL))
{
popular = g_list_prepend(popular, cur->data);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-10-17 21:48:12
|
Revision: 17503
http://svn.sourceforge.net/gaim/?rev=17503&view=rev
Author: sadrul
Date: 2006-10-17 14:47:48 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
s/gtk/gnt/
Modified Paths:
--------------
trunk/console/gntgaim.c
Modified: trunk/console/gntgaim.c
===================================================================
--- trunk/console/gntgaim.c 2006-10-17 21:46:09 UTC (rev 17502)
+++ trunk/console/gntgaim.c 2006-10-17 21:47:48 UTC (rev 17503)
@@ -79,12 +79,12 @@
} GaimGtkIOClosure;
-static void gaim_gtk_io_destroy(gpointer data)
+static void gaim_gnt_io_destroy(gpointer data)
{
g_free(data);
}
-static gboolean gaim_gtk_io_invoke(GIOChannel *source, GIOCondition condition, gpointer data)
+static gboolean gaim_gnt_io_invoke(GIOChannel *source, GIOCondition condition, gpointer data)
{
GaimGtkIOClosure *closure = data;
GaimInputCondition gaim_cond = 0;
@@ -103,7 +103,7 @@
#ifdef _WIN32
if(! gaim_cond) {
#if DEBUG
- gaim_debug(GAIM_DEBUG_MISC, "gtk_eventloop",
+ gaim_debug_misc("gnt_eventloop",
"CLOSURE received GIOCondition of 0x%x, which does not"
" match 0x%x (READ) or 0x%x (WRITE)\n",
condition, GAIM_GTK_READ_COND, GAIM_GTK_WRITE_COND);
@@ -136,7 +136,7 @@
channel = g_io_channel_unix_new(fd);
closure->result = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, cond,
- gaim_gtk_io_invoke, closure, gaim_gtk_io_destroy);
+ gaim_gnt_io_invoke, closure, gaim_gnt_io_destroy);
g_io_channel_unref(channel);
return closure->result;
@@ -326,6 +326,8 @@
/* XXX: Don't puke */
freopen(".error", "w", stderr);
+ signal(SIGPIPE, SIG_IGN);
+
/* Initialize the libgaim stuff */
if (!init_libgaim(argc, argv))
return 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-10-17 21:46:52
|
Revision: 17502
http://svn.sourceforge.net/gaim/?rev=17502&view=rev
Author: sadrul
Date: 2006-10-17 14:46:09 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
This should fix the last crash.
Modified Paths:
--------------
trunk/console/libgnt/gntentry.c
Modified: trunk/console/libgnt/gntentry.c
===================================================================
--- trunk/console/libgnt/gntentry.c 2006-10-17 20:44:05 UTC (rev 17501)
+++ trunk/console/libgnt/gntentry.c 2006-10-17 21:46:09 UTC (rev 17502)
@@ -370,9 +370,10 @@
if (entry->max && g_utf8_pointer_to_offset(entry->start, entry->end) >= entry->max)
continue;
- if (entry->end - entry->start >= entry->buffer)
+ if (entry->end + len - entry->start >= entry->buffer)
{
- char *tmp = g_strdup_printf(entry->start);
+ /* This will cause the buffer to grow */
+ char *tmp = g_strdup_printf("%s%*s", entry->start, len, "");
gnt_entry_set_text(entry, tmp);
g_free(tmp);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2006-10-17 20:44:27
|
Revision: 17501
http://svn.sourceforge.net/gaim/?rev=17501&view=rev
Author: deryni9
Date: 2006-10-17 13:44:05 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
This should fix the problem that my last commit introduced. Having the base
primitive status of a saved status selected in the dropdown sounded like a
pretty good idea, only it broke actually selecting that primitive once the
saved status was selected. So any saved status based off of the Away primitive
locked you out from being able to choose the Away primitive when that saved
status was selected. So go back to selecting nothing for saved statuses.
Modified Paths:
--------------
trunk/gtk/gtkstatusbox.c
Modified: trunk/gtk/gtkstatusbox.c
===================================================================
--- trunk/gtk/gtkstatusbox.c 2006-10-17 19:21:30 UTC (rev 17500)
+++ trunk/gtk/gtkstatusbox.c 2006-10-17 20:44:05 UTC (rev 17501)
@@ -689,10 +689,13 @@
primitive = gaim_savedstatus_get_type(saved_status);
if (!status_box->token_status_account)
{
- index = get_statusbox_index(status_box, saved_status);
- gtk_combo_box_set_active(GTK_COMBO_BOX(status_box), index);
- if (index == -1)
+ if (gaim_savedstatus_is_transient(saved_status)) {
+ index = get_statusbox_index(status_box, saved_status);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(status_box),
+ index);
+ } else {
gtk_gaim_status_box_refresh(status_box);
+ }
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
6 messages has been excluded from this view by a project administrator.
