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: <the...@us...> - 2006-09-09 06:49:07
|
Revision: 17197
http://svn.sourceforge.net/gaim/?rev=17197&view=rev
Author: thekingant
Date: 2006-09-08 23:49:05 -0700 (Fri, 08 Sep 2006)
Log Message:
-----------
Herman, we've moving you to "retired," but feel free to come
back and work on stuff any time!
(And let me know if I missed anything)
Modified Paths:
--------------
trunk/AUTHORS
trunk/doc/gaim.1.in
trunk/gtk/gtkdialogs.c
Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS 2006-09-09 06:48:02 UTC (rev 17196)
+++ trunk/AUTHORS 2006-09-09 06:49:05 UTC (rev 17197)
@@ -17,7 +17,6 @@
Daniel 'datallah' Atallah
Ethan 'Paco-Paco' Blanton - Developer
-Herman Bloggs - Win32 Port
Thomas Butter - Developer
Mark 'KingAnt' Doliner - Developer
Christian 'ChipX86' Hammond - Developer & Webmaster
@@ -34,7 +33,6 @@
Crazy Patch Writers:
--------------------
-
Ka-Hing 'javabsp' Cheung
Sadrul Habib Chowdhury
Felipe 'shx' Contreras
@@ -46,6 +44,7 @@
Retired Developers:
--------
+Herman Bloggs - Win32 Port
Jim Duchek <ji...@li...> - maintainer
Rob Flynn <ga...@ro...> - maintainer
Adam Fritzler - libfaim maintainer
Modified: trunk/doc/gaim.1.in
===================================================================
--- trunk/doc/gaim.1.in 2006-09-09 06:48:02 UTC (rev 17196)
+++ trunk/doc/gaim.1.in 2006-09-09 06:49:05 UTC (rev 17197)
@@ -542,8 +542,6 @@
.br
Ethan 'Paco-Paco' Blanton (developer)
.br
- Herman Bloggs (win32 port) <\fIh...@bl...\fR>
-.br
Mark 'KingAnt' Doliner (developer) <\fIt...@us...\fR>
.br
Christian 'ChipX86' Hammond (developer & webmaster) <\fIc...@ch...\fR>
@@ -588,6 +586,8 @@
The retired developers of \fBgaim\fR are:
+ Herman Bloggs (win32 port) <\fIh...@bl...\fR>
+.br
Jim Duchek <\fI...@li...\fR> (maintainer)
.br
Rob Flynn <\fI...@ro...\fR> (maintainer)
Modified: trunk/gtk/gtkdialogs.c
===================================================================
--- trunk/gtk/gtkdialogs.c 2006-09-09 06:48:02 UTC (rev 17196)
+++ trunk/gtk/gtkdialogs.c 2006-09-09 06:49:05 UTC (rev 17197)
@@ -66,7 +66,6 @@
{"Sean Egan", N_("lead developer"), "sea...@gm..."},
{"Daniel 'datallah' Atallah", N_("developer"), NULL},
{"Ethan 'Paco-Paco' Blanton", N_("developer"), NULL},
- {"Herman Bloggs", N_("win32 port"), "he...@bl..."},
{"Thomas Butter", N_("developer"), NULL},
{"Mark 'KingAnt' Doliner", N_("developer"), NULL},
{"Christian 'ChipX86' Hammond", N_("developer & webmaster"), NULL},
@@ -99,8 +98,9 @@
/* Order: Alphabetical by Last Name */
static struct developer retired_developers[] = {
+ {"Herman Bloggs", N_("win32 port"), "he...@bl..."},
{"Jim Duchek", N_("maintainer"), "ji...@li..."},
- {"Rob Flynn", N_("maintainer"), "ga...@ro..."},
+ {"Rob Flynn", N_("maintainer"), "ga...@ro..."},
{"Adam Fritzler", N_("libfaim maintainer"), NULL},
/* If "lazy bum" translates literally into a serious insult, use something else or omit it. */
{"Syd Logan", N_("hacker and designated driver [lazy bum]"), NULL},
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-09-09 06:48:06
|
Revision: 17196
http://svn.sourceforge.net/gaim/?rev=17196&view=rev
Author: thekingant
Date: 2006-09-08 23:48:02 -0700 (Fri, 08 Sep 2006)
Log Message:
-----------
Herman, we've moving you to "retired," but feel free to come
back and work on stuff any time!
Modified Paths:
--------------
web/htdocs/contactinfo.php
Modified: web/htdocs/contactinfo.php
===================================================================
--- web/htdocs/contactinfo.php 2006-09-09 02:19:16 UTC (rev 17195)
+++ web/htdocs/contactinfo.php 2006-09-09 06:48:02 UTC (rev 17196)
@@ -59,17 +59,6 @@
</dd>
<dt>
- Herman Bloggs - <<a href="mailto:he...@bl...">he...@bl...</a>>
-</dt>
-<dd>
- <b>AIM:</b> hermanator12002<br />
- <b>Yahoo:</b> hermanator12002<br />
- <b>MSN:</b> her...@ho...<br />
- <b>Gadu-Gadu:</b> 4140667<br />
- <i>Windows Gaim</i>
-</dd>
-
-<dt>
Thomas Butter
</dt>
<dd>
@@ -184,6 +173,17 @@
<dl>
<dt>
+ Herman Bloggs - <<a href="mailto:he...@bl...">he...@bl...</a>>
+</dt>
+<dd>
+ <b>AIM:</b> hermanator12002<br />
+ <b>Yahoo:</b> hermanator12002<br />
+ <b>MSN:</b> her...@ho...<br />
+ <b>Gadu-Gadu:</b> 4140667<br />
+ <i>Windows Gaim</i>
+</dd>
+
+<dt>
Jim Duchek
</dt>
<dd>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-09-09 02:19:29
|
Revision: 17195
http://svn.sourceforge.net/gaim/?rev=17195&view=rev
Author: sadrul
Date: 2006-09-08 19:19:16 -0700 (Fri, 08 Sep 2006)
Log Message:
-----------
Build libgnt with ncurses if ncursesw is not found. I uninstalled ncursesw
and it's still working for me .. of course, with no wide-character support.
Improve the mouse support a bit.
Modified Paths:
--------------
trunk/configure.ac
trunk/console/gntblist.c
trunk/console/libgnt/configure.ac
trunk/console/libgnt/gntentry.c
trunk/console/libgnt/gntmain.c
trunk/console/libgnt/gntutils.c
trunk/console/libgnt/gntwidget.h
trunk/console/libgnt/gntwm.h
trunk/console/plugins/Makefile.am
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-09-08 22:47:36 UTC (rev 17194)
+++ trunk/configure.ac 2006-09-09 02:19:16 UTC (rev 17195)
@@ -353,48 +353,51 @@
AC_CHECK_LIB(ncursesw, initscr, [GNT_LIBS="-lncursesw"], [enable_consoleui=no])
AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"], [enable_consoleui=no])
- LIBS_save="$LIBS"
- LIBS="$LIBS $GNT_LIBS"
+ if test "x$enable_consoleui" = "xyes"; then
+ dnl # Some distros put the headers in ncursesw/, some don't
+ found_ncurses_h=no
+ for f in /usr/include/ncursesw/ncurses.h /usr/include/ncurses.h
+ do
+ AC_CHECK_HEADER($f,[
+ AC_MSG_CHECKING([if $f supports wide characters])
+ AC_TRY_COMPILE([
+ #define _XOPEN_SOURCE_EXTENDED
+ #include <$f>
+ ], [
+ #ifndef get_wch
+ # error get_wch not found!
+ #endif
+ ], [
+ dir=`dirname $f`
+ if test x"$dir" != x"." ; then
+ GNT_CFLAGS="-I$dir/"
+ else
+ GNT_CFLAGS=""
+ fi
- dnl # Some distros put the headers in ncursesw/, some don't
- found_ncurses_h=no
- for f in /usr/include/ncursesw/ncurses.h /usr/include/ncurses.h
- do
- AC_CHECK_HEADER($f,[
- AC_MSG_CHECKING([if $f supports wide characters])
- AC_TRY_COMPILE([
- #define _XOPEN_SOURCE_EXTENDED
- #include <$f>
- ], [
- #ifndef get_wch
- # error get_wch not found!
- #endif
- ], [
- dir=`dirname $f`
- if test x"$dir" != x"." ; then
- GNT_CFLAGS="-I$dir/"
- else
- GNT_CFLAGS=""
- fi
-
- found_ncurses_h=yes
- AC_MSG_RESULT([yes])
- break
- ], [
- AC_MSG_RESULT([no])
+ found_ncurses_h=yes
+ AC_MSG_RESULT([yes])
+ break
+ ], [
+ AC_MSG_RESULT([no])
+ ])
])
- ])
- done
+ done
- LIBS="$LIBS_save"
-
- if test x"$found_ncurses_h" = x"no" ; then
- GNT_LIBS=""
- GNT_CFLAGS=""
- enable_consoleui=no
- AC_MSG_RESULT([no])
+ if test x"$found_ncurses_h" = x"no" ; then
+ GNT_LIBS=""
+ GNT_CFLAGS=""
+ enable_consoleui=no
+ AC_MSG_RESULT([no])
+ else
+ AC_MSG_RESULT([yes])
+ fi
else
- AC_MSG_RESULT([yes])
+ # ncursesw was not found. Look for plain old ncurses
+ enable_consoleui=yes
+ AC_CHECK_LIB(ncurses, initscr, [GNT_LIBS="-lncurses"], [enable_consoleui=no])
+ AC_CHECK_LIB(panel, update_panels, [GNT_LIBS="$GNT_LIBS -lpanel"], [enable_consoleui=no])
+ AC_DEFINE(NO_WIDECHAR, 1, [Define to 1 if you don't have wide-character support.])
fi
PKG_CHECK_MODULES(X11, x11,
@@ -407,7 +410,7 @@
AC_SUBST(GNT_CFLAGS)
AM_CONDITIONAL(ENABLE_GNT, test "x$enable_consoleui" = "xyes")
-AC_CHECK_FUNC(wcwidth, [AC_DEFINE([HAVE_WCWIDTH], [1], [Define to 1 if you have wcwidth function.])])
+#AC_CHECK_FUNC(wcwidth, [AC_DEFINE([HAVE_WCWIDTH], [1], [Define to 1 if you have wcwidth function.])])
dnl #######################################################################
dnl # Check for LibXML2 (required)
Modified: trunk/console/gntblist.c
===================================================================
--- trunk/console/gntblist.c 2006-09-08 22:47:36 UTC (rev 17194)
+++ trunk/console/gntblist.c 2006-09-09 02:19:16 UTC (rev 17195)
@@ -1160,6 +1160,8 @@
static void
selection_changed(GntWidget *widget, gpointer old, gpointer current, GGBlist *ggblist)
{
+ if (ggblist->context)
+ remove_context_menu(ggblist);
draw_tooltip(ggblist);
}
@@ -1568,6 +1570,15 @@
return ret;
}
+static gboolean
+blist_clicked(GntTree *tree, GntMouseEvent event, int x, int y, gpointer ggblist)
+{
+ if (event == GNT_RIGHT_MOUSE_DOWN) {
+ draw_context_menu(ggblist);
+ }
+ return FALSE;
+}
+
void gg_blist_show()
{
if (ggblist)
@@ -1626,6 +1637,7 @@
g_signal_connect(G_OBJECT(ggblist->tree), "selection_changed", G_CALLBACK(selection_changed), ggblist);
g_signal_connect(G_OBJECT(ggblist->tree), "key_pressed", G_CALLBACK(key_pressed), ggblist);
+ g_signal_connect_after(G_OBJECT(ggblist->tree), "clicked", G_CALLBACK(blist_clicked), ggblist);
g_signal_connect(G_OBJECT(ggblist->tree), "activate", G_CALLBACK(selection_activate), ggblist);
g_signal_connect_data(G_OBJECT(ggblist->tree), "gained-focus", G_CALLBACK(draw_tooltip),
ggblist, 0, G_CONNECT_AFTER | G_CONNECT_SWAPPED);
Modified: trunk/console/libgnt/configure.ac
===================================================================
--- trunk/console/libgnt/configure.ac 2006-09-08 22:47:36 UTC (rev 17194)
+++ trunk/console/libgnt/configure.ac 2006-09-09 02:19:16 UTC (rev 17195)
@@ -182,7 +182,7 @@
PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.0.0 gobject-2.0 gmodule-2.0],,
[
AC_MSG_ERROR([
-*** GLib 2.0 is required to build Gaim; please make sure you have the GLib
+*** GLib 2.0 is required to build LibGNT; please make sure you have the GLib
*** development headers installed. The latest version of GLib is
*** always available at http://www.gtk.org/.])
])
@@ -201,9 +201,55 @@
#AC_CHECK_FUNC(wcwidth, [AC_DEFINE([HAVE_WCWIDTH], [1], [Define to 1 if you have wcwidth function.])])
#AC_VAR_TIMEZONE_EXTERNALS
-AC_CHECK_LIB(ncursesw, initscr, , [AC_MSG_ERROR([
-*** You need ncursesw. ])])
+GNT_CFLAGS=
+GNT_LIBS=
+AC_CHECK_LIB(ncursesw, initscr, [GNT_LIBS="-lncursesw"], [enable_gnt=no])
+AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"], [enable_gnt=no])
+# If ncursesw is not found, look for plain old ncurses
+if test "x$enable_gnt" = "xno"; then
+ AC_CHECK_LIB(ncurses, initscr, [[GNT_LIBS="-lncurses"] [enable_gnt=yes]], [enable_gnt=no])
+ AC_CHECK_LIB(panel, update_panels, [[GNT_LIBS="$GNT_LIBS -lpanel"] [enable_gnt=yes]], [enable_gnt=no])
+ AC_DEFINE(NO_WIDECHAR, [1], [Define to 1 if you do not have ncursesw.])
+else
+ dnl # Some distros put the headers in ncursesw/, some don't
+ found_ncurses_h=no
+ for f in /usr/include/ncursesw/ncurses.h /usr/include/ncurses.h
+ do
+ AC_CHECK_HEADER($f,[
+ AC_MSG_CHECKING([if $f supports wide characters])
+ AC_TRY_COMPILE([
+ #define _XOPEN_SOURCE_EXTENDED
+ #include <$f>
+ ], [
+ #ifndef get_wch
+ # error get_wch not found!
+ #endif
+ ], [
+ dir=`dirname $f`
+ if test x"$dir" != x"." ; then
+ GNT_CFLAGS="-I$dir/"
+ else
+ GNT_CFLAGS=""
+ fi
+
+ found_ncurses_h=yes
+ AC_MSG_RESULT([yes])
+ break
+ ], [
+ AC_MSG_RESULT([no])
+ ])
+ ])
+ done
+fi
+AC_SUBST(GNT_CFLAGS)
+AC_SUBST(GNT_LIBS)
+
+if test "x$enable_gnt" = "xno"; then
+ AC_MSG_ERROR([
+*** You need ncursesw or ncurses.])
+fi
+
AC_OUTPUT([Makefile
gnt.pc
wms/Makefile
Modified: trunk/console/libgnt/gntentry.c
===================================================================
--- trunk/console/libgnt/gntentry.c 2006-09-08 22:47:36 UTC (rev 17194)
+++ trunk/console/libgnt/gntentry.c 2006-09-09 02:19:16 UTC (rev 17195)
@@ -64,6 +64,7 @@
entry->ddown = gnt_tree_new();
gnt_tree_set_compare_func(GNT_TREE(entry->ddown), (GCompareFunc)g_utf8_collate);
gnt_box_add_widget(GNT_BOX(box), entry->ddown);
+ /* XXX: Connect to the "activate" signal for the dropdown tree */
GNT_WIDGET_SET_FLAGS(box, GNT_WIDGET_TRANSIENT);
Modified: trunk/console/libgnt/gntmain.c
===================================================================
--- trunk/console/libgnt/gntmain.c 2006-09-08 22:47:36 UTC (rev 17194)
+++ trunk/console/libgnt/gntmain.c 2006-09-09 02:19:16 UTC (rev 17195)
@@ -1,5 +1,4 @@
-#define _XOPEN_SOURCE
-#define _XOPEN_SOURCE_EXTENDED
+#define _GNU_SOURCE
#include "config.h"
@@ -11,6 +10,7 @@
#include "gntkeys.h"
#include "gntstyle.h"
#include "gnttree.h"
+#include "gntutils.h"
#include "gntwm.h"
#include <panel.h>
@@ -27,8 +27,6 @@
#include <sys/types.h>
#include <sys/wait.h>
-#include <wchar.h>
-
/**
* Notes: Interesting functions to look at:
* scr_dump, scr_init, scr_restore: for workspaces
@@ -253,6 +251,8 @@
mvwhline(taskbar, 0, width * i, ' ' | COLOR_PAIR(color), width);
title = GNT_BOX(w)->title;
mvwprintw(taskbar, 0, width * i, "%s", title ? title : "<gnt>");
+ if (i)
+ mvwaddch(taskbar, 0, width *i - 1, ACS_VLINE | A_STANDOUT | COLOR_PAIR(GNT_COLOR_NORMAL));
update_window_in_list(w);
}
@@ -423,7 +423,7 @@
for (x = 0; x < getmaxx(stdscr); x++)
{
char ch;
- now = mvwinch(newscr, y, x);
+ now = mvwinch(curscr, y, x);
ch = now & A_CHARTEXT;
now ^= ch;
@@ -561,7 +561,7 @@
static int offset = 0;
GntMouseEvent event;
GntWidget *widget = NULL;
- GList *iter;
+ PANEL *p = NULL;
if (!ordered || buffer[0] != 27)
return FALSE;
@@ -577,8 +577,14 @@
x -= 33;
y -= 33;
- for (iter = ordered; iter; iter = iter->next) {
- GntWidget *wid = iter->data;
+ /* It might be a better idea to use panel_below. That would allow mouse-clicks
+ * to be operated on transient windows, which would be cool.*/
+ while ((p = panel_below(p)) != NULL) {
+ const GntNode *node = panel_userptr(p);
+ GntWidget *wid;
+ if (!node)
+ continue;
+ wid = node->me;
if (x >= wid->priv.x && x < wid->priv.x + wid->priv.width) {
if (y >= wid->priv.y && y < wid->priv.y + wid->priv.height) {
widget = wid;
@@ -586,6 +592,7 @@
}
}
}
+
if (strncmp(buffer, "[M ", 3) == 0) {
/* left button down */
/* Bring the window you clicked on to front */
@@ -612,7 +619,8 @@
if (wm.mouse_clicked && wm.mouse_clicked(event, x, y, widget))
return TRUE;
- if (event == GNT_LEFT_MOUSE_DOWN && widget) {
+ if (event == GNT_LEFT_MOUSE_DOWN && widget && widget != _list.window &&
+ !GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_TRANSIENT)) {
if (widget != ordered->data) {
GntWidget *w = ordered->data;
ordered = g_list_bring_to_front(ordered, widget);
@@ -644,30 +652,49 @@
offset = 0;
}
- gnt_widget_clicked(ordered->data, event, x, y);
- return FALSE; /* XXX: this should be TRUE */
+ gnt_widget_clicked(widget, event, x, y);
+ return TRUE; /* XXX: this should be TRUE */
}
+#ifndef NO_WIDECHAR
+static int
+widestringwidth(wchar_t *wide)
+{
+ int len, ret;
+ char *string;
+
+ len = wcstombs(NULL, wide, 0) + 1;
+ string = g_new0(char, len);
+ wcstombs(string, wide, len);
+ ret = gnt_util_onscreen_width(string, NULL);
+ g_free(string);
+ return ret;
+}
+#endif
+
/* Returns the onscreen width of the character at the position */
static int
reverse_char(WINDOW *d, int y, int x, gboolean set)
{
- /* This is supposed to simply in_wch the cchar_t, set the attribute,
- * and add_wch. But that doesn't currently work, possibly because of
- * a bug in ncurses. This is an ugly hack to work around that. */
- cchar_t ch;
- int wc = 1, j;
-
#define DECIDE(ch) (set ? ((ch) | WA_REVERSE) : ((ch) & ~WA_REVERSE))
+#ifdef NO_WIDECHAR
+ chtype ch;
+ ch = mvwinch(d, y, x);
+ mvwaddch(d, y, x, DECIDE(ch));
+ return 1;
+#else
+ cchar_t ch;
+ int wc = 1;
if (mvwin_wch(d, y, x, &ch) == OK) {
- wc = wcswidth(ch.chars, CCHARW_MAX);
- for (j = 0; j < wc; j++)
- mvwdelch(d, y, x);
+ wc = widestringwidth(ch.chars);
ch.attr = DECIDE(ch.attr);
- mvwins_wch(d, y, x, &ch);
+ ch.attr &= WA_ATTRIBUTES; /* XXX: This is a workaround for a bug */
+ mvwadd_wch(d, y, x, &ch);
}
+
return wc;
+#endif
}
static void
@@ -1178,6 +1205,7 @@
node->panel = wm.new_window(node->me);
else
node->panel = new_panel(node->me->window);
+ set_panel_userptr(node->panel, node);
if (!GNT_WIDGET_IS_FLAG_SET(node->me, GNT_WIDGET_TRANSIENT))
{
bottom_panel(node->panel); /* New windows should not grab focus */
Modified: trunk/console/libgnt/gntutils.c
===================================================================
--- trunk/console/libgnt/gntutils.c 2006-09-08 22:47:36 UTC (rev 17194)
+++ trunk/console/libgnt/gntutils.c 2006-09-09 02:19:16 UTC (rev 17195)
@@ -43,6 +43,9 @@
{
int width = 0;
+ if (end == NULL)
+ end = start + strlen(start);
+
while (start < end) {
width += g_unichar_iswide(g_utf8_get_char(start)) ? 2 : 1;
start = g_utf8_next_char(start);
Modified: trunk/console/libgnt/gntwidget.h
===================================================================
--- trunk/console/libgnt/gntwidget.h 2006-09-08 22:47:36 UTC (rev 17194)
+++ trunk/console/libgnt/gntwidget.h 2006-09-09 02:19:16 UTC (rev 17195)
@@ -1,8 +1,6 @@
#ifndef GNT_WIDGET_H
#define GNT_WIDGET_H
-#include "config.h"
-
#include <stdio.h>
#include <glib.h>
#include <glib-object.h>
Modified: trunk/console/libgnt/gntwm.h
===================================================================
--- trunk/console/libgnt/gntwm.h 2006-09-08 22:47:36 UTC (rev 17194)
+++ trunk/console/libgnt/gntwm.h 2006-09-09 02:19:16 UTC (rev 17195)
@@ -1,5 +1,3 @@
-#include "config.h"
-
#include <panel.h>
#include "gntwidget.h"
Modified: trunk/console/plugins/Makefile.am
===================================================================
--- trunk/console/plugins/Makefile.am 2006-09-08 22:47:36 UTC (rev 17194)
+++ trunk/console/plugins/Makefile.am 2006-09-09 02:19:16 UTC (rev 17195)
@@ -9,7 +9,7 @@
plugindir = $(libdir)/gaim
-gntgf_la_SOURCES = gntgf.c
+gntgf_la_SOURCES = gntgf.c
gnthistory_la_SOURCES = gnthistory.c
endif # PLUGINS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2006-09-08 22:47:40
|
Revision: 17194
http://svn.sourceforge.net/gaim/?rev=17194&view=rev
Author: deryni9
Date: 2006-09-08 15:47:36 -0700 (Fri, 08 Sep 2006)
Log Message:
-----------
The signal to noise ratio here isn't very good, but I hate comments that don't
wrap cleanly.
Anyway, apparently libxml2 has intermittent start-parsing errors, so we need
to force it to actually start with this line. Sean pulled it out a bit ago but
that was causing issues with logins just hanging sometimes.
Modified Paths:
--------------
trunk/libgaim/protocols/jabber/parser.c
Modified: trunk/libgaim/protocols/jabber/parser.c
===================================================================
--- trunk/libgaim/protocols/jabber/parser.c 2006-09-08 16:29:52 UTC (rev 17193)
+++ trunk/libgaim/protocols/jabber/parser.c 2006-09-08 22:47:36 UTC (rev 17194)
@@ -156,10 +156,10 @@
void
jabber_parser_setup(JabberStream *js)
{
- /* This seems backwards, but it makes sense. The libxml code creates the parser
- * context when you try to use it (this way, it can figure out the encoding at
- * creation time. So, setting up the parser is just a matter of destroying any
- * current parser. */
+ /* This seems backwards, but it makes sense. The libxml code creates
+ * the parser context when you try to use it (this way, it can figure
+ * out the encoding at creation time. So, setting up the parser is
+ * just a matter of destroying any current parser. */
if (js->context) {
xmlParseChunk(js->context, NULL,0,1);
xmlFreeParserCtxt(js->context);
@@ -171,9 +171,10 @@
void jabber_parser_process(JabberStream *js, const char *buf, int len)
{
if (js->context == NULL) {
- /* libxml inconsistently starts parsing on creating the parser, so so a ParseChunk
- * right afterwards to force it. */
+ /* libxml inconsistently starts parsing on creating the
+ * parser, so do a ParseChunk right afterwards to force it. */
js->context = xmlCreatePushParserCtxt(&jabber_parser_libxml, js, buf, len, NULL);
+ xmlParseChunk(js->context, NULL, 0, 0);
} else if (xmlParseChunk(js->context, buf, len, 0) < 0) {
gaim_connection_error(js->gc, _("XML Parse error"));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <may...@us...> - 2006-09-08 16:30:08
|
Revision: 17193
http://svn.sourceforge.net/gaim/?rev=17193&view=rev
Author: mayuan2006
Date: 2006-09-08 09:29:52 -0700 (Fri, 08 Sep 2006)
Log Message:
-----------
fix the bug of nexus
Now New way ok!
committed by MaYuan<may...@gm...>
Modified Paths:
--------------
branches/soc-2006-msnp13/src/protocols/msn/nexus.c
branches/soc-2006-msnp13/src/protocols/msn/nexus.h
Modified: branches/soc-2006-msnp13/src/protocols/msn/nexus.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/nexus.c 2006-09-08 16:02:00 UTC (rev 17192)
+++ branches/soc-2006-msnp13/src/protocols/msn/nexus.c 2006-09-08 16:29:52 UTC (rev 17193)
@@ -26,7 +26,7 @@
#include "nexus.h"
#include "notification.h"
-#define NEXUS_LOGIN_TWN 1
+#undef NEXUS_LOGIN_TWN
/*Local Function Prototype*/
static void nexus_login_connect_cb(gpointer data, GaimSslConnection *gsc,GaimInputCondition cond);
Modified: branches/soc-2006-msnp13/src/protocols/msn/nexus.h
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/nexus.h 2006-09-08 16:02:00 UTC (rev 17192)
+++ branches/soc-2006-msnp13/src/protocols/msn/nexus.h 2006-09-08 16:29:52 UTC (rev 17193)
@@ -110,7 +110,7 @@
"<wsa:Address>messenger.msn.com</wsa:Address>"\
"</wsa:EndpointReference>"\
"</wsp:AppliesTo>"\
- "<wsse:PolicyReference URI=\"%s\"></wsse:PolicyReference>"\
+ "<wsse:PolicyReference URI=\"?%s\"></wsse:PolicyReference>"\
"</wst:RequestSecurityToken>"\
"<wst:RequestSecurityToken Id=\"RST2\">"\
"<wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>"\
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <may...@us...> - 2006-09-08 16:02:25
|
Revision: 17192
http://svn.sourceforge.net/gaim/?rev=17192&view=rev
Author: mayuan2006
Date: 2006-09-08 09:02:00 -0700 (Fri, 08 Sep 2006)
Log Message:
-----------
trial of new Login.live.com passport login procedure
Not stable.
committed by MaYuan<may...@gm...>
Modified Paths:
--------------
branches/soc-2006-msnp13/src/protocols/msn/nexus.c
branches/soc-2006-msnp13/src/protocols/msn/nexus.h
Modified: branches/soc-2006-msnp13/src/protocols/msn/nexus.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/nexus.c 2006-09-08 14:43:34 UTC (rev 17191)
+++ branches/soc-2006-msnp13/src/protocols/msn/nexus.c 2006-09-08 16:02:00 UTC (rev 17192)
@@ -26,6 +26,8 @@
#include "nexus.h"
#include "notification.h"
+#define NEXUS_LOGIN_TWN 1
+
/*Local Function Prototype*/
static void nexus_login_connect_cb(gpointer data, GaimSslConnection *gsc,GaimInputCondition cond);
@@ -95,15 +97,21 @@
session = nexus->session;
g_return_if_fail(session != NULL);
-// gaim_debug_misc("msn", "TWN Server Reply: {%s}\n", soapconn->read_buf);
+ gaim_debug_misc("msn", "TWN Server Reply: {%s}\n", soapconn->read_buf);
/*reply OK, we should process the SOAP body*/
gaim_debug_info("MaYuan","Windows Live ID Reply OK!\n");
//TODO: we should parse it using XML
+#ifdef NEXUS_LOGIN_TWN
base = g_strstr_len(soapconn->read_buf, soapconn->read_len, TWN_START_TOKEN);
base += strlen(TWN_START_TOKEN);
c = g_strstr_len(soapconn->read_buf, soapconn->read_len, TWN_END_TOKEN);
+#else
+ base = g_strstr_len(soapconn->read_buf, soapconn->read_len, TWN_LIVE_START_TOKEN);
+ base += strlen(TWN_LIVE_START_TOKEN);
+ c = g_strstr_len(soapconn->read_buf, soapconn->read_len, TWN_LIVE_END_TOKEN);
+#endif
login_params = g_strndup(base, c - base);
// gaim_debug_info("msn", "TWN Cert: {%s}\n", login_params);
@@ -166,7 +174,12 @@
char *ru,*lc,*id,*tw,*ct,*kpp,*kv,*ver,*rn,*tpf;
char *fs0,*fs;
char *username, *password;
- char *request_str, *head, *tail,*challenge_str;
+ char *request_str, *head, *tail;
+#ifdef NEXUS_LOGIN_TWN
+ char *challenge_str;
+#else
+ char *rst1_str,*rst2_str,*rst3_str;
+#endif
gaim_debug_info("MaYuan","starting Windows Live ID authentication\n");
@@ -222,14 +235,32 @@
}else{
fs = g_strdup("1");
}
+
+#ifdef NEXUS_LOGIN_TWN
challenge_str = g_strdup_printf(
"lc=%s&id=%s&tw=%s&fs=%s&ru=%s&ct=%s&kpp=%s&kv=%s&ver=%s&rn=%s&tpf=%s\r\n",
lc,id,tw,fs,ru,ct,kpp,kv,ver,rn,tpf
);
- g_free(fs);
/*build the SOAP windows Live ID XML body */
tail = g_strdup_printf(TWN_ENVELOP_TEMPLATE,username,password,challenge_str );
+ g_free(challenge_str);
+#else
+ rst1_str = g_strdup_printf(
+ "id=%s&tw=%s&fs=%s&kpp=%s&kv=%s&ver=%s&rn=%s",
+ id,tw,fs,kpp,kv,ver,rn
+ );
+ rst2_str = g_strdup_printf(
+ "fs=%s&id=%s&kv=%s&rn=%s&tw=%s&ver=%s",
+ fs,id,kv,rn,tw,ver
+ );
+ rst3_str = g_strdup_printf("id=%s",id);
+ tail = g_strdup_printf(TWN_LIVE_ENVELOP_TEMPLATE,username,password,rst1_str,rst2_str,rst3_str);
+ g_free(rst1_str);
+ g_free(rst2_str);
+ g_free(rst3_str);
+#endif
+ g_free(fs);
soapconn->login_path = g_strdup(TWN_POST_URL);
head = g_strdup_printf(
@@ -243,7 +274,7 @@
soapconn->login_path,soapconn->login_host,(int)strlen(tail));
request_str = g_strdup_printf("%s%s", head,tail);
-// gaim_debug_misc("msn", "TWN Sending: {%s}\n", request_str);
+ gaim_debug_misc("msn", "TWN Sending: {%s}\n", request_str);
g_free(head);
g_free(tail);
Modified: branches/soc-2006-msnp13/src/protocols/msn/nexus.h
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/nexus.h 2006-09-08 14:43:34 UTC (rev 17191)
+++ branches/soc-2006-msnp13/src/protocols/msn/nexus.h 2006-09-08 16:02:00 UTC (rev 17192)
@@ -26,7 +26,8 @@
#include "soap.h"
-#define MSN_TWN_SERVER "loginnet.passport.com"
+/*#define MSN_TWN_SERVER "loginnet.passport.com"*/
+#define MSN_TWN_SERVER "login.live.com"
#define TWN_START_TOKEN "<wsse:BinarySecurityToken Id=\"PPToken1\">"
#define TWN_END_TOKEN "</wsse:BinarySecurityToken>"
@@ -48,7 +49,8 @@
"<wsse:Password>%s</wsse:Password>"\
"</wsse:UsernameToken>"\
"</wsse:Security>"\
- "</Header><Body>"\
+ "</Header>"\
+ "<Body>"\
"<ps:RequestMultipleSecurityTokens xmlns:ps=\"http://schemas.microsoft.com/Passport/SoapServices/PPCRL\" Id=\"RSTS\">"\
"<wst:RequestSecurityToken Id=\"RST0\">"\
"<wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>"\
@@ -72,6 +74,66 @@
"</Body>"\
"</Envelope>"
+#define TWN_LIVE_START_TOKEN "<wsse:BinarySecurityToken Id=\"PPToken1\">"
+#define TWN_LIVE_END_TOKEN "</wsse:BinarySecurityToken>"
+#define TWN_LIVE_ENVELOP_TEMPLATE "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"\
+"<Envelope xmlns=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:wsse=\"http://schemas.xmlsoap.org/ws/2003/06/secext\" xmlns:saml=\"urn:oasis:names:tc:SAML:1.0:assertion\" xmlns:wsp=\"http://schemas.xmlsoap.org/ws/2002/12/policy\" xmlns:wsu=\"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd\" xmlns:wsa=\"http://schemas.xmlsoap.org/ws/2004/03/addressing\" xmlns:wssc=\"http://schemas.xmlsoap.org/ws/2004/04/sc\" xmlns:wst=\"http://schemas.xmlsoap.org/ws/2004/04/trust\">"\
+ "<Header>"\
+ "<ps:AuthInfo xmlns:ps=\"http://schemas.microsoft.com/Passport/SoapServices/PPCRL\" Id=\"PPAuthInfo\">"\
+ "<ps:HostingApp>{7108E71A-9926-4FCB-BCC9-9A9D3F32E423}</ps:HostingApp>"\
+ "<ps:BinaryVersion>4</ps:BinaryVersion>"\
+ "<ps:UIVersion>1</ps:UIVersion>"\
+ "<ps:Cookies></ps:Cookies>"\
+ "<ps:RequestParams>AQAAAAIAAABsYwQAAAAyMDUy</ps:RequestParams>"\
+ "</ps:AuthInfo>"\
+ "<wsse:Security>"\
+ "<wsse:UsernameToken Id=\"user\">"\
+ "<wsse:Username>%s</wsse:Username>"\
+ "<wsse:Password>%s</wsse:Password>"\
+ "</wsse:UsernameToken>"\
+ "</wsse:Security>"\
+ "</Header>"\
+ "<Body>"\
+ "<ps:RequestMultipleSecurityTokens xmlns:ps=\"http://schemas.microsoft.com/Passport/SoapServices/PPCRL\" Id=\"RSTS\">"\
+ "<wst:RequestSecurityToken Id=\"RST0\">"\
+ "<wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>"\
+ "<wsp:AppliesTo>"\
+ "<wsa:EndpointReference>"\
+ "<wsa:Address>http://Passport.NET/tb</wsa:Address>"\
+ "</wsa:EndpointReference>"\
+ "</wsp:AppliesTo>"\
+ "</wst:RequestSecurityToken>"\
+ "<wst:RequestSecurityToken Id=\"RST1\">"\
+ "<wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>"\
+ "<wsp:AppliesTo>"\
+ "<wsa:EndpointReference>"\
+ "<wsa:Address>messenger.msn.com</wsa:Address>"\
+ "</wsa:EndpointReference>"\
+ "</wsp:AppliesTo>"\
+ "<wsse:PolicyReference URI=\"%s\"></wsse:PolicyReference>"\
+ "</wst:RequestSecurityToken>"\
+ "<wst:RequestSecurityToken Id=\"RST2\">"\
+ "<wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>"\
+ "<wsp:AppliesTo>"\
+ "<wsa:EndpointReference>"\
+ "<wsa:Address>contacts.msn.com</wsa:Address>"\
+ "</wsa:EndpointReference>"\
+ "</wsp:AppliesTo>"\
+ "<wsse:PolicyReference URI=\"?%s\"></wsse:PolicyReference>"\
+ " </wst:RequestSecurityToken>"\
+ "<wst:RequestSecurityToken Id=\"RST3\">"\
+ "<wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>"\
+ "<wsp:AppliesTo>"\
+ "<wsa:EndpointReference>"\
+ "<wsa:Address>voice.messenger.msn.com</wsa:Address>"\
+ "</wsa:EndpointReference>"\
+ " </wsp:AppliesTo>"\
+ "<wsse:PolicyReference URI=\"?%s\"></wsse:PolicyReference>"\
+ "</wst:RequestSecurityToken>"\
+ "</ps:RequestMultipleSecurityTokens>"\
+ "</Body>"\
+"</Envelope>"
+
typedef struct _MsnNexus MsnNexus;
struct _MsnNexus
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-09-08 14:43:43
|
Revision: 17191
http://svn.sourceforge.net/gaim/?rev=17191&view=rev
Author: sadrul
Date: 2006-09-08 07:43:34 -0700 (Fri, 08 Sep 2006)
Log Message:
-----------
Renaming the buddies (contacts) was not working. Err (Joshua Blanton) reported the bug.
Modified Paths:
--------------
trunk/console/gntblist.c
Modified: trunk/console/gntblist.c
===================================================================
--- trunk/console/gntblist.c 2006-09-08 06:17:59 UTC (rev 17190)
+++ trunk/console/gntblist.c 2006-09-08 14:43:34 UTC (rev 17191)
@@ -795,11 +795,16 @@
if (name && !*name)
name = NULL;
- if (GAIM_BLIST_NODE_IS_CONTACT(node))
- gaim_blist_alias_contact((GaimContact*)node, name);
- else if (GAIM_BLIST_NODE_IS_BUDDY(node))
+ if (GAIM_BLIST_NODE_IS_CONTACT(node)) {
+ GaimContact *contact = (GaimContact*)node;
+ GaimBuddy *buddy = gaim_contact_get_priority_buddy(contact);
+ gaim_blist_alias_contact(contact, name);
+ gaim_blist_alias_buddy(buddy, name);
+ serv_alias_buddy(buddy);
+ } else if (GAIM_BLIST_NODE_IS_BUDDY(node)) {
gaim_blist_alias_buddy((GaimBuddy*)node, name);
- else if (GAIM_BLIST_NODE_IS_CHAT(node))
+ serv_alias_buddy((GaimBuddy*)node);
+ } else if (GAIM_BLIST_NODE_IS_CHAT(node))
gaim_blist_alias_chat((GaimChat*)node, name);
else if (GAIM_BLIST_NODE_IS_GROUP(node))
gaim_blist_rename_group((GaimGroup*)node, name);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-09-08 06:18:00
|
Revision: 17190
http://svn.sourceforge.net/gaim/?rev=17190&view=rev
Author: thekingant
Date: 2006-09-07 23:17:59 -0700 (Thu, 07 Sep 2006)
Log Message:
-----------
Comment change
Modified Paths:
--------------
trunk/libgaim/proxy.c
Modified: trunk/libgaim/proxy.c
===================================================================
--- trunk/libgaim/proxy.c 2006-09-08 06:07:19 UTC (rev 17189)
+++ trunk/libgaim/proxy.c 2006-09-08 06:17:59 UTC (rev 17190)
@@ -888,11 +888,12 @@
else
{
/*
- * TODO: Uh, is this a good idea? For something like
- * oscar, for example, we end up sending binary
- * oscar protocol data to the proxy server, which
- * has no idea what we're talking about, since
- * the proxy server is expecting an HTTP request.
+ * If we're trying to connect to something running on
+ * port 80 then we assume the traffic using this
+ * connection is going to be HTTP traffic. If it's
+ * not then this will fail (uglily). But it's good
+ * to avoid using the CONNECT method because it's
+ * not always allowed.
*/
gaim_debug_info("proxy", "HTTP proxy connection established\n");
gaim_proxy_connect_data_connected(connect_data);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-09-08 06:07:31
|
Revision: 17189
http://svn.sourceforge.net/gaim/?rev=17189&view=rev
Author: thekingant
Date: 2006-09-07 23:07:19 -0700 (Thu, 07 Sep 2006)
Log Message:
-----------
sf patch #1311539, from Peter McCurdy
Display status of file transfers in window titlebar
Modified Paths:
--------------
trunk/gtk/gtkft.c
Modified: trunk/gtk/gtkft.c
===================================================================
--- trunk/gtk/gtkft.c 2006-09-08 02:19:23 UTC (rev 17188)
+++ trunk/gtk/gtkft.c 2006-09-08 06:07:19 UTC (rev 17189)
@@ -183,6 +183,58 @@
}
static void
+update_title_progress(GaimGtkXferDialog *dialog)
+{
+ gboolean valid;
+ GtkTreeIter iter;
+ int num_active_xfers = 0;
+ guint64 total_bytes_xferred = 0;
+ guint64 total_file_size = 0;
+
+ if (dialog->window == NULL)
+ return;
+
+ valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(dialog->model), &iter);
+
+ /* Find all active transfers */
+ while (valid) {
+ GValue val;
+ GaimXfer *xfer = NULL;
+
+ val.g_type = 0;
+ gtk_tree_model_get_value(GTK_TREE_MODEL(dialog->model),
+ &iter, COLUMN_DATA, &val);
+
+ xfer = g_value_get_pointer(&val);
+ if (gaim_xfer_get_status(xfer) == GAIM_XFER_STATUS_STARTED) {
+ num_active_xfers++;
+ total_bytes_xferred += gaim_xfer_get_bytes_sent(xfer);
+ total_file_size += gaim_xfer_get_size(xfer);
+ }
+
+ valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(dialog->model), &iter);
+ }
+
+ /* Update the title */
+ if (num_active_xfers > 0)
+ {
+ gchar *title;
+ int total_pct = 0;
+
+ if (total_file_size > 0) {
+ total_pct = 100 * total_bytes_xferred / total_file_size;
+ }
+
+ title = g_strdup_printf(_("File Transfers - %d%% of %d files"),
+ total_pct, num_active_xfers);
+ gtk_window_set_title(GTK_WINDOW(dialog->window), title);
+ g_free(title);
+ } else {
+ gtk_window_set_title(GTK_WINDOW(dialog->window), _("File Transfers"));
+ }
+}
+
+static void
update_detailed_info(GaimGtkXferDialog *dialog, GaimXfer *xfer)
{
GaimGtkXferUiData *data;
@@ -531,6 +583,7 @@
gaim_gtkxfer_dialog_hide(dialog);
}
+
/**************************************************************************
* Dialog Building Functions
**************************************************************************/
@@ -929,6 +982,7 @@
dialog->num_transfers++;
ensure_row_selected(dialog);
+ update_title_progress(dialog);
}
void
@@ -959,6 +1013,7 @@
else
ensure_row_selected(dialog);
+ update_title_progress(dialog);
gaim_xfer_unref(xfer);
}
@@ -989,6 +1044,7 @@
data = GAIM_GTKXFER(xfer);
update_detailed_info(dialog, xfer);
+ update_title_progress(dialog);
pixbuf = gtk_widget_render_icon(dialog->window,
GAIM_STOCK_FILE_CANCELED,
@@ -1063,6 +1119,7 @@
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(xfer_dialog->tree));
+ update_title_progress(dialog);
if (xfer == dialog->selected_xfer)
update_detailed_info(xfer_dialog, xfer);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-09-08 02:19:31
|
Revision: 17188
http://svn.sourceforge.net/gaim/?rev=17188&view=rev
Author: datallah
Date: 2006-09-07 19:19:23 -0700 (Thu, 07 Sep 2006)
Log Message:
-----------
leak plug
Modified Paths:
--------------
trunk/libgaim/protocols/irc/irc.c
Modified: trunk/libgaim/protocols/irc/irc.c
===================================================================
--- trunk/libgaim/protocols/irc/irc.c 2006-09-08 01:34:46 UTC (rev 17187)
+++ trunk/libgaim/protocols/irc/irc.c 2006-09-08 02:19:23 UTC (rev 17188)
@@ -81,6 +81,7 @@
}
title = g_strdup_printf(_("MOTD for %s"), irc->server);
gaim_notify_formatted(gc, title, title, NULL, irc->motd->str, NULL, NULL);
+ g_free(title);
}
static int do_send(struct irc_conn *irc, const char *buf, gsize len)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ev...@us...> - 2006-09-08 01:34:54
|
Revision: 17187
http://svn.sourceforge.net/gaim/?rev=17187&view=rev
Author: evands
Date: 2006-09-07 18:34:46 -0700 (Thu, 07 Sep 2006)
Log Message:
-----------
At least one place (oscar.c:2294) uses the HAVE_TM_GMTOFF definition, but it was always undefined because the configure.ac did nothing about it. We now check for the tm_gmtoff member of struct tm and set the define appropriately.
The block added to configure.ac was taken from KDE Kopete's configure.ac.
This was particularly a problem for me because while OS X has timezone such that HAVE_TIMEZONE is defined, it's also a function, char * timezone(int zone, int dst), which wrecks havoc.
Modified Paths:
--------------
trunk/configure.ac
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-09-07 23:26:55 UTC (rev 17186)
+++ trunk/configure.ac 2006-09-08 01:34:46 UTC (rev 17187)
@@ -1771,6 +1771,17 @@
AC_CHECK_HEADERS(termios.h)
AC_VAR_TIMEZONE_EXTERNALS
+AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,
+ AC_TRY_COMPILE([
+ #include <time.h>
+ ], [
+ struct tm tm;
+ tm.tm_gmtoff = 1;
+ ], ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no))
+if test $ac_cv_struct_tm_gmtoff = yes; then
+ AC_DEFINE(HAVE_TM_GMTOFF, 1, [Define if you have a tm_gmtoff member in struct tm])
+fi
+
dnl #######################################################################
dnl # Check for Doxygen and dot (part of GraphViz)
dnl #######################################################################
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-09-07 23:26:59
|
Revision: 17186
http://svn.sourceforge.net/gaim/?rev=17186&view=rev
Author: sadrul
Date: 2006-09-07 16:26:55 -0700 (Thu, 07 Sep 2006)
Log Message:
-----------
This is required after the last commit.
Modified Paths:
--------------
trunk/console/gntblist.c
Modified: trunk/console/gntblist.c
===================================================================
--- trunk/console/gntblist.c 2006-09-07 22:57:52 UTC (rev 17185)
+++ trunk/console/gntblist.c 2006-09-07 23:26:55 UTC (rev 17186)
@@ -591,6 +591,7 @@
list = g_list_delete_link(list, list))
{
GaimMenuAction *act = (GaimMenuAction *) list->data;
+ act->data = node;
gnt_append_menu_action(tree, act, NULL);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-09-07 22:58:01
|
Revision: 17185
http://svn.sourceforge.net/gaim/?rev=17185&view=rev
Author: sadrul
Date: 2006-09-07 15:57:52 -0700 (Thu, 07 Sep 2006)
Log Message:
-----------
wabz reported this bug. It should be fixed now.
Modified Paths:
--------------
trunk/console/gntblist.c
Modified: trunk/console/gntblist.c
===================================================================
--- trunk/console/gntblist.c 2006-09-07 22:18:54 UTC (rev 17184)
+++ trunk/console/gntblist.c 2006-09-07 22:57:52 UTC (rev 17185)
@@ -636,7 +636,7 @@
}
static void
-chat_components_edit(GaimChat *chat, GaimBlistNode *null)
+chat_components_edit(GaimChat *chat, GaimBlistNode *selected)
{
GaimRequestFields *fields = gaim_request_fields_new();
GaimRequestFieldGroup *group = gaim_request_field_group_new(NULL);
@@ -688,19 +688,19 @@
}
static void
-gg_add_buddy(GaimGroup *grp, GaimBlistNode *node)
+gg_add_buddy(GaimGroup *grp, GaimBlistNode *selected)
{
gaim_blist_request_add_buddy(NULL, NULL, grp->name, NULL);
}
static void
-gg_add_group(GaimGroup *grp, GaimBlistNode *node)
+gg_add_group(GaimGroup *grp, GaimBlistNode *selected)
{
gaim_blist_request_add_group();
}
static void
-gg_add_chat(GaimGroup *grp, GaimBlistNode *node)
+gg_add_chat(GaimGroup *grp, GaimBlistNode *selected)
{
gaim_blist_request_add_chat(NULL, grp, NULL, NULL);
}
@@ -717,7 +717,7 @@
}
static void
-gg_blist_get_buddy_info_cb(GaimBuddy *buddy, GaimBlistNode *null)
+gg_blist_get_buddy_info_cb(GaimBuddy *buddy, GaimBlistNode *selected)
{
serv_get_info(buddy->account->gc, gaim_buddy_get_name(buddy));
}
@@ -779,7 +779,7 @@
void (*callback)(GaimBlistNode *, gpointer);
callback = (void (*)(GaimBlistNode *, gpointer))action->callback;
if (callback)
- callback(node, action->data);
+ callback(action->data, node);
else
return;
}
@@ -807,7 +807,7 @@
}
static void
-gg_blist_rename_node_cb(GaimBlistNode *node, GaimBlistNode *null)
+gg_blist_rename_node_cb(GaimBlistNode *node, GaimBlistNode *selected)
{
const char *name = NULL;
char *prompt;
@@ -888,7 +888,7 @@
}
static void
-gg_blist_remove_node_cb(GaimBlistNode *node, GaimBlistNode *null)
+gg_blist_remove_node_cb(GaimBlistNode *node, GaimBlistNode *selected)
{
char *primary;
const char *name, *sec = NULL;
@@ -1354,15 +1354,18 @@
static void
redraw_blist(const char *name, GaimPrefType type, gconstpointer val, gpointer data)
{
- GaimBlistNode *node;
+ GaimBlistNode *node, *sel;
if (ggblist == NULL)
return;
+ sel = gnt_tree_get_selection_data(GNT_TREE(ggblist->tree));
gnt_tree_remove_all(GNT_TREE(ggblist->tree));
node = gaim_blist_get_root();
for (; node; node = gaim_blist_node_next(node, TRUE))
node->ui_data = NULL;
populate_buddylist();
+ gnt_tree_set_selected(GNT_TREE(ggblist->tree), sel);
+ draw_tooltip(ggblist);
}
void gg_blist_init()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-09-07 22:19:00
|
Revision: 17184
http://svn.sourceforge.net/gaim/?rev=17184&view=rev
Author: sadrul
Date: 2006-09-07 15:18:54 -0700 (Thu, 07 Sep 2006)
Log Message:
-----------
Plug a small memory-leak, and mark a string for translation.
Modified Paths:
--------------
trunk/gtk/gtkdialogs.c
Modified: trunk/gtk/gtkdialogs.c
===================================================================
--- trunk/gtk/gtkdialogs.c 2006-09-07 17:53:25 UTC (rev 17183)
+++ trunk/gtk/gtkdialogs.c 2006-09-07 22:18:54 UTC (rev 17184)
@@ -1001,10 +1001,17 @@
}
}
+static void free_ggmo(struct _GaimGroupMergeObject *ggp)
+{
+ g_free(ggp->new_name);
+ g_free(ggp);
+}
+
static void
gaim_gtkdialogs_merge_groups_cb(struct _GaimGroupMergeObject *GGP)
{
gaim_blist_rename_group(GGP->parent, GGP->new_name);
+ free_ggmo(GGP);
}
void
@@ -1017,8 +1024,8 @@
g_return_if_fail(new_name != NULL);
text = g_strdup_printf(
- "You are about to merge the group called %s into the group "
- "called %s. Do you want to continue?", source->name, new_name);
+ _("You are about to merge the group called %s into the group "
+ "called %s. Do you want to continue?"), source->name, new_name);
ggp = g_new(struct _GaimGroupMergeObject, 1);
ggp->parent = source;
@@ -1026,7 +1033,7 @@
gaim_request_action(source, NULL, _("Merge Groups"), text, 0, ggp, 2,
_("_Merge Groups"), G_CALLBACK(gaim_gtkdialogs_merge_groups_cb),
- _("Cancel"), NULL);
+ _("Cancel"), G_CALLBACK(free_ggmo));
g_free(text);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-09-07 17:53:46
|
Revision: 17183
http://svn.sourceforge.net/gaim/?rev=17183&view=rev
Author: datallah
Date: 2006-09-07 10:53:25 -0700 (Thu, 07 Sep 2006)
Log Message:
-----------
The gaim executable and the gtkgaim and libgaim dlls now contain version information.
Modified Paths:
--------------
trunk/gtk/Makefile.am
trunk/gtk/Makefile.mingw
trunk/libgaim/Makefile.am
trunk/libgaim/Makefile.mingw
trunk/libgaim/win32/rules.mak
Added Paths:
-----------
trunk/gtk/win32/gaimrc.rc.in
trunk/gtk/win32/gtkgaimrc.rc.in
trunk/libgaim/win32/libgaimrc.rc.in
Removed Paths:
-------------
trunk/gtk/win32/gaimrc.rc
Property Changed:
----------------
trunk/gtk/win32/
trunk/libgaim/win32/
Modified: trunk/gtk/Makefile.am
===================================================================
--- trunk/gtk/Makefile.am 2006-09-07 17:32:25 UTC (rev 17182)
+++ trunk/gtk/Makefile.am 2006-09-07 17:53:25 UTC (rev 17183)
@@ -8,7 +8,8 @@
win32/IdleTracker/Makefile.mingw \
win32/IdleTracker/idletrack.c \
win32/IdleTracker/idletrack.h \
- win32/gaimrc.rc \
+ win32/gaimrc.rc.in \
+ win32/gtkgaimrc.rc.in \
win32/gtkwin32dep.c \
win32/gtkwin32dep.h \
win32/resource.h \
Modified: trunk/gtk/Makefile.mingw
===================================================================
--- trunk/gtk/Makefile.mingw 2006-09-07 17:32:25 UTC (rev 17182)
+++ trunk/gtk/Makefile.mingw 2006-09-07 17:53:25 UTC (rev 17183)
@@ -12,13 +12,10 @@
##
## VARIABLE DEFINITIONS
##
-EXE_TARGET = gaim
-GTKGAIM_TARGET = gtkgaim
+EXE_TARGET := gaim
+GTKGAIM_TARGET := gtkgaim
+EXE_NAME := $(EXE_TARGET).exe
-ifeq ($(MAKECMDGOALS), $(EXE_TARGET)-portable.exe)
-DEFINES := $(DEFINES) -DPORTABLE
-endif
-
WINAPP := -mwindows
# The Debug version of gaim is a console app, always having a console
CONSOLEAPP := -mconsole
@@ -95,10 +92,12 @@
win32/untar.c \
win32/wspell.c
-RC_SRC = win32/gaimrc.rc
+GTKGAIM_RC_SRC = win32/gtkgaimrc.rc
+GTKGAIM_OBJECTS = $(GTKGAIM_C_SRC:%.c=%.o) $(GTKGAIM_RC_SRC:%.rc=%.o)
+
+EXE_RC_SRC = win32/gaimrc.rc
EXE_C_SRC = win32/win_gaim.c
-GTKGAIM_OBJECTS = $(GTKGAIM_C_SRC:%.c=%.o)
-EXE_OBJECTS = $(EXE_C_SRC:%.c=%.o) $(RC_SRC:%.rc=%.o)
+EXE_OBJECTS = $(EXE_C_SRC:%.c=%.o) $(EXE_RC_SRC:%.rc=%.o)
##
## LIBRARIES
@@ -129,8 +128,13 @@
##
## TARGET DEFINITIONS
##
-.PHONY: all clean
+.PHONY: all clean clean_exe
+./win32/gaimrc.rc: ./win32/gaimrc.rc.in $(GAIM_TOP)/VERSION
+ sed -e 's/@GAIM_VERSION@/$(GAIM_VERSION)/g' \
+ -e 's/@ORIGINAL_FILENAME@/$(EXE_NAME)/' \
+ $@.in > $@
+
all: $(EXE_TARGET).exe $(GTKGAIM_TARGET).dll
$(MAKE) -C $(GAIM_GTK_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE)
@@ -142,17 +146,23 @@
cp $(EXE_TARGET).exe $(GTKGAIM_TARGET).dll $(GAIM_INSTALL_DIR)
cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
-$(GTKGAIM_OBJECTS): $(GAIM_CONFIG_H)
+./win32/gtkgaimrc.rc: ./win32/gtkgaimrc.rc.in $(GAIM_TOP)/VERSION
+ sed -e 's/@GAIM_VERSION@/$(GAIM_VERSION)/g' \
+ $@.in > $@
+$(EXE_OBJECTS) $(GTKGAIM_OBJECTS): $(GAIM_CONFIG_H)
+
$(GTKGAIM_TARGET).dll $(GTKGAIM_TARGET).dll.a: $(GAIM_LIBGAIM_DLL).a $(GAIM_IDLETRACK_DLL).a $(GTKGAIM_OBJECTS)
$(CC) -shared $(GTKGAIM_OBJECTS) $(LIB_PATHS) $(GTKGAIM_LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(GTKGAIM_TARGET).dll.a -o $(GTKGAIM_TARGET).dll
$(EXE_TARGET).exe: $(GAIM_CONFIG_H) $(GAIM_GTKGAIM_DLL).a $(GAIM_IDLETRACK_DLL).a $(EXE_OBJECTS)
- $(CC) $(LDFLAGS) $(EXE_OBJECTS) $(LIB_PATHS) $(EXE_LIBS) -o $(EXE_TARGET).exe
+ $(CC) $(LDFLAGS) $(EXE_OBJECTS) -o $(EXE_TARGET).exe
+$(EXE_TARGET)-portable.exe: DEFINES += -DPORTABLE
+$(EXE_TARGET)-portable.exe: EXE_NAME := $(EXE_TARGET)-portable.exe
$(EXE_TARGET)-portable.exe: clean_exe $(GAIM_CONFIG_H) $(GAIM_GTKGAIM_DLL).a $(GAIM_IDLETRACK_DLL).a $(EXE_OBJECTS)
- $(CC) $(LDFLAGS) $(EXE_OBJECTS) $(LIB_PATHS) $(EXE_LIBS) -o $(EXE_TARGET)-portable.exe
- rm win_gaim.o
+ $(CC) $(LDFLAGS) $(EXE_OBJECTS) -o $(EXE_TARGET)-portable.exe
+ $(MAKE) -f $(GAIM_WIN32_MAKEFILE) clean_exe
##
## CLEAN RULES
@@ -160,13 +170,11 @@
clean:
$(MAKE) -C $(GAIM_GTK_IDLETRACK_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
$(MAKE) -C $(GAIM_GTK_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
- rm -f $(GTKGAIM_OBJECTS) $(EXE_OBJECTS)
- rm -f $(GTKGAIM_TARGET).dll
- rm -f $(GTKGAIM_TARGET).dll.a
- rm -f $(EXE_TARGET).exe
- rm -f $(EXE_TARGET)-portable.exe
+ rm -f $(GTKGAIM_OBJECTS) $(GTKGAIM_RC_SRC) $(EXE_OBJECTS) $(EXE_RC_SRC)
+ rm -f $(GTKGAIM_TARGET).dll $(GTKGAIM_TARGET).dll.a
+ rm -f $(EXE_TARGET).exe $(EXE_TARGET)-portable.exe
clean_exe:
- rm -f win_gaim.o
+ rm -f $(EXE_OBJECTS) $(EXE_RC_SRC)
include $(GAIM_COMMON_TARGETS)
Property changes on: trunk/gtk/win32
___________________________________________________________________
Name: svn:ignore
+ gtkgaimrc.rc
gaimrc.rc
*.o
Deleted: trunk/gtk/win32/gaimrc.rc
===================================================================
--- trunk/gtk/win32/gaimrc.rc 2006-09-07 17:32:25 UTC (rev 17182)
+++ trunk/gtk/win32/gaimrc.rc 2006-09-07 17:53:25 UTC (rev 17183)
@@ -1,16 +0,0 @@
-#include "resource.h"
-
-#define PIXMAPDIR "pixmaps/"
-
-GAIM_ICON ICON PIXMAPDIR "gaim.ico"
-GAIM_TRAY_ICON ICON PIXMAPDIR "gaim_16.ico"
-GAIM_OFFLINE_TRAY_ICON ICON PIXMAPDIR "gaim_offline_16.ico"
-GAIM_AWAY_TRAY_ICON ICON PIXMAPDIR "gaim_away_16.ico"
-GAIM_PEND_TRAY_ICON ICON PIXMAPDIR "gaim_msgunread_16.ico"
-GAIM_AWAYPEND_TRAY_ICON ICON PIXMAPDIR "gaim_msgpend_16.ico"
-GAIM_BLANK_TRAY_ICON ICON PIXMAPDIR "gaim_blank_4bit_16.ico"
-GAIM_TRAY_ICON_4BIT ICON PIXMAPDIR "gaim_4bit_16.ico"
-GAIM_OFFLINE_TRAY_ICON_4BIT ICON PIXMAPDIR "gaim_offline_4bit_16.ico"
-GAIM_AWAY_TRAY_ICON_4BIT ICON PIXMAPDIR "gaim_away_4bit_16.ico"
-GAIM_PEND_TRAY_ICON_4BIT ICON PIXMAPDIR "gaim_msgunread_4bit_16.ico"
-GAIM_AWAYPEND_TRAY_ICON_4BIT ICON PIXMAPDIR "gaim_msgpend_4bit_16.ico"
Copied: trunk/gtk/win32/gaimrc.rc.in (from rev 17176, trunk/gtk/win32/gaimrc.rc)
===================================================================
--- trunk/gtk/win32/gaimrc.rc.in (rev 0)
+++ trunk/gtk/win32/gaimrc.rc.in 2006-09-07 17:53:25 UTC (rev 17183)
@@ -0,0 +1,47 @@
+#include <winver.h>
+#include "resource.h"
+#include "version.h"
+
+#define PIXMAPDIR "pixmaps/"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION GAIM_MAJOR_VERSION,GAIM_MINOR_VERSION,GAIM_MICRO_VERSION,0
+ PRODUCTVERSION GAIM_MAJOR_VERSION,GAIM_MINOR_VERSION,GAIM_MICRO_VERSION,0
+ FILEFLAGSMASK 0
+ FILEFLAGS 0
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_APP
+ FILESUBTYPE VFT2_UNKNOWN
+ BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904B0"
+ BEGIN
+ VALUE "CompanyName", "The Gaim developer community"
+ VALUE "FileDescription", "Gaim Executable"
+ VALUE "FileVersion", "@GAIM_VERSION@"
+ VALUE "InternalName", "gaim"
+ VALUE "LegalCopyright", "Copyright (C) 1998-2006 The Gaim developer community (See the COPYRIGHT file in the source distribution)."
+ VALUE "OriginalFilename", "@ORIGINAL_FILENAME@"
+ VALUE "ProductName", "Gaim"
+ VALUE "ProductVersion", "@GAIM_VERSION@"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+ END
+
+GAIM_ICON ICON PIXMAPDIR "gaim.ico"
+GAIM_TRAY_ICON ICON PIXMAPDIR "gaim_16.ico"
+GAIM_OFFLINE_TRAY_ICON ICON PIXMAPDIR "gaim_offline_16.ico"
+GAIM_AWAY_TRAY_ICON ICON PIXMAPDIR "gaim_away_16.ico"
+GAIM_PEND_TRAY_ICON ICON PIXMAPDIR "gaim_msgunread_16.ico"
+GAIM_AWAYPEND_TRAY_ICON ICON PIXMAPDIR "gaim_msgpend_16.ico"
+GAIM_BLANK_TRAY_ICON ICON PIXMAPDIR "gaim_blank_4bit_16.ico"
+GAIM_TRAY_ICON_4BIT ICON PIXMAPDIR "gaim_4bit_16.ico"
+GAIM_OFFLINE_TRAY_ICON_4BIT ICON PIXMAPDIR "gaim_offline_4bit_16.ico"
+GAIM_AWAY_TRAY_ICON_4BIT ICON PIXMAPDIR "gaim_away_4bit_16.ico"
+GAIM_PEND_TRAY_ICON_4BIT ICON PIXMAPDIR "gaim_msgunread_4bit_16.ico"
+GAIM_AWAYPEND_TRAY_ICON_4BIT ICON PIXMAPDIR "gaim_msgpend_4bit_16.ico"
Property changes on: trunk/gtk/win32/gaimrc.rc.in
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/gtk/win32/gtkgaimrc.rc.in
===================================================================
--- trunk/gtk/win32/gtkgaimrc.rc.in (rev 0)
+++ trunk/gtk/win32/gtkgaimrc.rc.in 2006-09-07 17:53:25 UTC (rev 17183)
@@ -0,0 +1,32 @@
+#include <winver.h>
+#include "version.h"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION GAIM_MAJOR_VERSION,GAIM_MINOR_VERSION,GAIM_MICRO_VERSION,0
+ PRODUCTVERSION GAIM_MAJOR_VERSION,GAIM_MINOR_VERSION,GAIM_MICRO_VERSION,0
+ FILEFLAGSMASK 0
+ FILEFLAGS 0
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE VFT2_UNKNOWN
+ BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904B0"
+ BEGIN
+ VALUE "CompanyName", "The Gaim developer community"
+ VALUE "FileDescription", "GTK+ Gaim Library"
+ VALUE "FileVersion", "@GAIM_VERSION@"
+ VALUE "InternalName", "gtkgaim"
+ VALUE "LegalCopyright", "Copyright (C) 1998-2006 The Gaim developer community (See the COPYRIGHT file in the source distribution)."
+ VALUE "OriginalFilename", "gtkgaim.dll"
+ VALUE "ProductName", "Gaim"
+ VALUE "ProductVersion", "@GAIM_VERSION@"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+ END
+
Property changes on: trunk/gtk/win32/gtkgaimrc.rc.in
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: trunk/libgaim/Makefile.am
===================================================================
--- trunk/libgaim/Makefile.am 2006-09-07 17:32:25 UTC (rev 17182)
+++ trunk/libgaim/Makefile.am 2006-09-07 17:53:25 UTC (rev 17183)
@@ -10,6 +10,9 @@
win32/libc_interface.c \
win32/libc_interface.h \
win32/libc_internal.h \
+ win32/libgaimrc.rc.in \
+ win32/rules.mak \
+ win32/targets.mak \
win32/wgaimerror.h \
win32/win32dep.c \
win32/win32dep.h
Modified: trunk/libgaim/Makefile.mingw
===================================================================
--- trunk/libgaim/Makefile.mingw 2006-09-07 17:32:25 UTC (rev 17182)
+++ trunk/libgaim/Makefile.mingw 2006-09-07 17:53:25 UTC (rev 17183)
@@ -76,8 +76,10 @@
win32/libc_interface.c \
win32/win32dep.c
-OBJECTS = $(C_SRC:%.c=%.o)
+RC_SRC = win32/libgaimrc.rc
+OBJECTS = $(C_SRC:%.c=%.o) $(RC_SRC:%.rc=%.o)
+
##
## LIBRARIES
##
@@ -108,6 +110,10 @@
cp $(TARGET).dll $(GAIM_INSTALL_DIR)
cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
+./win32/libgaimrc.rc: ./win32/libgaimrc.rc.in $(GAIM_TOP)/VERSION
+ sed -e 's/@GAIM_VERSION@/$(GAIM_VERSION)/g' \
+ $@.in > $@
+
$(OBJECTS): $(GAIM_CONFIG_H)
$(TARGET).dll $(TARGET).dll.a: $(OBJECTS)
@@ -117,9 +123,8 @@
## CLEAN RULES
##
clean:
- rm -rf $(OBJECTS)
- rm -rf $(TARGET).dll
- rm -rf $(TARGET).dll.a
+ rm -f $(OBJECTS) $(RC_SRC)
+ rm -f $(TARGET).dll $(TARGET).dll.a
$(MAKE) -C $(GAIM_PROTOS_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
$(MAKE) -C $(GAIM_LIB_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
Property changes on: trunk/libgaim/win32
___________________________________________________________________
Name: svn:ignore
+ *.o
libgaimrc.rc
Added: trunk/libgaim/win32/libgaimrc.rc.in
===================================================================
--- trunk/libgaim/win32/libgaimrc.rc.in (rev 0)
+++ trunk/libgaim/win32/libgaimrc.rc.in 2006-09-07 17:53:25 UTC (rev 17183)
@@ -0,0 +1,32 @@
+#include <winver.h>
+#include "version.h"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION GAIM_MAJOR_VERSION,GAIM_MINOR_VERSION,GAIM_MICRO_VERSION,0
+ PRODUCTVERSION GAIM_MAJOR_VERSION,GAIM_MINOR_VERSION,GAIM_MICRO_VERSION,0
+ FILEFLAGSMASK 0
+ FILEFLAGS 0
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE VFT2_UNKNOWN
+ BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904B0"
+ BEGIN
+ VALUE "CompanyName", "The Gaim developer community"
+ VALUE "FileDescription", "Libgaim Library"
+ VALUE "FileVersion", "@GAIM_VERSION@"
+ VALUE "InternalName", "libgaim"
+ VALUE "LegalCopyright", "Copyright (C) 1998-2006 The Gaim developer community (See the COPYRIGHT file in the source distribution)."
+ VALUE "OriginalFilename", "libgaim.dll"
+ VALUE "ProductName", "Gaim"
+ VALUE "ProductVersion", "@GAIM_VERSION@"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+ END
+
Property changes on: trunk/libgaim/win32/libgaimrc.rc.in
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: trunk/libgaim/win32/rules.mak
===================================================================
--- trunk/libgaim/win32/rules.mak 2006-09-07 17:32:25 UTC (rev 17182)
+++ trunk/libgaim/win32/rules.mak 2006-09-07 17:53:25 UTC (rev 17183)
@@ -7,4 +7,4 @@
$(PERL) $(EXTUTILS)/xsubpp -typemap $(EXTUTILS)/typemap -typemap $(GAIM_LIB_PERL_TOP)/common/typemap $< > $@
%.o: %.rc
- $(WINDRES) -i $< -o $@
+ $(WINDRES) -I$(GAIM_LIB_TOP) -i $< -o $@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <may...@us...> - 2006-09-07 17:32:35
|
Revision: 17182
http://svn.sourceforge.net/gaim/?rev=17182&view=rev
Author: mayuan2006
Date: 2006-09-07 10:32:25 -0700 (Thu, 07 Sep 2006)
Log Message:
-----------
change to fix the process of Phone Member
TODO: need to support Phone user later
committed by MaYuan<may...@gm...>
Modified Paths:
--------------
branches/soc-2006-msnp13/src/protocols/msn/contact.c
Modified: branches/soc-2006-msnp13/src/protocols/msn/contact.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/contact.c 2006-09-06 16:14:22 UTC (rev 17181)
+++ branches/soc-2006-msnp13/src/protocols/msn/contact.c 2006-09-07 17:32:25 UTC (rev 17182)
@@ -134,10 +134,9 @@
session = contact->session;
gaim_debug_misc("xml","parse contact list:{%s}\nsize:%d\n",contact->soapconn->body,contact->soapconn->body_len);
node = xmlnode_from_str(contact->soapconn->body, contact->soapconn->body_len);
-// node = xmlnode_from_str(contact->soapconn->body, -1);
if(node == NULL){
- gaim_debug_misc("xml","parse from str err!\n");
+ gaim_debug_misc("xml","parse contact from str err!\n");
return;
}
gaim_debug_misc("xml","node{%p},name:%s,child:%s,last:%s\n",node,node->name,node->child->name,node->lastchild->name);
@@ -333,6 +332,7 @@
g_free(group_id);
/*Process contact List*/
+ gaim_debug_info("MSNAB","process contact list...\n");
contacts =xmlnode_get_child(result,"contacts");
for(contactNode = xmlnode_get_child(contacts, "Contact"); contactNode;
contactNode = xmlnode_get_next_twin(contactNode)){
@@ -365,6 +365,10 @@
/*TODO: add it to the none-instant Messenger group and recognize as email Membership*/
/*Yahoo User?*/
emailsNode = xmlnode_get_child(contactInfo,"emails");
+ if(emailsNode == NULL){
+ /*TODO: need to support the Mobile type*/
+ continue;
+ }
for(contactEmailNode = xmlnode_get_child(emailsNode,"ContactEmail");contactEmailNode;
contactEmailNode = xmlnode_get_next_twin(contactEmailNode) ){
messengerEnabledNode = xmlnode_get_child(contactEmailNode,"isMessengerEnabled");
@@ -408,16 +412,12 @@
msn_user_set_uid(user,uid);
msn_user_set_type(user,msn_get_user_type(type));
user->list_op |= MSN_LIST_FL_OP;
- gaim_debug_info("MsnAB","prepare to free Name...\n");
g_free(Name);
- gaim_debug_info("MsnAB","prepare to free passport...\n");
g_free(passport);
- gaim_debug_info("MsnAB","prepare to free uid...\n");
g_free(uid);
- gaim_debug_info("MsnAB","prepare to free type...\n");
g_free(type);
- gaim_debug_misc("MsnAB","prepare for guid parse...\n");
+ gaim_debug_misc("MsnAB","parse guid...\n");
groupIds = xmlnode_get_child(contactInfo,"groupIds");
if(groupIds){
for(guid = xmlnode_get_child(groupIds, "guid");guid;
@@ -439,7 +439,7 @@
if(abNode != NULL){
LastChangeNode = xmlnode_get_child(abNode,"lastChange");
lastchange = xmlnode_get_data(LastChangeNode);
- gaim_debug_info("MsnAB"," lastchange:{%s}\n",lastchange);
+ gaim_debug_info("MsnAB"," lastchanged Time:{%s}\n",lastchange);
}
xmlnode_free(node);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <may...@us...> - 2006-09-06 16:14:28
|
Revision: 17181
http://svn.sourceforge.net/gaim/?rev=17181&view=rev
Author: mayuan2006
Date: 2006-09-06 09:14:22 -0700 (Wed, 06 Sep 2006)
Log Message:
-----------
add PSM in tooltips
fix oim bug in windows
committed by MaYuan<may...@gm...>
Modified Paths:
--------------
branches/soc-2006-msnp13/src/protocols/msn/msn.c
branches/soc-2006-msnp13/src/protocols/msn/oim.c
Modified: branches/soc-2006-msnp13/src/protocols/msn/msn.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/msn.c 2006-09-06 10:06:58 UTC (rev 17180)
+++ branches/soc-2006-msnp13/src/protocols/msn/msn.c 2006-09-06 16:14:22 UTC (rev 17181)
@@ -572,6 +572,12 @@
if (gaim_presence_is_online(presence))
{
+ char *psm;
+ psm = msn_status_text(buddy);
+ if (psm)
+ g_string_append_printf(str, _("\n<b>%s:</b> %s"), _("Psm"),psm);
+ g_free(psm);
+
g_string_append_printf(str, _("\n<b>%s:</b> %s"), _("Status"),
gaim_presence_is_idle(presence) ?
_("Idle") : gaim_status_get_name(status));
@@ -592,8 +598,6 @@
(user->list_op & (1 << MSN_LIST_BL)) ?
_("Yes") : _("No"));
}
-
- gaim_debug_info("MaYuan","tooltip string:{%s}\n",str);
}
static GList *
Modified: branches/soc-2006-msnp13/src/protocols/msn/oim.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/oim.c 2006-09-06 10:06:58 UTC (rev 17180)
+++ branches/soc-2006-msnp13/src/protocols/msn/oim.c 2006-09-06 16:14:22 UTC (rev 17181)
@@ -491,15 +491,20 @@
mdNode = xmlnode_from_str(xmlmsg, strlen(xmlmsg));
for(mNode = xmlnode_get_child(mdNode, "M"); mNode;
mNode = xmlnode_get_next_twin(mNode)){
+ /*email Node*/
ENode = xmlnode_get_child(mNode,"E");
passport = xmlnode_get_data(ENode);
+ /*Index */
INode = xmlnode_get_child(mNode,"I");
msgid = xmlnode_get_data(INode);
- rtNode = xmlnode_get_child(mNode,"RT");
- rTime = xmlnode_get_data(rtNode);
+ /*Nickname*/
nNode = xmlnode_get_child(mNode,"N");
nickname = xmlnode_get_data(nNode);
- gaim_debug_info("MaYuan","E:{%s},I:{%s},rTime:{%s}\n",passport,msgid,rTime);
+ /*receive time*/
+ rtNode = xmlnode_get_child(mNode,"RT");
+ if(rtNode != NULL)
+ rTime = xmlnode_get_data(rtNode);
+/* gaim_debug_info("MaYuan","E:{%s},I:{%s},rTime:{%s}\n",passport,msgid,rTime);*/
oim->oim_list = g_list_append(oim->oim_list,msgid);
msn_oim_post_single_get_msg(oim,msgid);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-09-06 10:06:59
|
Revision: 17180
http://svn.sourceforge.net/gaim/?rev=17180&view=rev
Author: thekingant
Date: 2006-09-06 03:06:58 -0700 (Wed, 06 Sep 2006)
Log Message:
-----------
Don't allow dns lookups of empty strings
Modified Paths:
--------------
trunk/libgaim/dnsquery.c
Modified: trunk/libgaim/dnsquery.c
===================================================================
--- trunk/libgaim/dnsquery.c 2006-09-06 10:04:34 UTC (rev 17179)
+++ trunk/libgaim/dnsquery.c 2006-09-06 10:06:58 UTC (rev 17180)
@@ -591,6 +591,12 @@
query_data->data = data;
query_data->resolver = NULL;
+ if (strlen(query_data->hostname) == 0)
+ {
+ gaim_dnsquery_destroy(query_data);
+ g_return_val_if_reached(NULL);
+ }
+
if (!queued_requests)
queued_requests = g_queue_new();
g_queue_push_tail(queued_requests, query_data);
@@ -757,6 +763,12 @@
query_data->error_message = NULL;
query_data->hosts = NULL;
+ if (strlen(query_data->hostname) == 0)
+ {
+ gaim_dnsquery_destroy(query_data);
+ g_return_val_if_reached(NULL);
+ }
+
/* Don't call the callback before returning */
query_data->timeout = gaim_timeout_add(0, resolve_host, query_data);
@@ -812,6 +824,7 @@
g_return_val_if_fail(hostname != NULL, NULL);
g_return_val_if_fail(port != 0, NULL);
+ g_return_val_if_fail(callback != NULL, NULL);
query_data = g_new(GaimDnsQueryData, 1);
query_data->hostname = g_strdup(hostname);
@@ -820,6 +833,12 @@
query_data->callback = callback;
query_data->data = data;
+ if (strlen(query_data->hostname) == 0)
+ {
+ gaim_dnsquery_destroy(query_data);
+ g_return_val_if_reached(NULL);
+ }
+
/* Don't call the callback before returning */
query_data->timeout = gaim_timeout_add(0, resolve_host, query_data);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-09-06 10:04:37
|
Revision: 17179
http://svn.sourceforge.net/gaim/?rev=17179&view=rev
Author: thekingant
Date: 2006-09-06 03:04:34 -0700 (Wed, 06 Sep 2006)
Log Message:
-----------
fix a warning
gtkdialogs.c:1006: warning: no previous prototype for
?\226?\128?\152gaim_gtkdialogs_merge_groups_cb?\226?\128?\153
Modified Paths:
--------------
trunk/gtk/gtkdialogs.c
Modified: trunk/gtk/gtkdialogs.c
===================================================================
--- trunk/gtk/gtkdialogs.c 2006-09-06 05:24:13 UTC (rev 17178)
+++ trunk/gtk/gtkdialogs.c 2006-09-06 10:04:34 UTC (rev 17179)
@@ -1001,7 +1001,7 @@
}
}
-void
+static void
gaim_gtkdialogs_merge_groups_cb(struct _GaimGroupMergeObject *GGP)
{
gaim_blist_rename_group(GGP->parent, GGP->new_name);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aar...@us...> - 2006-09-06 05:24:18
|
Revision: 17178
http://svn.sourceforge.net/gaim/?rev=17178&view=rev
Author: aaronsheldon
Date: 2006-09-05 22:24:13 -0700 (Tue, 05 Sep 2006)
Log Message:
-----------
This commit adds a confirmation dialog to GTKgaim when merging two groups.
Modified Paths:
--------------
trunk/gtk/gtkblist.c
trunk/gtk/gtkdialogs.c
trunk/gtk/gtkdialogs.h
Modified: trunk/gtk/gtkblist.c
===================================================================
--- trunk/gtk/gtkblist.c 2006-09-06 03:58:53 UTC (rev 17177)
+++ trunk/gtk/gtkblist.c 2006-09-06 05:24:13 UTC (rev 17178)
@@ -317,6 +317,7 @@
GtkTreePath *path;
GValue val;
GaimBlistNode *node;
+ GaimGroup *dest;
path = gtk_tree_path_new_from_string (arg1);
gtk_tree_model_get_iter (GTK_TREE_MODEL(gtkblist->treemodel), &iter, path);
@@ -350,7 +351,11 @@
serv_alias_buddy((GaimBuddy *)node);
break;
case GAIM_BLIST_GROUP_NODE:
- gaim_blist_rename_group((GaimGroup*)node, arg2);
+ dest = gaim_find_group(arg2);
+ if (dest != NULL && strcmp(arg2, ((GaimGroup*) node)->name)) {
+ gaim_gtkdialogs_merge_groups((GaimGroup*) node, arg2);
+ } else
+ gaim_blist_rename_group((GaimGroup*)node, arg2);
break;
case GAIM_BLIST_CHAT_NODE:
gaim_blist_alias_chat((GaimChat*)node, arg2);
Modified: trunk/gtk/gtkdialogs.c
===================================================================
--- trunk/gtk/gtkdialogs.c 2006-09-06 03:58:53 UTC (rev 17177)
+++ trunk/gtk/gtkdialogs.c 2006-09-06 05:24:13 UTC (rev 17178)
@@ -43,6 +43,11 @@
static GtkWidget *about = NULL;
+struct _GaimGroupMergeObject {
+ GaimGroup* parent;
+ char *new_name;
+};
+
struct developer {
char *name;
char *role;
@@ -996,6 +1001,36 @@
}
}
+void
+gaim_gtkdialogs_merge_groups_cb(struct _GaimGroupMergeObject *GGP)
+{
+ gaim_blist_rename_group(GGP->parent, GGP->new_name);
+}
+
+void
+gaim_gtkdialogs_merge_groups(GaimGroup *source, const char *new_name)
+{
+ gchar *text;
+ struct _GaimGroupMergeObject *ggp;
+
+ g_return_if_fail(source != NULL);
+ g_return_if_fail(new_name != NULL);
+
+ text = g_strdup_printf(
+ "You are about to merge the group called %s into the group "
+ "called %s. Do you want to continue?", source->name, new_name);
+
+ ggp = g_new(struct _GaimGroupMergeObject, 1);
+ ggp->parent = source;
+ ggp->new_name = g_strdup(new_name);
+
+ gaim_request_action(source, NULL, _("Merge Groups"), text, 0, ggp, 2,
+ _("_Merge Groups"), G_CALLBACK(gaim_gtkdialogs_merge_groups_cb),
+ _("Cancel"), NULL);
+
+ g_free(text);
+}
+
static void
gaim_gtkdialogs_remove_group_cb(GaimGroup *group)
{
Modified: trunk/gtk/gtkdialogs.h
===================================================================
--- trunk/gtk/gtkdialogs.h 2006-09-06 03:58:53 UTC (rev 17177)
+++ trunk/gtk/gtkdialogs.h 2006-09-06 05:24:13 UTC (rev 17178)
@@ -44,6 +44,7 @@
void gaim_gtkdialogs_remove_group(GaimGroup *);
void gaim_gtkdialogs_remove_chat(GaimChat *);
void gaim_gtkdialogs_remove_contact(GaimContact *);
+void gaim_gtkdialogs_merge_groups(GaimGroup *, const char *);
/* Everything after this should probably be moved elsewhere */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fac...@us...> - 2006-09-06 03:59:01
|
Revision: 17177
http://svn.sourceforge.net/gaim/?rev=17177&view=rev
Author: faceprint
Date: 2006-09-05 20:58:53 -0700 (Tue, 05 Sep 2006)
Log Message:
-----------
commit part of 1547648
commit some jabber stuff I did a few days ago and forgot about
Modified Paths:
--------------
trunk/libgaim/protocols/jabber/buddy.c
trunk/libgaim/protocols/jabber/chat.c
trunk/libgaim/protocols/jabber/presence.c
trunk/libgaim/protocols/jabber/presence.h
Modified: trunk/libgaim/protocols/jabber/buddy.c
===================================================================
--- trunk/libgaim/protocols/jabber/buddy.c 2006-09-06 03:12:05 UTC (rev 17176)
+++ trunk/libgaim/protocols/jabber/buddy.c 2006-09-06 03:58:53 UTC (rev 17177)
@@ -658,6 +658,8 @@
purdy = gaim_strdup_withhtml(jbr->status);
g_string_append_printf(info_text, "<b>%s:</b> %s<br/>",
_("Resource"), jbr->name);
+ g_string_append_printf(info_text, "<b>%s:</b> %d<br/>",
+ _("Priority"), jbr->priority);
g_string_append_printf(info_text, "<b>%s:</b> %s%s%s<br/>",
_("Status"), jabber_buddy_state_get_name(jbr->state),
purdy ? ": " : "",
@@ -1190,7 +1192,7 @@
JabberBuddy *jb = jabber_buddy_find(js, who, TRUE);
xmlnode *presence;
JabberBuddyState state;
- const char *msg;
+ char *msg;
int priority;
account = gaim_connection_get_account(js->gc);
@@ -1200,6 +1202,8 @@
gaim_status_to_jabber(status, &state, &msg, &priority);
presence = jabber_presence_create(state, msg, priority);
+ g_free(msg);
+
xmlnode_set_attrib(presence, "to", who);
if(invisible) {
xmlnode_set_attrib(presence, "type", "invisible");
Modified: trunk/libgaim/protocols/jabber/chat.c
===================================================================
--- trunk/libgaim/protocols/jabber/chat.c 2006-09-06 03:12:05 UTC (rev 17176)
+++ trunk/libgaim/protocols/jabber/chat.c 2006-09-06 03:58:53 UTC (rev 17177)
@@ -205,7 +205,7 @@
GaimPresence *gpresence;
GaimStatus *status;
JabberBuddyState state;
- const char *msg;
+ char *msg;
int priority;
room = g_hash_table_lookup(data, "room");
@@ -265,6 +265,7 @@
full_jid = g_strdup_printf("%s/%s", room_jid, handle);
xmlnode_set_attrib(presence, "to", full_jid);
g_free(full_jid);
+ g_free(msg);
x = xmlnode_new_child(presence, "x");
xmlnode_set_namespace(x, "http://jabber.org/protocol/muc");
@@ -618,7 +619,7 @@
GaimPresence *gpresence;
GaimStatus *status;
JabberBuddyState state;
- const char *msg;
+ char *msg;
int priority;
if(!chat->muc) {
@@ -637,6 +638,7 @@
full_jid = g_strdup_printf("%s@%s/%s", chat->room, chat->server, nick);
xmlnode_set_attrib(presence, "to", full_jid);
g_free(full_jid);
+ g_free(msg);
jabber_send(chat->js, presence);
xmlnode_free(presence);
Modified: trunk/libgaim/protocols/jabber/presence.c
===================================================================
--- trunk/libgaim/protocols/jabber/presence.c 2006-09-06 03:12:05 UTC (rev 17176)
+++ trunk/libgaim/protocols/jabber/presence.c 2006-09-06 03:58:53 UTC (rev 17177)
@@ -66,7 +66,7 @@
JabberBuddyResource *jbr;
if((jb = jabber_buddy_find(js, my_base_jid, TRUE))) {
JabberBuddyState state;
- const char *msg;
+ char *msg;
int priority;
gaim_status_to_jabber(gstatus, &state, &msg, &priority);
@@ -81,6 +81,8 @@
} else {
gaim_prpl_got_user_status(js->gc->account, my_base_jid, "offline", msg ? "message" : NULL, msg, NULL);
}
+
+ g_free(msg);
}
}
g_free(my_base_jid);
@@ -95,7 +97,6 @@
int primitive;
xmlnode *presence, *x, *photo;
char *stripped = NULL;
- const char *msg;
JabberBuddyState state;
int priority;
@@ -111,10 +112,8 @@
gc = gaim_account_get_connection(account);
js = gc->proto_data;
- gaim_status_to_jabber(status, &state, &msg, &priority);
+ gaim_status_to_jabber(status, &state, &stripped, &priority);
- if(msg)
- gaim_markup_html_to_xhtml(msg, NULL, &stripped);
presence = jabber_presence_create(state, stripped, priority);
g_free(stripped);
@@ -604,9 +603,10 @@
xmlnode_free(presence);
}
-void gaim_status_to_jabber(const GaimStatus *status, JabberBuddyState *state, const char **msg, int *priority)
+void gaim_status_to_jabber(const GaimStatus *status, JabberBuddyState *state, char **msg, int *priority)
{
const char *status_id = NULL;
+ const char *formatted_msg = NULL;
if(state) *state = JABBER_BUDDY_STATE_UNKNOWN;
if(msg) *msg = NULL;
@@ -621,11 +621,14 @@
}
if(msg) {
- *msg = gaim_status_get_attr_string(status, "message");
+ formatted_msg = gaim_status_get_attr_string(status, "message");
/* if the message is blank, then there really isn't a message */
- if(*msg && !**msg)
- *msg = NULL;
+ if(formatted_msg && !*formatted_msg)
+ formatted_msg = NULL;
+
+ if(formatted_msg)
+ gaim_markup_html_to_xhtml(formatted_msg, NULL, msg);
}
if(priority)
Modified: trunk/libgaim/protocols/jabber/presence.h
===================================================================
--- trunk/libgaim/protocols/jabber/presence.h 2006-09-06 03:12:05 UTC (rev 17176)
+++ trunk/libgaim/protocols/jabber/presence.h 2006-09-06 03:58:53 UTC (rev 17177)
@@ -32,6 +32,6 @@
void jabber_presence_subscription_set(JabberStream *js, const char *who,
const char *type);
void jabber_presence_fake_to_self(JabberStream *js, const GaimStatus *status);
-void gaim_status_to_jabber(const GaimStatus *status, JabberBuddyState *state, const char **msg, int *priority);
+void gaim_status_to_jabber(const GaimStatus *status, JabberBuddyState *state, char **msg, int *priority);
#endif /* _GAIM_JABBER_PRESENCE_H_ */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-09-06 03:12:08
|
Revision: 17176
http://svn.sourceforge.net/gaim/?rev=17176&view=rev
Author: datallah
Date: 2006-09-05 20:12:05 -0700 (Tue, 05 Sep 2006)
Log Message:
-----------
Fix bug #1553112 (printf("%s", NULL) stuff)
Modified Paths:
--------------
trunk/libgaim/protocols/gg/gg.c
Modified: trunk/libgaim/protocols/gg/gg.c
===================================================================
--- trunk/libgaim/protocols/gg/gg.c 2006-09-06 03:01:57 UTC (rev 17175)
+++ trunk/libgaim/protocols/gg/gg.c 2006-09-06 03:12:05 UTC (rev 17176)
@@ -1324,7 +1324,7 @@
gaim_debug_info("gg",
"notify: (%d) status: %d; descr: %s\n",
- n->uin, n->status, descr);
+ n->uin, n->status, descr ? descr : "(null)");
ggp_generic_status_handler(gc,
n->uin, n->status, descr);
@@ -1335,7 +1335,8 @@
gaim_debug_info("gg",
"notify60_pre: (%d) status=%d; version=%d; descr=%s\n",
ev->event.notify60->uin, ev->event.notify60->status,
- ev->event.notify60->version, ev->event.notify60->descr);
+ ev->event.notify60->version,
+ ev->event.notify60->descr ? ev->event.notify60->descr : "(null)");
for (i = 0; ev->event.notify60[i].uin; i++) {
gaim_debug_info("gg",
@@ -1343,7 +1344,7 @@
ev->event.notify60[i].uin,
ev->event.notify60[i].status,
ev->event.notify60[i].version,
- ev->event.notify60[i].descr);
+ ev->event.notify60[i].descr ? ev->event.notify60[i].descr : "(null)");
ggp_generic_status_handler(gc, ev->event.notify60[i].uin,
ev->event.notify60[i].status,
@@ -1353,7 +1354,7 @@
case GG_EVENT_STATUS:
gaim_debug_info("gg", "status: (%d) status=%d; descr=%s\n",
ev->event.status.uin, ev->event.status.status,
- ev->event.status.descr);
+ ev->event.status.descr ? ev->event.status.descr : "(null)");
ggp_generic_status_handler(gc, ev->event.status.uin,
ev->event.status.status, ev->event.status.descr);
@@ -1362,7 +1363,8 @@
gaim_debug_info("gg",
"status60: (%d) status=%d; version=%d; descr=%s\n",
ev->event.status60.uin, ev->event.status60.status,
- ev->event.status60.version, ev->event.status60.descr);
+ ev->event.status60.version,
+ ev->event.status60.descr ? ev->event.status60.descr : "(null)");
ggp_generic_status_handler(gc, ev->event.status60.uin,
ev->event.status60.status, ev->event.status60.descr);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-09-06 03:02:12
|
Revision: 17175
http://svn.sourceforge.net/gaim/?rev=17175&view=rev
Author: datallah
Date: 2006-09-05 20:01:57 -0700 (Tue, 05 Sep 2006)
Log Message:
-----------
A couple mingw makefile tweaks from Lee Roach and some cleanup from me.
Modified Paths:
--------------
trunk/Makefile.mingw
trunk/gtk/pixmaps/Makefile.mingw
trunk/gtk/pixmaps/smileys/default/Makefile.mingw
trunk/gtk/pixmaps/smileys/none/Makefile.mingw
trunk/gtk/pixmaps/status/default/Makefile.mingw
trunk/gtk/sounds/Makefile.mingw
trunk/libgaim/win32/global.mak
trunk/libgaim/win32/targets.mak
Modified: trunk/Makefile.mingw
===================================================================
--- trunk/Makefile.mingw 2006-09-06 02:33:25 UTC (rev 17174)
+++ trunk/Makefile.mingw 2006-09-06 03:01:57 UTC (rev 17175)
@@ -59,7 +59,6 @@
$(MAKE) -C $(GAIM_LIB_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
rm -rf $(GAIM_CONFIG_H)
rm -rf gaim*.exe
- rm -rf $(GAIM_INSTALL_PERLMOD_DIR) $(GAIM_INSTALL_PIXMAPS_DIR) $(GAIM_INSTALL_PLUGINS_DIR)
- rm -rf $(GAIM_INSTALL_PO_DIR) $(GAIM_INSTALL_SOUNDS_DIR) $(GAIM_INSTALL_DIR)
+ rm -rf $(GAIM_INSTALL_PERLMOD_DIR) $(GAIM_INSTALL_PLUGINS_DIR) $(GAIM_INSTALL_PO_DIR) $(GAIM_INSTALL_DIR)
include $(GAIM_COMMON_TARGETS)
Modified: trunk/gtk/pixmaps/Makefile.mingw
===================================================================
--- trunk/gtk/pixmaps/Makefile.mingw 2006-09-06 02:33:25 UTC (rev 17174)
+++ trunk/gtk/pixmaps/Makefile.mingw 2006-09-06 03:01:57 UTC (rev 17175)
@@ -7,13 +7,13 @@
GAIM_TOP := ../..
include $(GAIM_TOP)/libgaim/win32/global.mak
-datadir = $(GAIM_INSTALL_DIR)
+datadir := $(GAIM_INSTALL_DIR)
include ./Makefile.am
install:
if test '$(SUBDIRS)'; then \
list='$(SUBDIRS)'; for subdir in $$list; do \
- $(MAKE) -C $$subdir -f Makefile.mingw install; \
+ $(MAKE) -C $$subdir -f $(GAIM_WIN32_MAKEFILE) install; \
done; \
fi;
if test '$(gaimbuttonpix_DATA)'; then \
Modified: trunk/gtk/pixmaps/smileys/default/Makefile.mingw
===================================================================
--- trunk/gtk/pixmaps/smileys/default/Makefile.mingw 2006-09-06 02:33:25 UTC (rev 17174)
+++ trunk/gtk/pixmaps/smileys/default/Makefile.mingw 2006-09-06 03:01:57 UTC (rev 17175)
@@ -11,11 +11,6 @@
include ./Makefile.am
install:
- if test '$(SUBDIRS)'; then \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- $(MAKE) -C $$subdir -f Makefile.mingw install; \
- done; \
- fi;
if test '$(gaimsmileypix_DATA)'; then \
mkdir -p $(gaimsmileypixdir); \
cp $(gaimsmileypix_DATA) $(gaimsmileypixdir); \
Modified: trunk/gtk/pixmaps/smileys/none/Makefile.mingw
===================================================================
--- trunk/gtk/pixmaps/smileys/none/Makefile.mingw 2006-09-06 02:33:25 UTC (rev 17174)
+++ trunk/gtk/pixmaps/smileys/none/Makefile.mingw 2006-09-06 03:01:57 UTC (rev 17175)
@@ -11,11 +11,6 @@
include ./Makefile.am
install:
- if test '$(SUBDIRS)'; then \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- $(MAKE) -C $$subdir -f Makefile.mingw install; \
- done; \
- fi;
if test '$(gaimsmileypix_DATA)'; then \
mkdir -p $(gaimsmileypixdir); \
cp $(gaimsmileypix_DATA) $(gaimsmileypixdir); \
Modified: trunk/gtk/pixmaps/status/default/Makefile.mingw
===================================================================
--- trunk/gtk/pixmaps/status/default/Makefile.mingw 2006-09-06 02:33:25 UTC (rev 17174)
+++ trunk/gtk/pixmaps/status/default/Makefile.mingw 2006-09-06 03:01:57 UTC (rev 17175)
@@ -11,11 +11,6 @@
include ./Makefile.am
install:
- if test '$(SUBDIRS)'; then \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- $(MAKE) -C $$subdir -f Makefile.mingw install; \
- done; \
- fi;
if test '$(gaimstatuspix_DATA)'; then \
mkdir -p $(gaimstatuspixdir); \
cp $(gaimstatuspix_DATA) $(gaimstatuspixdir); \
Modified: trunk/gtk/sounds/Makefile.mingw
===================================================================
--- trunk/gtk/sounds/Makefile.mingw 2006-09-06 02:33:25 UTC (rev 17174)
+++ trunk/gtk/sounds/Makefile.mingw 2006-09-06 03:01:57 UTC (rev 17175)
@@ -1,14 +1,18 @@
#
# Makefile.mingw
#
-# Description: Makefile for win32 (mingw) version of Gaim
+# Description: Makefile for win32 (mingw) version of Gaim sounds
#
GAIM_TOP := ../..
include $(GAIM_TOP)/libgaim/win32/global.mak
-include $(GAIM_GTK_SOUNDS_TOP)/Makefile.am
-install: $(GAIM_INSTALL_SOUNDS_DIR)
- cp $(EXTRA_DIST) $(GAIM_INSTALL_SOUNDS_DIR)
+datadir := $(GAIM_INSTALL_DIR)
+include ./Makefile.am
-include $(GAIM_COMMON_TARGETS)
+install:
+ if test '$(sounds_DATA)'; then \
+ mkdir -p $(soundsdir); \
+ cp $(sounds_DATA) $(soundsdir); \
+ fi;
+
Modified: trunk/libgaim/win32/global.mak
===================================================================
--- trunk/libgaim/win32/global.mak 2006-09-06 02:33:25 UTC (rev 17174)
+++ trunk/libgaim/win32/global.mak 2006-09-06 03:01:57 UTC (rev 17175)
@@ -23,10 +23,8 @@
# Where we installing this stuff to?
GAIM_INSTALL_DIR := $(GAIM_TOP)/win32-install-dir
GAIM_INSTALL_PERLMOD_DIR := $(GAIM_INSTALL_DIR)/perlmod
-GAIM_INSTALL_PIXMAPS_DIR := $(GAIM_INSTALL_DIR)/pixmaps
GAIM_INSTALL_PLUGINS_DIR := $(GAIM_INSTALL_DIR)/plugins
GAIM_INSTALL_PO_DIR := $(GAIM_INSTALL_DIR)/locale
-GAIM_INSTALL_SOUNDS_DIR := $(GAIM_INSTALL_DIR)/sounds
# Important (enough) locations in our source code
GAIM_LIB_TOP := $(GAIM_TOP)/libgaim
Modified: trunk/libgaim/win32/targets.mak
===================================================================
--- trunk/libgaim/win32/targets.mak 2006-09-06 02:33:25 UTC (rev 17174)
+++ trunk/libgaim/win32/targets.mak 2006-09-06 03:01:57 UTC (rev 17175)
@@ -36,11 +36,6 @@
$(GAIM_INSTALL_PLUGINS_DIR):
mkdir -p $(GAIM_INSTALL_PLUGINS_DIR)
-$(GAIM_INSTALL_PIXMAPS_DIR):
- mkdir -p $(GAIM_INSTALL_PIXMAPS_DIR)
-
$(GAIM_INSTALL_PO_DIR):
mkdir -p $(GAIM_INSTALL_PO_DIR)
-$(GAIM_INSTALL_SOUNDS_DIR):
- mkdir -p $(GAIM_INSTALL_SOUNDS_DIR)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-09-06 02:33:29
|
Revision: 17174
http://svn.sourceforge.net/gaim/?rev=17174&view=rev
Author: datallah
Date: 2006-09-05 19:33:25 -0700 (Tue, 05 Sep 2006)
Log Message:
-----------
gaim_gtk_blist_update_columns() was removed today.
Modified Paths:
--------------
trunk/gtk/plugins/perl/common/GtkBlist.xs
Modified: trunk/gtk/plugins/perl/common/GtkBlist.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkBlist.xs 2006-09-06 02:08:15 UTC (rev 17173)
+++ trunk/gtk/plugins/perl/common/GtkBlist.xs 2006-09-06 02:33:25 UTC (rev 17174)
@@ -52,9 +52,6 @@
Gaim::BuddyList list
void
-gaim_gtk_blist_update_columns()
-
-void
gaim_gtk_blist_update_refresh_timeout()
gboolean
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-09-06 02:08:19
|
Revision: 17173
http://svn.sourceforge.net/gaim/?rev=17173&view=rev
Author: datallah
Date: 2006-09-05 19:08:15 -0700 (Tue, 05 Sep 2006)
Log Message:
-----------
Fix Bug #153721 - Crash caused by non-UTF8 text passed to g_markup_escape_text(). I suspect there may be elsewhere in the gg prpl that suffers from the same problem, but I don't want to be willy-nilly running utf8 validation everyere.
Modified Paths:
--------------
trunk/libgaim/protocols/gg/gg.c
Modified: trunk/libgaim/protocols/gg/gg.c
===================================================================
--- trunk/libgaim/protocols/gg/gg.c 2006-09-06 00:46:00 UTC (rev 17172)
+++ trunk/libgaim/protocols/gg/gg.c 2006-09-06 02:08:15 UTC (rev 17173)
@@ -1547,7 +1547,7 @@
return text;
} else {
- tmp = g_strdup(gaim_status_get_name(status));
+ tmp = gaim_utf8_salvage(gaim_status_get_name(status));
text = g_markup_escape_text(tmp, -1);
g_free(tmp);
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.
