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: Sean E. <sea...@us...> - 2002-08-25 06:08:17
|
Update of /cvsroot/gaim/gaim/src In directory usw-pr-cvs1:/tmp/cvs-serv21073/src Modified Files: Makefile.am Log Message: Bye bye, applet. Index: Makefile.am =================================================================== RCS file: /cvsroot/gaim/gaim/src/Makefile.am,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- Makefile.am 25 Aug 2002 04:59:34 -0000 1.47 +++ Makefile.am 25 Aug 2002 06:08:15 -0000 1.48 @@ -3,7 +3,6 @@ bin_PROGRAMS = gaim gaim_SOURCES = about.c \ aim.c \ - applet.c \ away.c \ browser.c \ buddy.c \ |
From: Sean E. <sea...@us...> - 2002-08-25 04:59:37
|
Update of /cvsroot/gaim/gaim In directory usw-pr-cvs1:/tmp/cvs-serv8207 Modified Files: Makefile.am configure.ac configure.in Removed Files: gaim_applet.desktop gaim_applet.gnorba Log Message: HEAD is now GTK 2 only. If you want to use GTK1.2, use our gtk1_stable branch. Index: Makefile.am =================================================================== RCS file: /cvsroot/gaim/gaim/Makefile.am,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- Makefile.am 20 Aug 2002 17:00:56 -0000 1.33 +++ Makefile.am 25 Aug 2002 04:59:34 -0000 1.34 @@ -1,33 +1,5 @@ - -EXTRA_DIST = config.rpath gaim.spec.in gaim_applet.gnorba gaim.desktop gaim_applet.desktop \ +EXTRA_DIST = config.rpath gaim.spec.in gaim.desktop \ HACKING gaim2blt.pl licq2gaim.pl setup-gettext - -if DISTRIB - -distribgnorbadir = $(sysconfdir)/CORBA/servers -distribgnorba_DATA = gaim_applet.gnorba - -distribdesktopdir = $(datadir)/applets/Network -distribdesktop_DATA = gaim_applet.desktop - -else - -if GNOMEAPPLET - -gnomesysconf = `@GNOME_CONFIG@ --sysconfdir` -gnomedata = `@GNOME_CONFIG@ --datadir` - -gaim_GNORBA = gaim_applet.gnorba -gaimgnorbadir = $(gnomesysconf)/CORBA/servers -gaimgnorba_DATA = $(gaim_GNORBA) - -gaim_DESKTOP = gaim_applet.desktop -gaimdesktopdir = $(gnomedata)/applets/Network -gaimdesktop_DATA = $(gaim_DESKTOP) - -endif - -endif pixmapdir = $(datadir)/gnome/apps/Internet pixmap_DATA = gaim.desktop Index: configure.ac =================================================================== RCS file: /cvsroot/gaim/gaim/configure.ac,v retrieving revision 1.77 retrieving revision 1.78 diff -u -d -r1.77 -r1.78 --- configure.ac 18 Aug 2002 19:32:04 -0000 1.77 +++ configure.ac 25 Aug 2002 04:59:34 -0000 1.78 @@ -104,12 +104,6 @@ AC_SUBST(STATIC_LINK_LIBS) AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init void static_proto_init() { $load_proto }) -AC_ARG_ENABLE(gtk2, [ --enable-gtk2 compile using GTK 2 (BROKEN)],,enable_gtk2=no) -AC_ARG_ENABLE(gnome, [ --disable-gnome compile without Gnome bits],,enable_gnome=yes) -AC_ARG_ENABLE(pixbuf, [ --disable-pixbuf compile without GdkPixbuf],,enable_pixbuf=yes) -AC_ARG_ENABLE(panel, [ --enable-panel compile as a GNOME applet],,enable_panel=$enable_distrib) - -AM_CONDITIONAL(GNOMEAPPLET, test "x$enable_panel" = "xyes") AC_ARG_ENABLE(esd, [ --disable-esd Turn off ESD (default=auto)],,enable_esd=yes) AC_ARG_ENABLE(nas, [ --enable-nas Enable NAS (Network Audio System) support],,enable_nas=no) AC_ARG_ENABLE(artsc, [ --disable-artsc Turn off ArtsC (default=auto)],,enable_artsc=yes) @@ -126,118 +120,23 @@ AC_DEFINE(DEBUG) fi -if test "x$enable_gtk2" = "xyes" ; then - dnl AM_PATH_GTK_2_0(1.3.10,[ - dnl enable_gnome=no - dnl enable_pixbuf=no - dnl CFLAGS="$CFLAGS -DGTK_ENABLE_BROKEN" - dnl UI_LIBS="$UI_LIBS $GTK_LIBS" - dnl ],enable_gtk2=no) - - AC_PATH_PROG(pkgcfg, pkg-config) - if test "x$pkgcfg" = "x" ; then - enable_gtk2=no - else - GTK_VER=`$pkgcfg gtk+-2.0 --modversion 2>/dev/null` - if test "x$GTK_VER" = "x" ; then - enable_gtk2=no - else - GTK_CFLAGS=`$pkgcfg gtk+-2.0 --cflags` - CFLAGS="$CFLAGS -DGTK_ENABLE_BROKEN" - GTK_LIBS=`$pkgcfg gtk+-2.0 --libs` - UI_LIBS="$UI_LIBS $GTK_LIBS" - enable_gnome=no - enable_pixbuf=no - fi - fi -fi - -GNOME_INIT_HOOK([], nofail, applets) - -if test "x$enable_gnome" = "xyes" ; then - if test "x$enable_panel" = "xyes" ; then - GNOME_X_CHECKS - CFLAGS="$CFLAGS $GNOME_INCLUDEDIR" - AC_DEFINE(USE_APPLET) - AC_DEFINE(USE_GNOME) - UI_LIBS="$UI_LIBS $GTK_LIBS $GNOME_LIBDIR $GNOME_APPLETS_LIBS $GNOMEUI_LIBS" - AC_PATH_PROG(gaimpath, gaim_applet) - else - AC_PATH_PROG(gnomepath, gnome-config) - AC_MSG_CHECKING(for Gnome compile flags) - GNOME_CFLAGS=`$gnomepath gnomeui --cflags 2>/dev/null` - if test "x$GNOME_CFLAGS" = "x" ; then - enable_gnome=no - AC_MSG_RESULT([Gnome not found, building without it.]) - else - GNOME_VER=`$gnomepath --version |$sedpath 's/gnome-libs //' 2>/dev/null` - GNOME_MAJOR=`echo $GNOME_VER |$sedpath 's/\([[0-9]*]*\).\([[0-9]*]*\).\([[0-9]*]*\)/\1/' 2>/dev/null` - if test "x$GNOME_MAJOR" = "x0" ; then - enable_gnome = no - AC_MSG_RESULT([old Gnome found, building without it.]) - else - AC_MSG_RESULT(ok) - CFLAGS="$CFLAGS $GNOME_CFLAGS" - UI_LIBS="$UI_LIBS `$gnomepath gnomeui --libs 2>/dev/null`" - AC_DEFINE(USE_GNOME) - GNOME_CONFIG="$gnomepath" - AC_SUBST(GNOME_CONFIG) - AC_PATH_PROG(gaimpath, gaim) - fi - fi - fi -fi - -if test "x$enable_gnome" != "xyes" -a "x$enable_gtk2" != "xyes" ; then - AM_PATH_GLIB(1.2.5,,AC_MSG_ERROR([ -*** GLib is required to build Gaim; please make sure you have the GLib +AM_PATH_GLIB_2_0(1.3.0,,AC_MSG_ERROR([ +*** GLib 2.0 is required to build Gaim; please make sure you have the GLib *** development headers installed. The latest version of GLib is *** always available at http://www.gtk.org/.])) - AM_PATH_GTK(1.2.5,,AC_MSG_ERROR([ -*** GTK+ is required to build Gaim; please make sure you have the GTK+ +AM_PATH_GTK_2_0(1.3.0,,AC_MSG_ERROR([ +*** GTK+ 2.0 is required to build Gaim; please make sure you have the GTK+ *** development headers installed. The latest version of GTK+ is *** always available at http://www.gtk.org/.])) - UI_LIBS="$UI_LIBS $GTK_LIBS" - AC_PATH_PROG(gaimpath, gaim) -fi -CFLAGS="$CFLAGS $GTK_CFLAGS" -dnl if test "x$enable_panel" = "xyes" ; then - dnl Things moved with the new versoin of Orbit. Thanks for - dnl telling me, Dan. This should fix them. - dnl - dnl The gnome-config script should pick this up and affect GNOME_ variables - dnl correctly. Thus, this check is not needed; if it fails, it is because of - dnl a broken installation or that your appletsConf.sh file is not updated - dnl for the new orbit installation. Gaim shouldn't need to do this. - dnl - dnl CFLAGS="$CFLAGS $ORBIT_CFLAGS" -dnl fi - -use_pixbuf=no -if test "x$enable_pixbuf" = "xyes" ; then - AC_PATH_PROG(pixbufcfg, gdk-pixbuf-config) - if test "x$pixbufcfg" != "x" ; then - GDK_PIXBUF_CFLAGS=`$pixbufcfg --cflags` - GDK_PIXBUF_LIBS=`$pixbufcfg --libs` - GDK_PIXBUF_CONFIG="$pixbufcfg" - AC_SUBST(GDK_PIXBUF_CONFIG) - AC_SUBST(GDK_PIXBUF_CFLAGS) - AC_SUBST(GDK_PIXBUF_LIBS) - CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS" - UI_LIBS="$UI_LIBS $GDK_PIXBUF_LIBS" - dnl We should be doing checks to see that the header files and functions exist. eh. - AC_DEFINE(USE_PIXBUF) - use_pixbuf=yes - fi -fi -AC_SUBST(UI_LIBS) +AC_PATH_PROG(gaimpath, gaim) +CFLAGS="$CFLAGS $GTK_CFLAGS -DGTK_ENABLE_BROKEN" dnl Check for XScreenSaver if test "x$enable_xss" = "xyes" ; then AC_PATH_X old_LIBS="$LIBS" - LIBS="$LIBS $UI_LIBS -L$x_libraries" + LIBS="$LIBS $GTK_LIBS -L$x_libraries" XSS_LIBS="no" XSS_HEADERS="no" AC_CHECK_LIB(Xext, XScreenSaverRegister,[XSS_LIBS="-L$x_libraries"],[],[-lX11 -lXext -lm]) @@ -462,20 +361,7 @@ echo Build Protocol Plugins........ : $enable_prpls echo Protocols to link statically.. : $STATIC_PRPLS echo -if test "x$enable_panel" = "xyes" ; then - echo UI Library.................... : GNOME Panel -elif test "x$enable_gnome" = "xyes" ; then - echo UI Library.................... : GNOME App -elif test "x$enable_gtk2" = "xyes" ; then - echo UI Library.................... : GTK+ 2.0 -else - echo UI Library.................... : GTK+ 1.2 -fi -if test "x$enable_gtk2" = "xno" ; then -dnl echo Use GdkPixbuf................. : yes -dnl else - echo Use GdkPixbuf................. : $use_pixbuf -fi +echo UI Library.................... : GTK 2.0 echo echo Build with Plugin support..... : $enable_plugins echo Build with Perl support....... : $enable_perl Index: configure.in =================================================================== RCS file: /cvsroot/gaim/gaim/configure.in,v retrieving revision 1.125 retrieving revision 1.126 diff -u -d -r1.125 -r1.126 --- configure.in 18 Aug 2002 19:32:04 -0000 1.125 +++ configure.in 25 Aug 2002 04:59:34 -0000 1.126 @@ -103,12 +103,6 @@ AC_SUBST(STATIC_LINK_LIBS) AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init void static_proto_init() { $load_proto }) -AC_ARG_ENABLE(gtk2, [ --enable-gtk2 compile using GTK 2 (BROKEN)],,enable_gtk2=no) -AC_ARG_ENABLE(gnome, [ --disable-gnome compile without Gnome bits],,enable_gnome=yes) -AC_ARG_ENABLE(pixbuf, [ --disable-pixbuf compile without GdkPixbuf],,enable_pixbuf=yes) -AC_ARG_ENABLE(panel, [ --enable-panel compile as a GNOME applet],,enable_panel=$enable_distrib) - -AM_CONDITIONAL(GNOMEAPPLET, test "x$enable_panel" = "xyes") AC_ARG_ENABLE(esd, [ --disable-esd Turn off ESD (default=auto)],,enable_esd=yes) AC_ARG_ENABLE(nas, [ --enable-nas Enable NAS (Network Audio System) support],,enable_nas=no) AC_ARG_ENABLE(artsc, [ --disable-artsc Turn off ArtsC (default=auto)],,enable_artsc=yes) @@ -125,118 +119,26 @@ AC_DEFINE(DEBUG) fi -if test "x$enable_gtk2" = "xyes" ; then - dnl AM_PATH_GTK_2_0(1.3.10,[ - dnl enable_gnome=no - dnl enable_pixbuf=no - dnl CFLAGS="$CFLAGS -DGTK_ENABLE_BROKEN" - dnl UI_LIBS="$UI_LIBS $GTK_LIBS" - dnl ],enable_gtk2=no) - - AC_PATH_PROG(pkgcfg, pkg-config) - if test "x$pkgcfg" = "x" ; then - enable_gtk2=no - else - GTK_VER=`$pkgcfg gtk+-2.0 --modversion 2>/dev/null` - if test "x$GTK_VER" = "x" ; then - enable_gtk2=no - else - GTK_CFLAGS=`$pkgcfg gtk+-2.0 --cflags` - CFLAGS="$CFLAGS -DGTK_ENABLE_BROKEN" - GTK_LIBS=`$pkgcfg gtk+-2.0 --libs` - UI_LIBS="$UI_LIBS $GTK_LIBS" - enable_gnome=no - enable_pixbuf=no - fi - fi -fi - -GNOME_INIT_HOOK([], nofail, applets) - -if test "x$enable_gnome" = "xyes" ; then - if test "x$enable_panel" = "xyes" ; then - GNOME_X_CHECKS - CFLAGS="$CFLAGS $GNOME_INCLUDEDIR" - AC_DEFINE(USE_APPLET) - AC_DEFINE(USE_GNOME) - UI_LIBS="$UI_LIBS $GTK_LIBS $GNOME_LIBDIR $GNOME_APPLETS_LIBS $GNOMEUI_LIBS" - AC_PATH_PROG(gaimpath, gaim_applet) - else - AC_PATH_PROG(gnomepath, gnome-config) - AC_MSG_CHECKING(for Gnome compile flags) - GNOME_CFLAGS=`$gnomepath gnomeui --cflags 2>/dev/null` - if test "x$GNOME_CFLAGS" = "x" ; then - enable_gnome=no - AC_MSG_RESULT([Gnome not found, building without it.]) - else - GNOME_VER=`$gnomepath --version |$sedpath 's/gnome-libs //' 2>/dev/null` - GNOME_MAJOR=`echo $GNOME_VER |$sedpath 's/\([[0-9]*]*\).\([[0-9]*]*\).\([[0-9]*]*\)/\1/' 2>/dev/null` - if test "x$GNOME_MAJOR" = "x0" ; then - enable_gnome = no - AC_MSG_RESULT([old Gnome found, building without it.]) - else - AC_MSG_RESULT(ok) - CFLAGS="$CFLAGS $GNOME_CFLAGS" - UI_LIBS="$UI_LIBS `$gnomepath gnomeui --libs 2>/dev/null`" - AC_DEFINE(USE_GNOME) - GNOME_CONFIG="$gnomepath" - AC_SUBST(GNOME_CONFIG) - AC_PATH_PROG(gaimpath, gaim) - fi - fi - fi -fi -if test "x$enable_gnome" != "xyes" -a "x$enable_gtk2" != "xyes" ; then - AM_PATH_GLIB(1.2.5,,AC_MSG_ERROR([ -*** GLib is required to build Gaim; please make sure you have the GLib -*** development headers installed. The latest version of GLib is -*** always available at http://www.gtk.org/.])) - AM_PATH_GTK(1.2.5,,AC_MSG_ERROR([ -*** GTK+ is required to build Gaim; please make sure you have the GTK+ -*** development headers installed. The latest version of GTK+ is -*** always available at http://www.gtk.org/.])) - UI_LIBS="$UI_LIBS $GTK_LIBS" - AC_PATH_PROG(gaimpath, gaim) -fi -CFLAGS="$CFLAGS $GTK_CFLAGS" +AM_PATH_GLIB_2_0(1.3.0,AC_MSG_ERROR([ +*** Glib 2.0 is required to build Gaim 0.60 and above. Please make sure +*** you have the Glib 2.0 development headers installed, or use our 0.59 +*** stable branch, if you'd prefer to use Glib 1.2. Glib can be found at +*** http://www.gtk.org])) +AM_PATH_GTK_2_0(1.3.0,AC_MSG_ERROR([ +*** GTK+ 2.0 is required to build Gaim 0.60 and above. Please make sure +*** you have the GTK+ 2.0 development headers installed, or use our 0.59 +*** stable branch, if you'd prefer to use GTK+ 2.0. GTK can be found at +*** http://www.gtk.org])) +AC_PATH_PROG(gaimpath, gaim) +CFLAGS="$CFLAGS $GTK_CFLAGS -DGTK_ENABLE_BROKEN" -dnl if test "x$enable_panel" = "xyes" ; then - dnl Things moved with the new versoin of Orbit. Thanks for - dnl telling me, Dan. This should fix them. - dnl - dnl The gnome-config script should pick this up and affect GNOME_ variables - dnl correctly. Thus, this check is not needed; if it fails, it is because of - dnl a broken installation or that your appletsConf.sh file is not updated - dnl for the new orbit installation. Gaim shouldn't need to do this. - dnl - dnl CFLAGS="$CFLAGS $ORBIT_CFLAGS" -dnl fi - -use_pixbuf=no -if test "x$enable_pixbuf" = "xyes" ; then - AC_PATH_PROG(pixbufcfg, gdk-pixbuf-config) - if test "x$pixbufcfg" != "x" ; then - GDK_PIXBUF_CFLAGS=`$pixbufcfg --cflags` - GDK_PIXBUF_LIBS=`$pixbufcfg --libs` - GDK_PIXBUF_CONFIG="$pixbufcfg" - AC_SUBST(GDK_PIXBUF_CONFIG) - AC_SUBST(GDK_PIXBUF_CFLAGS) - AC_SUBST(GDK_PIXBUF_LIBS) - CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS" - UI_LIBS="$UI_LIBS $GDK_PIXBUF_LIBS" - dnl We should be doing checks to see that the header files and functions exist. eh. - AC_DEFINE(USE_PIXBUF) - use_pixbuf=yes - fi -fi -AC_SUBST(UI_LIBS) dnl Check for XScreenSaver if test "x$enable_xss" = "xyes" ; then AC_PATH_X old_LIBS="$LIBS" - LIBS="$LIBS $UI_LIBS -L$x_libraries" + LIBS="$LIBS $GTK_LIBS -L$x_libraries" XSS_LIBS="no" XSS_HEADERS="no" AC_CHECK_LIB(Xext, XScreenSaverRegister,[XSS_LIBS="-L$x_libraries"],[],[-lX11 -lXext -lm]) @@ -459,20 +361,7 @@ echo Build Protocol Plugins........ : $enable_prpls echo Protocols to link statically.. : $STATIC_PRPLS echo -if test "x$enable_panel" = "xyes" ; then - echo UI Library.................... : GNOME Panel -elif test "x$enable_gnome" = "xyes" ; then - echo UI Library.................... : GNOME App -elif test "x$enable_gtk2" = "xyes" ; then - echo UI Library.................... : GTK+ 2.0 -else - echo UI Library.................... : GTK+ 1.2 -fi -if test "x$enable_gtk2" = "xyes" ; then - echo Use GdkPixbuf................. : yes -else - echo Use GdkPixbuf................. : $use_pixbuf -fi +echo UI Library.................... : GTK 2.0 echo echo Build with Plugin support..... : $enable_plugins echo Build with Perl support....... : $enable_perl --- gaim_applet.desktop DELETED --- --- gaim_applet.gnorba DELETED --- |
From: Sean E. <sea...@us...> - 2002-08-25 04:59:37
|
Update of /cvsroot/gaim/gaim/src In directory usw-pr-cvs1:/tmp/cvs-serv8207/src Modified Files: .cvsignore Makefile.am Removed Files: applet.c applet.h ticker.c Log Message: HEAD is now GTK 2 only. If you want to use GTK1.2, use our gtk1_stable branch. Index: .cvsignore =================================================================== RCS file: /cvsroot/gaim/gaim/src/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .cvsignore 26 Mar 2000 08:53:59 -0000 1.2 +++ .cvsignore 25 Aug 2002 04:59:34 -0000 1.3 @@ -3,4 +3,4 @@ .deps .libs gaim -gaim_applet + Index: Makefile.am =================================================================== RCS file: /cvsroot/gaim/gaim/src/Makefile.am,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- Makefile.am 11 Aug 2002 06:42:16 -0000 1.46 +++ Makefile.am 25 Aug 2002 04:59:34 -0000 1.47 @@ -1,38 +1,5 @@ SUBDIRS = protocols -if GNOMEAPPLET -bin_PROGRAMS = gaim_applet -gaim_applet_SOURCES = about.c \ - aim.c \ - applet.c \ - away.c \ - browser.c \ - buddy.c \ - buddy_chat.c \ - conversation.c \ - core.c \ - dialogs.c \ - gaimrc.c \ - gtkimhtml.c \ - gtkspell.c \ - html.c \ - idle.c \ - list.c \ - md5.c \ - module.c \ - multi.c \ - perl.c \ - plugins.c \ - prefs.c \ - proxy.c \ - prpl.c \ - server.c \ - sound.c \ - util.c -gaim_applet_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS) -gaim_applet_LDFLAGS = -export-dynamic -gaim_applet_LDADD = @LDADD@ @LIBOBJS@ -else bin_PROGRAMS = gaim gaim_SOURCES = about.c \ aim.c \ @@ -64,12 +31,11 @@ gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS) gaim_LDFLAGS = -export-dynamic gaim_LDADD = @LDADD@ @LIBOBJS@ -endif CFLAGS += $(PERL_CFLAGS) CFLAGS += -DLOCALEDIR=\"$(datadir)/locale\" -DLIBDIR=\"$(libdir)/gaim/\" $(DEBUG_CFLAGS) -DDATADIR=\"$(datadir)\" -LIBS = @LIBS@ $(UI_LIBS) $(SOUND_LIBS) $(STATIC_LINK_LIBS) $(PERL_LIBS) $(XSS_LIBS) $(INTLLIBS) $(DEBUG_LIBS) +LIBS = @LIBS@ $(GTK_LIBS) $(SOUND_LIBS) $(STATIC_LINK_LIBS) $(PERL_LIBS) $(XSS_LIBS) $(INTLLIBS) $(DEBUG_LIBS) EXTRA_DIST = applet.h \ convo.h \ --- applet.c DELETED --- --- applet.h DELETED --- --- ticker.c DELETED --- |
From: Sean E. <sea...@us...> - 2002-08-25 04:59:37
|
Update of /cvsroot/gaim/gaim/pixmaps In directory usw-pr-cvs1:/tmp/cvs-serv8207/pixmaps Modified Files: Makefile.am Log Message: HEAD is now GTK 2 only. If you want to use GTK1.2, use our gtk1_stable branch. Index: Makefile.am =================================================================== RCS file: /cvsroot/gaim/gaim/pixmaps/Makefile.am,v retrieving revision 1.73 retrieving revision 1.74 diff -u -d -r1.73 -r1.74 --- Makefile.am 5 Aug 2002 07:56:37 -0000 1.73 +++ Makefile.am 25 Aug 2002 04:59:34 -0000 1.74 @@ -127,31 +127,10 @@ gaimbuttonpixdir = $(datadir)/pixmaps/gaim/buttons gaimbuttonpix_DATA = edit.png -if DISTRIB - - gaimdistpixdir = $(datadir)/pixmaps/gaim - gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png - - distpixmapdir = $(datadir)/pixmaps - distpixmap_DATA = gaim.png - -else - -if GNOMEAPPLET - -gnomedata = `@GNOME_CONFIG@ --datadir` - -gaimdistpmdir = $(gnomedata)/pixmaps/gaim -gaimdistpm_DATA = away.png connect.png msgpend.png offline.png online.png - -gaimpixmapdir = $(gnomedata)/pixmaps -gaimpixmap_DATA = gaim.png - -else +gaimdistpixdir = $(datadir)/pixmaps/gaim +gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png -pixmapdir = $(datadir)/pixmaps -pixmap_DATA = gaim.png +distpixmapdir = $(datadir)/pixmaps +distpixmap_DATA = gaim.png -endif -endif |
From: Sean E. <sea...@us...> - 2002-08-25 04:54:50
|
Update of /cvsroot/gaim/gaim/src In directory usw-pr-cvs1:/tmp/cvs-serv7601/src Modified Files: about.c Log Message: How did that get there? Index: about.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/about.c,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- about.c 25 Aug 2002 02:24:47 -0000 1.69 +++ about.c 25 Aug 2002 04:54:47 -0000 1.70 @@ -4,7 +4,7 @@ * Copyright (C) 1998-1999, Mark Spencer <mar...@ma...> * * This program is free software; you can redistribute it and/or modify -/* it under the terms of the GNU General Public License as published by + * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * |
From: Sean E. <sea...@us...> - 2002-08-25 02:43:01
|
Update of /cvsroot/gaim/gaim/src In directory usw-pr-cvs1:/tmp/cvs-serv15699/src Modified Files: Tag: gtk1-stable browser.c Log Message: At least *someone* (chipx86) knows what the hell he's doing. Index: browser.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/browser.c,v retrieving revision 1.23.2.1 retrieving revision 1.23.2.2 diff -u -d -r1.23.2.1 -r1.23.2.2 --- browser.c 22 Aug 2002 03:16:03 -0000 1.23.2.1 +++ browser.c 25 Aug 2002 02:42:57 -0000 1.23.2.2 @@ -559,58 +559,6 @@ } -#if !GTK_CHECK_VERSION(1,3,0) -/* From Glib 2.0 */ -/** - * g_shell_quote: - * @unquoted_string: a literal string - * - * Quotes a string so that the shell (/bin/sh) will interpret the - * quoted string to mean @unquoted_string. If you pass a filename to - * the shell, for example, you should first quote it with this - * function. The return value must be freed with g_free(). The - * quoting style used is undefined (single or double quotes may be - * used). - * - * Return value: quoted string -**/ -gchar* -g_shell_quote (const gchar *unquoted_string) -{ - /* We always use single quotes, because the algorithm is cheesier. - * We could use double if we felt like it, that might be more - * human-readable. - */ - const gchar *p; - GString *dest; - - g_return_val_if_fail (unquoted_string != NULL, NULL); - - dest = g_string_new ("'"); - - p = unquoted_string; - - /* could speed this up a lot by appending chunks of text at a - * time. - */ - while (*p) - { - /* Replace literal ' with a close ', a \', and a open ' */ - if (*p == '\'') - g_string_append (dest, "'\\''"); - else - g_string_append_c (dest, *p); - ++p; - } - /* close the quote */ - g_string_append_c (dest, '\''); - - p = dest->str; - g_string_free (dest, FALSE); - return p; -} -#endif - void open_url(GtkWidget *w, char *url) { @@ -634,9 +582,8 @@ pid = fork(); if (pid == 0) { - char *args[4]; + char **args; char command[1024]; - char *quoted = NULL; if (web_browser == BROWSER_OPERA) { args[0] = "opera"; @@ -663,17 +610,14 @@ args[1] = url; args[2] = NULL; } else if (web_browser == BROWSER_MANUAL) { - g_snprintf(command, sizeof(command), web_command, quoted); - quoted = g_shell_quote(command); - args[0] = "sh"; - args[1] = "-c"; - args[2] = quoted; - args[3] = NULL; + gchar *space_free_url; + space_free_url = g_strdelimit(url, " ", '+'); + g_snprintf(command, sizeof(command), web_command, space_free_url); + g_free(space_free_url); + args = g_strsplit(command, " ", 0); } execvp(args[0], args); - if (quoted) - g_free(quoted); _exit(0); } } |
From: Sean E. <sea...@us...> - 2002-08-25 02:29:22
|
Update of /cvsroot/gaim/gaim In directory usw-pr-cvs1:/tmp/cvs-serv13297 Modified Files: Tag: gtk1-stable ChangeLog Log Message: The perl fix. Index: ChangeLog =================================================================== RCS file: /cvsroot/gaim/gaim/ChangeLog,v retrieving revision 1.509.2.2 retrieving revision 1.509.2.3 diff -u -d -r1.509.2.2 -r1.509.2.3 --- ChangeLog 22 Aug 2002 03:25:00 -0000 1.509.2.2 +++ ChangeLog 25 Aug 2002 02:29:19 -0000 1.509.2.3 @@ -4,6 +4,8 @@ * Fixed a security bug in the manual browser setting * Now using libiconv for better i18n support (Thanks Junichi Uekawa) + * Will work with Perl 5.8 (thanks, Timothy Lee and Dan + Colascione) version 0.59 (06/24/2002): * Hungarian translation added (Thanks, Sutto Zoltan) |
From: Sean E. <sea...@us...> - 2002-08-25 02:29:22
|
Update of /cvsroot/gaim/gaim/src In directory usw-pr-cvs1:/tmp/cvs-serv13297/src Modified Files: Tag: gtk1-stable perl.c Log Message: The perl fix. Index: perl.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/perl.c,v retrieving revision 1.72 retrieving revision 1.72.2.1 diff -u -d -r1.72 -r1.72.2.1 --- perl.c 29 May 2002 01:44:40 -0000 1.72 +++ perl.c 25 Aug 2002 02:29:19 -0000 1.72.2.1 @@ -34,6 +34,8 @@ #ifdef USE_PERL +#define group perl_group + #include <EXTERN.h> #ifndef _SEM_SEMUN_UNDEFINED #define HAS_UNION_SEMUN @@ -49,6 +51,7 @@ #include <dirent.h> #include <string.h> +#undef group /* perl module support */ extern void xs_init _((void)); @@ -174,14 +177,14 @@ void perl_autoload() { DIR *dir; - struct dirent *ent; + struct dirent dirent_buf; char *buf; char *path; path = gaim_user_dir(); dir = opendir(path); if (dir) { - while ((ent = readdir(dir))) { + while ((readdir_r(dir,&dirent_buf,&ent),ent)) { if (strcmp(ent->d_name, ".") && strcmp(ent->d_name, "..")) { if (is_pl_file(ent->d_name)) { buf = g_malloc(strlen(path) + strlen(ent->d_name) + 2); |
From: Sean E. <sea...@us...> - 2002-08-25 02:24:50
|
Update of /cvsroot/gaim/gaim/src In directory usw-pr-cvs1:/tmp/cvs-serv11442/src Modified Files: about.c Log Message: ... Index: about.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/about.c,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- about.c 25 May 2002 19:11:34 -0000 1.68 +++ about.c 25 Aug 2002 02:24:47 -0000 1.69 @@ -4,7 +4,7 @@ * Copyright (C) 1998-1999, Mark Spencer <mar...@ma...> * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by +/* it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * @@ -135,7 +135,7 @@ _("Gaim is a modular Instant Messaging client capable of using AIM, ICQ,\n" "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.\n" "It is written using Gtk+ and is licensed under the GPL.\n\n" "URL: " WEBSITE "\n\n" - "IRC: #gaim on irc.openprojects.net")); + "IRC: #gaim on irc.freenode.net")); gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT); gtk_box_pack_start(GTK_BOX(fbox), label, TRUE, TRUE, 0); |
From: Sean E. <sea...@us...> - 2002-08-25 02:23:37
|
Update of /cvsroot/gaim/gaim/src In directory usw-pr-cvs1:/tmp/cvs-serv10233/src Modified Files: Tag: gtk1-stable about.c Log Message: Good idea, R2D2781. Index: about.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/about.c,v retrieving revision 1.68 retrieving revision 1.68.2.1 diff -u -d -r1.68 -r1.68.2.1 --- about.c 25 May 2002 19:11:34 -0000 1.68 +++ about.c 25 Aug 2002 02:23:33 -0000 1.68.2.1 @@ -135,7 +135,7 @@ _("Gaim is a modular Instant Messaging client capable of using AIM, ICQ,\n" "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.\n" "It is written using Gtk+ and is licensed under the GPL.\n\n" "URL: " WEBSITE "\n\n" - "IRC: #gaim on irc.openprojects.net")); + "IRC: #gaim on irc.freenode.net")); gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT); gtk_box_pack_start(GTK_BOX(fbox), label, TRUE, TRUE, 0); |
From: Christian H. <ch...@us...> - 2002-08-24 22:34:57
|
Update of /cvsroot/gaim/gaim In directory usw-pr-cvs1:/tmp/cvs-serv29334 Modified Files: setup-gettext Log Message: Missed one. Index: setup-gettext =================================================================== RCS file: /cvsroot/gaim/gaim/setup-gettext,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- setup-gettext 24 Aug 2002 22:32:16 -0000 1.4 +++ setup-gettext 24 Aug 2002 22:34:52 -0000 1.5 @@ -61,7 +61,7 @@ [ -f autogen.sh ] && { cp autogen.sh .tmp-autogen.sh - sed -e 's/\(gettextize\|autopoint\) --version/.\/setup-gettext --gettext-tool/1' -f 's/^\(echo.*|[\t ]*\)\?\(gettextize\|autopoint\) -.*$/.\/setup-gettext/1' < .tmp-autogen.sh > autogen.sh + sed -e 's/\(gettextize\|autopoint\) --version/.\/setup-gettext --gettext-tool/1' -e 's/^\(echo.*|[\t ]*\)\?\(gettextize\|autopoint\) -.*$/.\/setup-gettext/1' < .tmp-autogen.sh > autogen.sh rm .tmp-autogen.sh } |
From: Christian H. <ch...@us...> - 2002-08-24 22:32:21
|
Update of /cvsroot/gaim/gaim In directory usw-pr-cvs1:/tmp/cvs-serv28620 Modified Files: setup-gettext Log Message: Oops. Blindly regexping is bad. Index: setup-gettext =================================================================== RCS file: /cvsroot/gaim/gaim/setup-gettext,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- setup-gettext 24 Aug 2002 02:15:37 -0000 1.3 +++ setup-gettext 24 Aug 2002 22:32:16 -0000 1.4 @@ -47,21 +47,21 @@ install() { [ -f configure.in ] && { cp configure.in .tmp-configure.in - sed -f 's/^AM_GNU_GETTEXT\(.*\)$/AM_GNU_GETTEXT\1\ + sed -e 's/^AM_GNU_GETTEXT\(.*\)$/AM_GNU_GETTEXT\1\ AM_GNU_GETTEXT_VERSION(0.10.40)/' < .tmp-configure.in > configure.in rm .tmp-configure.in } [ -f configure.ac ] && { cp configure.ac .tmp-configure.ac - sed -f 's/^AM_GNU_GETTEXT\(.*\)$/AM_GNU_GETTEXT\1\ + sed -e 's/^AM_GNU_GETTEXT\(.*\)$/AM_GNU_GETTEXT\1\ AM_GNU_GETTEXT_VERSION(0.10.40)/' < .tmp-configure.ac > configure.ac rm .tmp-configure.ac } [ -f autogen.sh ] && { cp autogen.sh .tmp-autogen.sh - sed -f 's/\(gettextize\|autopoint\) --version/.\/setup-gettext --gettext-tool/1' -f 's/^\(echo.*|[\t ]*\)\?\(gettextize\|autopoint\) -.*$/.\/setup-gettext/1' < .tmp-autogen.sh > autogen.sh + sed -e 's/\(gettextize\|autopoint\) --version/.\/setup-gettext --gettext-tool/1' -f 's/^\(echo.*|[\t ]*\)\?\(gettextize\|autopoint\) -.*$/.\/setup-gettext/1' < .tmp-autogen.sh > autogen.sh rm .tmp-autogen.sh } |
From: Christian H. <ch...@us...> - 2002-08-24 02:15:40
|
Update of /cvsroot/gaim/gaim In directory usw-pr-cvs1:/tmp/cvs-serv20517 Modified Files: setup-gettext Log Message: Latest version of setup-gettext. Fixes some of the bashisms, but not the sed issue. Index: setup-gettext =================================================================== RCS file: /cvsroot/gaim/gaim/setup-gettext,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- setup-gettext 20 Aug 2002 17:00:56 -0000 1.2 +++ setup-gettext 24 Aug 2002 02:15:37 -0000 1.3 @@ -1,6 +1,29 @@ #!/bin/sh +# +# setup-gettext - Provides compatibility with versions of gettext +# from the 0.10.x series and 0.11.x. +# +# Copyright (C) 2002 Christian Hammond. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# -VERSION=0.1.0 +VERSION=0.1.3 + +VERBOSE=0 parse_gettext_version() { GETTEXT_VERSION=`$GETTEXT_TOOL --version | sed -n 's/^.*\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\).*$/\1.\2.\3/p'` @@ -21,6 +44,30 @@ } } +install() { + [ -f configure.in ] && { + cp configure.in .tmp-configure.in + sed -f 's/^AM_GNU_GETTEXT\(.*\)$/AM_GNU_GETTEXT\1\ +AM_GNU_GETTEXT_VERSION(0.10.40)/' < .tmp-configure.in > configure.in + rm .tmp-configure.in + } + + [ -f configure.ac ] && { + cp configure.ac .tmp-configure.ac + sed -f 's/^AM_GNU_GETTEXT\(.*\)$/AM_GNU_GETTEXT\1\ +AM_GNU_GETTEXT_VERSION(0.10.40)/' < .tmp-configure.ac > configure.ac + rm .tmp-configure.ac + } + + [ -f autogen.sh ] && { + cp autogen.sh .tmp-autogen.sh + sed -f 's/\(gettextize\|autopoint\) --version/.\/setup-gettext --gettext-tool/1' -f 's/^\(echo.*|[\t ]*\)\?\(gettextize\|autopoint\) -.*$/.\/setup-gettext/1' < .tmp-autogen.sh > autogen.sh + rm .tmp-autogen.sh + } + + echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' >> acinclude.m4 +} + backup_m4() { [ -d m4 ] && mv m4 m4~ } @@ -33,9 +80,9 @@ } restore_files() { - [ -e configure.in~ ] && mv -f configure.in~ configure.in - [ -e configure.ac~ ] && mv -f configure.ac~ configure.ac - [ -e Makefile.am~ ] && mv -f Makefile.am~ Makefile.am + [ -f configure.in~ ] && mv -f configure.in~ configure.in + [ -f configure.ac~ ] && mv -f configure.ac~ configure.ac + [ -f Makefile.am~ ] && mv -f Makefile.am~ Makefile.am } abort() { @@ -50,7 +97,7 @@ find_gettext # See if a version of gettext and its tools are installed. -if [ x$GETTEXT_TOOL == x ]; then +if [ x$GETTEXT_TOOL = x ]; then echo echo "You do not have a version of gettext installed." echo "Please download one from your local package repository or" @@ -68,11 +115,11 @@ echo "Only one option at a time!" exit 1 - elif [ $1 == "--gettext-tool" ]; then + elif [ $1 = "--gettext-tool" ]; then echo $GETTEXT_TOOL exit 0 - elif [ $1 == "--help" ]; then + elif [ $1 = "--help" ]; then echo "setup-gettext v$VERSION" echo "Usage:" echo " --gettext-tool Returns gettextize or autopoint, depending" @@ -85,29 +132,37 @@ echo exit 0 - elif [ $1 == "--version" ]; then + elif [ $1 = "--version" ]; then echo $VERSION exit 0 - elif [ $1 == "--gettext-version" ]; then + elif [ $1 = "--gettext-version" ]; then echo $GETTEXT_VERSION exit 0 - elif [ $1 == "--gettext-major-version" ]; then + elif [ $1 = "--gettext-major-version" ]; then echo $GETTEXT_MAJOR_VERSION exit 0 - elif [ $1 == "--gettext-minor-version" ]; then + elif [ $1 = "--gettext-minor-version" ]; then echo $GETTEXT_MINOR_VERSION exit 0 - elif [ $1 == "--gettext-micro-version" ]; then + elif [ $1 = "--gettext-micro-version" ]; then echo $GETTEXT_MICRO_VERSION exit 0 + + elif [ $1 = "--install" ]; then + install + echo "setup-gettext installed." + exit 0 - elif [ $1 == "--happy-url" ]; then + elif [ $1 = "--happy-url" ]; then echo http://gaim.sf.net/forkgettext.jpg exit 0 + + elif [ $1 = "--verbose" ]; then + VERBOSE=1 else echo "Invalid option '$1'" @@ -116,8 +171,9 @@ fi # Okay, run the main stuff -if [ "$GETTEXT_TOOL" == "autopoint" ]; then +if [ "$GETTEXT_TOOL" = "autopoint" ]; then backup_m4 + [ $VERBOSE -eq 1 ] && echo " autopoint --force" echo n | autopoint --force || abort restore_m4 else @@ -126,6 +182,9 @@ # Gettext is pure evil. It DEMANDS that we press Return no matter # what. This gets rid of their happy "feature" of doom. + [ $VERBOSE -eq 1 ] && \ + echo " gettextize --copy --force --intl --no-changelog" + sed 's:read .*< /dev/tty::' `which gettextize` > .temp-gettextize chmod +x .temp-gettextize echo n | ./.temp-gettextize --copy --force --intl --no-changelog || abort @@ -134,8 +193,9 @@ restore_files restore_m4 - [ -e po/Makevars.template ] && mv po/Makevars.template po/Makevars + [ -f po/Makevars.template ] && mv po/Makevars.template po/Makevars else + [ $VERBOSE -eq 1 ] && echo " gettextize --copy --force" echo n | gettextize --copy --force || exit; fi fi |
From: Christian H. <ch...@us...> - 2002-08-24 01:10:48
|
Update of /cvsroot/gaim/gaim/src In directory usw-pr-cvs1:/tmp/cvs-serv8020 Modified Files: browser.c Log Message: We don't need that quoted variable anymore. Index: browser.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/browser.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- browser.c 23 Aug 2002 23:22:26 -0000 1.26 +++ browser.c 24 Aug 2002 01:10:43 -0000 1.27 @@ -584,7 +584,6 @@ if (pid == 0) { char **args; char command[1024]; - char *quoted = NULL; if (web_browser == BROWSER_OPERA) { args[0] = "opera"; @@ -619,8 +618,6 @@ } execvp(args[0], args); - if (quoted) - g_free(quoted); _exit(0); } } |
From: Christian H. <ch...@us...> - 2002-08-23 23:22:29
|
Update of /cvsroot/gaim/gaim/src In directory usw-pr-cvs1:/tmp/cvs-serv19364 Modified Files: browser.c Log Message: Life is unhappy when you click a link that says <a href="http://127.0.0.1 && rm -rf /">pr0n!</a> Please don't try this on your friends. Update CVS :) Index: browser.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/browser.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- browser.c 22 Aug 2002 03:13:39 -0000 1.25 +++ browser.c 23 Aug 2002 23:22:26 -0000 1.26 @@ -559,58 +559,6 @@ } -#if !GTK_CHECK_VERSION(1,3,0) -/* From Glib 2.0 */ -/** - * g_shell_quote: - * @unquoted_string: a literal string - * - * Quotes a string so that the shell (/bin/sh) will interpret the - * quoted string to mean @unquoted_string. If you pass a filename to - * the shell, for example, you should first quote it with this - * function. The return value must be freed with g_free(). The - * quoting style used is undefined (single or double quotes may be - * used). - * - * Return value: quoted string -**/ -gchar* -g_shell_quote (const gchar *unquoted_string) -{ - /* We always use single quotes, because the algorithm is cheesier. - * We could use double if we felt like it, that might be more - * human-readable. - */ - const gchar *p; - GString *dest; - - g_return_val_if_fail (unquoted_string != NULL, NULL); - - dest = g_string_new ("'"); - - p = unquoted_string; - - /* could speed this up a lot by appending chunks of text at a - * time. - */ - while (*p) - { - /* Replace literal ' with a close ', a \', and a open ' */ - if (*p == '\'') - g_string_append (dest, "'\\''"); - else - g_string_append_c (dest, *p); - ++p; - } - /* close the quote */ - g_string_append_c (dest, '\''); - - p = dest->str; - g_string_free (dest, FALSE); - return p; -} -#endif - void open_url(GtkWidget *w, char *url) { @@ -634,7 +582,7 @@ pid = fork(); if (pid == 0) { - char *args[4]; + char **args; char command[1024]; char *quoted = NULL; @@ -663,12 +611,11 @@ args[1] = url; args[2] = NULL; } else if (web_browser == BROWSER_MANUAL) { - g_snprintf(command, sizeof(command), web_command, quoted); - quoted = g_shell_quote(command); - args[0] = "sh"; - args[1] = "-c"; - args[2] = quoted; - args[3] = NULL; + gchar *space_free_url; + space_free_url = g_strdelimit(url, " ", '+'); + g_snprintf(command, sizeof(command), web_command, space_free_url); + g_free(space_free_url); + args = g_strsplit(command, " ", 0); } execvp(args[0], args); |
From: Sean E. <sea...@us...> - 2002-08-22 03:25:04
|
Update of /cvsroot/gaim/gaim In directory usw-pr-cvs1:/tmp/cvs-serv22857 Modified Files: Tag: gtk1-stable ChangeLog Log Message: Now I'm going to bed. Index: ChangeLog =================================================================== RCS file: /cvsroot/gaim/gaim/ChangeLog,v retrieving revision 1.509.2.1 retrieving revision 1.509.2.2 diff -u -d -r1.509.2.1 -r1.509.2.2 --- ChangeLog 22 Aug 2002 03:16:03 -0000 1.509.2.1 +++ ChangeLog 22 Aug 2002 03:25:00 -0000 1.509.2.2 @@ -2,6 +2,8 @@ version 0.59.1 * Fixed a security bug in the manual browser setting + * Now using libiconv for better i18n support (Thanks Junichi + Uekawa) version 0.59 (06/24/2002): * Hungarian translation added (Thanks, Sutto Zoltan) |
From: Sean E. <sea...@us...> - 2002-08-22 03:25:04
|
Update of /cvsroot/gaim/gaim/src In directory usw-pr-cvs1:/tmp/cvs-serv22857/src Modified Files: Tag: gtk1-stable core.h gaim.h util.c Log Message: Now I'm going to bed. Index: core.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/core.h,v retrieving revision 1.18 retrieving revision 1.18.2.1 diff -u -d -r1.18 -r1.18.2.1 --- core.h 4 May 2002 08:21:31 -0000 1.18 +++ core.h 22 Aug 2002 03:25:00 -0000 1.18.2.1 @@ -26,6 +26,14 @@ #include <config.h> #endif +#ifdef HAVE_ICONV +#include <iconv.h> +#endif + +#ifdef HAVE_LANGINFO_CODESET +#include <langinfo.h> +#endif + #include <stdio.h> #include <time.h> #include <glib.h> @@ -47,6 +55,7 @@ char password[32]; char user_info[2048]; int options; + int protocol; /* prpls can use this to save information about the user, * like which server to connect to, etc */ Index: gaim.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/gaim.h,v retrieving revision 1.326 retrieving revision 1.326.2.1 diff -u -d -r1.326 -r1.326.2.1 --- gaim.h 18 Jun 2002 00:49:55 -0000 1.326 +++ gaim.h 22 Aug 2002 03:25:00 -0000 1.326.2.1 @@ -439,6 +439,14 @@ extern time_t get_time(int, int, int, int, int, int); extern FILE *gaim_mkstemp(gchar **); +#ifdef HAVE_LANGINFO_CODESET +#define utf8_to_str(in) convert_string(in, nl_langinfo(CODESET), "UTF-8"); +#define str_to_utf8(in) convert_string(in, "UTF-8", nl_langinfo(CODESET)); +#else +#define utf8_to_str(in) convert_string(in, "ISO-8859-1", "UTF-8"); +#define str_to_utf8(in) convert_string(in, "UTF-8", "ISO-8859-1"); +#endif + /*------------------------------------------------------------------------*/ /* Multi-Entry dialog and vCard dialog support */ /*------------------------------------------------------------------------*/ Index: util.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/util.c,v retrieving revision 1.123 retrieving revision 1.123.2.1 diff -u -d -r1.123 -r1.123.2.1 --- util.c 22 Jun 2002 02:07:48 -0000 1.123 +++ util.c 22 Aug 2002 03:25:00 -0000 1.123.2.1 @@ -32,6 +32,7 @@ #include <string.h> #include <sys/wait.h> #include <ctype.h> +#include <iconv.h> #include <math.h> #include "gaim.h" #include "prpl.h" @@ -1118,92 +1119,49 @@ fclose(fd); } -unsigned char *utf8_to_str(unsigned char *in) +char *convert_string(char *str, const char *destset, const char *srcset) { - int n = 0, i = 0; - int inlen; - unsigned char *result; - - if (!in) - return NULL; - - inlen = strlen(in); +#ifdef HAVE_ICONV + char *buf; + iconv_t cd; + size_t insize = 0; + size_t outsize = 0; + size_t nconv = 0; + char *inptr; + char *outptr; + char *ret; - result = g_malloc(inlen + 1); + if (!str) + return NULL; + buf = g_malloc(strlen(str)*4); + insize = strlen(str); + inptr = str; + outsize = strlen(str)*4; + outptr = buf; - while (n <= inlen - 1) { - long c = (long)in[n]; - if (c < 0x80) - result[i++] = (char)c; - else { - if ((c & 0xC0) == 0xC0) - result[i++] = - (char)(((c & 0x03) << 6) | (((unsigned char)in[++n]) & 0x3F)); - else if ((c & 0xE0) == 0xE0) { - if (n + 2 <= inlen) { - result[i] = - (char)(((c & 0xF) << 4) | (((unsigned char)in[++n]) & 0x3F)); - result[i] = - (char)(((unsigned char)result[i]) | - (((unsigned char)in[++n]) & 0x3F)); - i++; - } else - n += 2; - } else if ((c & 0xF0) == 0xF0) - n += 3; - else if ((c & 0xF8) == 0xF8) - n += 4; - else if ((c & 0xFC) == 0xFC) - n += 5; - } - n++; + cd = iconv_open(destset, srcset); + if (cd == (iconv_t) -1) { + g_free(buf); + debug_printf("iconv_open(%s, %s) Error\n",destset, srcset); + return g_strdup(str); } - result[i] = '\0'; - - return result; -} -char *str_to_utf8(unsigned char *in) -{ - int n = 0, i = 0; - int inlen; - char *result = NULL; - - if (!in) - return NULL; - - inlen = strlen(in); - - result = g_malloc(inlen * 2 + 1); - - while (n < inlen) { - long c = (long)in[n]; - if (c == 27) { - n += 2; - if (in[n] == 'x') - n++; - if (in[n] == '3') - n++; - n += 2; - continue; - } - /* why are we removing newlines and carriage returns? - if ((c == 0x0D) || (c == 0x0A)) { - n++; - continue; - } - */ - if (c < 128) - result[i++] = (char)c; - else { - result[i++] = (char)((c >> 6) | 192); - result[i++] = (char)((c & 63) | 128); - } - n++; + nconv = iconv(cd, &inptr, &insize, &outptr, &outsize); + if (nconv == (size_t) -1) { + debug_printf("iconv Error\n"); + g_free(buf); + return g_strdup(str); } - result[i] = '\0'; + *outptr = '\0'; + iconv_close(cd); - return result; + ret = g_strdup(buf); + g_free(buf); + + return ret; +#else + return g_strdup(str); +#endif } void strip_linefeed(gchar *text) |
From: Sean E. <sea...@us...> - 2002-08-22 03:16:06
|
Update of /cvsroot/gaim/gaim In directory usw-pr-cvs1:/tmp/cvs-serv20322 Modified Files: Tag: gtk1-stable ChangeLog configure.ac configure.in Log Message: We've gone and done something drastic. Index: ChangeLog =================================================================== RCS file: /cvsroot/gaim/gaim/ChangeLog,v retrieving revision 1.509 retrieving revision 1.509.2.1 diff -u -d -r1.509 -r1.509.2.1 --- ChangeLog 25 Jun 2002 01:25:44 -0000 1.509 +++ ChangeLog 22 Aug 2002 03:16:03 -0000 1.509.2.1 @@ -1,5 +1,8 @@ Gaim: The Pimpin' Penguin IM Clone thats good for the soul! +version 0.59.1 + * Fixed a security bug in the manual browser setting + version 0.59 (06/24/2002): * Hungarian translation added (Thanks, Sutto Zoltan) * Swedish translation updated (Thanks, Christian Rose) Index: configure.ac =================================================================== RCS file: /cvsroot/gaim/gaim/configure.ac,v retrieving revision 1.70 retrieving revision 1.70.2.1 diff -u -d -r1.70 -r1.70.2.1 --- configure.ac 30 May 2002 18:33:40 -0000 1.70 +++ configure.ac 22 Aug 2002 03:16:03 -0000 1.70.2.1 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(src/aim.c) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE([gaim], [0.59cvs]) +AM_INIT_AUTOMAKE([gaim], [0.59.1cvs]) AC_PREREQ([2.50]) Index: configure.in =================================================================== RCS file: /cvsroot/gaim/gaim/configure.in,v retrieving revision 1.118 retrieving revision 1.118.2.1 diff -u -d -r1.118 -r1.118.2.1 --- configure.in 31 May 2002 06:09:46 -0000 1.118 +++ configure.in 22 Aug 2002 03:16:03 -0000 1.118.2.1 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(src/aim.c) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE([gaim], [0.59]) +AM_INIT_AUTOMAKE([gaim], [0.59.1cvs]) |
From: Sean E. <sea...@us...> - 2002-08-22 03:16:06
|
Update of /cvsroot/gaim/gaim/src In directory usw-pr-cvs1:/tmp/cvs-serv20322/src Modified Files: Tag: gtk1-stable browser.c Log Message: We've gone and done something drastic. Index: browser.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/browser.c,v retrieving revision 1.23 retrieving revision 1.23.2.1 diff -u -d -r1.23 -r1.23.2.1 --- browser.c 17 Jun 2002 00:10:34 -0000 1.23 +++ browser.c 22 Aug 2002 03:16:03 -0000 1.23.2.1 @@ -559,6 +559,58 @@ } +#if !GTK_CHECK_VERSION(1,3,0) +/* From Glib 2.0 */ +/** + * g_shell_quote: + * @unquoted_string: a literal string + * + * Quotes a string so that the shell (/bin/sh) will interpret the + * quoted string to mean @unquoted_string. If you pass a filename to + * the shell, for example, you should first quote it with this + * function. The return value must be freed with g_free(). The + * quoting style used is undefined (single or double quotes may be + * used). + * + * Return value: quoted string +**/ +gchar* +g_shell_quote (const gchar *unquoted_string) +{ + /* We always use single quotes, because the algorithm is cheesier. + * We could use double if we felt like it, that might be more + * human-readable. + */ + const gchar *p; + GString *dest; + + g_return_val_if_fail (unquoted_string != NULL, NULL); + + dest = g_string_new ("'"); + + p = unquoted_string; + + /* could speed this up a lot by appending chunks of text at a + * time. + */ + while (*p) + { + /* Replace literal ' with a close ', a \', and a open ' */ + if (*p == '\'') + g_string_append (dest, "'\\''"); + else + g_string_append_c (dest, *p); + ++p; + } + /* close the quote */ + g_string_append_c (dest, '\''); + + p = dest->str; + g_string_free (dest, FALSE); + return p; +} +#endif + void open_url(GtkWidget *w, char *url) { @@ -584,6 +636,7 @@ if (pid == 0) { char *args[4]; char command[1024]; + char *quoted = NULL; if (web_browser == BROWSER_OPERA) { args[0] = "opera"; @@ -610,14 +663,17 @@ args[1] = url; args[2] = NULL; } else if (web_browser == BROWSER_MANUAL) { - g_snprintf(command, sizeof(command), web_command, url); + g_snprintf(command, sizeof(command), web_command, quoted); + quoted = g_shell_quote(command); args[0] = "sh"; args[1] = "-c"; - args[2] = command; + args[2] = quoted; args[3] = NULL; } execvp(args[0], args); + if (quoted) + g_free(quoted); _exit(0); } } |
From: Sean E. <sea...@us...> - 2002-08-22 03:13:42
|
Update of /cvsroot/gaim/gaim/src In directory usw-pr-cvs1:/tmp/cvs-serv19522/src Modified Files: browser.c Log Message: That was so broken. Index: browser.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/browser.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- browser.c 11 Aug 2002 09:03:32 -0000 1.24 +++ browser.c 22 Aug 2002 03:13:39 -0000 1.25 @@ -636,7 +636,8 @@ if (pid == 0) { char *args[4]; char command[1024]; - + char *quoted = NULL; + if (web_browser == BROWSER_OPERA) { args[0] = "opera"; args[1] = "-newwindow"; @@ -662,16 +663,17 @@ args[1] = url; args[2] = NULL; } else if (web_browser == BROWSER_MANUAL) { - char *quoted = g_shell_quote(command); g_snprintf(command, sizeof(command), web_command, quoted); - g_free(quoted); + quoted = g_shell_quote(command); args[0] = "sh"; args[1] = "-c"; - args[2] = command; + args[2] = quoted; args[3] = NULL; } execvp(args[0], args); + if (quoted) + g_free(quoted); _exit(0); } } |
From: Christian H. <ch...@us...> - 2002-08-22 00:45:52
|
Update of /cvsroot/gaim/gaim/src In directory usw-pr-cvs1:/tmp/cvs-serv17435 Modified Files: buddy.c Log Message: Let's see if the buddy list can resize vertically now. Index: buddy.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/buddy.c,v retrieving revision 1.321 retrieving revision 1.322 diff -u -d -r1.321 -r1.322 --- buddy.c 16 Aug 2002 14:57:15 -0000 1.321 +++ buddy.c 22 Aug 2002 00:45:49 -0000 1.322 @@ -2431,7 +2431,7 @@ blist_pos.x = x; blist_pos.y = y; } else { /* Is a size event */ - if (blist_pos.xoff != x || blist_pos.yoff != y || blist_pos.width != width) + if (blist_pos.xoff != x || blist_pos.yoff != y || blist_pos.width != width || blist_pos.height != height) save = 1; blist_pos.width = width; |
From: Christian H. <ch...@us...> - 2002-08-20 17:01:01
|
Update of /cvsroot/gaim/gaim In directory usw-pr-cvs1:/tmp/cvs-serv8794 Modified Files: Makefile.am setup-gettext Log Message: Typo, and added the script to EXTRA_DIST. Index: Makefile.am =================================================================== RCS file: /cvsroot/gaim/gaim/Makefile.am,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- Makefile.am 8 Aug 2002 18:11:15 -0000 1.32 +++ Makefile.am 20 Aug 2002 17:00:56 -0000 1.33 @@ -1,6 +1,6 @@ EXTRA_DIST = config.rpath gaim.spec.in gaim_applet.gnorba gaim.desktop gaim_applet.desktop \ - HACKING gaim2blt.pl licq2gaim.pl + HACKING gaim2blt.pl licq2gaim.pl setup-gettext if DISTRIB Index: setup-gettext =================================================================== RCS file: /cvsroot/gaim/gaim/setup-gettext,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- setup-gettext 20 Aug 2002 08:54:56 -0000 1.1 +++ setup-gettext 20 Aug 2002 17:00:56 -0000 1.2 @@ -53,7 +53,7 @@ if [ x$GETTEXT_TOOL == x ]; then echo echo "You do not have a version of gettext installed." - echo "Please download one from your locak package repository or" + echo "Please download one from your local package repository or" echo "from ftp://ftp.gnu.org/pub/gnu/gettext/" echo exit 1 |
From: Christian H. <ch...@us...> - 2002-08-20 08:55:00
|
Update of /cvsroot/gaim/gaim In directory usw-pr-cvs1:/tmp/cvs-serv14225 Modified Files: autogen.sh Added Files: setup-gettext Log Message: This is easier to maintain, cleaner, and you can take the script with you. --- NEW FILE: setup-gettext --- #!/bin/sh VERSION=0.1.0 parse_gettext_version() { GETTEXT_VERSION=`$GETTEXT_TOOL --version | sed -n 's/^.*\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\).*$/\1.\2.\3/p'` GETTEXT_MAJOR_VERSION=`echo $GETTEXT_VERSION | sed -n 's/^\([0-9]\+\).*/\1/p'` GETTEXT_MINOR_VERSION=`echo $GETTEXT_VERSION | sed -n 's/^[0-9]\+\.\([0-9]\+\).*/\1/p'` GETTEXT_MICRO_VERSION=`echo $GETTEXT_VERSION | sed -n 's/^[0-9]\+\.[0-9]\+\.\([0-9]\+\).*/\1/p'` } find_gettext() { GETTEXT_TOOL=autopoint (autopoint --version) < /dev/null > /dev/null 2>&1 || { GETTEXT_TOOL=gettextize (gettextize --version) < /dev/null > /dev/null 2>&1 || { GETTEXT_TOOL= } } } backup_m4() { [ -d m4 ] && mv m4 m4~ } restore_m4() { [ -d m4~ ] && { rm -rf m4 mv m4~ m4 } } restore_files() { [ -e configure.in~ ] && mv -f configure.in~ configure.in [ -e configure.ac~ ] && mv -f configure.ac~ configure.ac [ -e Makefile.am~ ] && mv -f Makefile.am~ Makefile.am } abort() { restore_files restore_m4 exit 1 } # Main code find_gettext # See if a version of gettext and its tools are installed. if [ x$GETTEXT_TOOL == x ]; then echo echo "You do not have a version of gettext installed." echo "Please download one from your locak package repository or" echo "from ftp://ftp.gnu.org/pub/gnu/gettext/" echo exit 1 fi parse_gettext_version NUMVAR=$# if [ $NUMVAR -gt 0 ]; then if [ $NUMVAR -gt 1 ]; then echo "Only one option at a time!" exit 1 elif [ $1 == "--gettext-tool" ]; then echo $GETTEXT_TOOL exit 0 elif [ $1 == "--help" ]; then echo "setup-gettext v$VERSION" echo "Usage:" echo " --gettext-tool Returns gettextize or autopoint, depending" echo " on the version of gettext installed." echo " --gettext-version Returns the version of gettext installed." echo " --gettext-major-version Returns the major version of gettext installed." echo " --gettext-minor-version Returns the minor version of gettext installed." echo " --gettext-micro-version Returns the micro version of gettext installed." echo " --help Displays this help screen." echo exit 0 elif [ $1 == "--version" ]; then echo $VERSION exit 0 elif [ $1 == "--gettext-version" ]; then echo $GETTEXT_VERSION exit 0 elif [ $1 == "--gettext-major-version" ]; then echo $GETTEXT_MAJOR_VERSION exit 0 elif [ $1 == "--gettext-minor-version" ]; then echo $GETTEXT_MINOR_VERSION exit 0 elif [ $1 == "--gettext-micro-version" ]; then echo $GETTEXT_MICRO_VERSION exit 0 elif [ $1 == "--happy-url" ]; then echo http://gaim.sf.net/forkgettext.jpg exit 0 else echo "Invalid option '$1'" exit 1 fi fi # Okay, run the main stuff if [ "$GETTEXT_TOOL" == "autopoint" ]; then backup_m4 echo n | autopoint --force || abort restore_m4 else if [ $GETTEXT_MINOR_VERSION -eq 11 ]; then backup_m4 # Gettext is pure evil. It DEMANDS that we press Return no matter # what. This gets rid of their happy "feature" of doom. sed 's:read .*< /dev/tty::' `which gettextize` > .temp-gettextize chmod +x .temp-gettextize echo n | ./.temp-gettextize --copy --force --intl --no-changelog || abort rm .temp-gettextize restore_files restore_m4 [ -e po/Makevars.template ] && mv po/Makevars.template po/Makevars else echo n | gettextize --copy --force || exit; fi fi Index: autogen.sh =================================================================== RCS file: /cvsroot/gaim/gaim/autogen.sh,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- autogen.sh 19 Aug 2002 05:25:16 -0000 1.21 +++ autogen.sh 20 Aug 2002 08:54:56 -0000 1.22 @@ -1,27 +1,12 @@ #!/bin/sh -abort() { - # Don't break the tree if something goes wrong. - if [ -e m4~ ]; then - rm -rf m4 - mv m4~ m4 - fi - - exit 1 -} - -USE_AUTOPOINT=1 - -(autopoint --version) < /dev/null > /dev/null 2>&1 || { - - USE_AUTOPOINT=0 +SETUP_GETTEXT=./setup-gettext - (gettextize --version) < /dev/null > /dev/null 2>&1 || { - echo; - echo "You must have gettext installed to compile Gaim"; - echo; - exit; - } +($SETUP_GETTEXT --gettext-tool) < /dev/null > /dev/null 2>&1 || { + echo; + echo "You must have gettext installed to compile Gaim"; + echo; + exit; } (libtoolize --version) < /dev/null > /dev/null 2>&1 || { @@ -59,38 +44,7 @@ echo; echo "Running gettextize, please ignore non-fatal messages...." - -if [ $USE_AUTOPOINT -eq 1 ]; then - mv -f m4 m4~ - echo n | autopoint --force || abort; - rm -rf m4 - mv -f m4~ m4 -else - # They could have at least done us a favor and used autopoint all - # throughout 0.11.x. - GETTEXT_VER=`gettextize --version | sed -n 's/^.*[0-9]\+\.\([0-9]\+\)\..*$/\1/p'` - if [ $GETTEXT_VER -eq 11 ]; then - mv -f m4 m4~ - - # Gettext is pure evil. It DEMANDS that we press Return no matter - # what. This gets rid of their happy "feature" of doom. - sed 's:read .*< /dev/tty::' `which gettextize` > gaim-gettextize - chmod +x gaim-gettextize - echo n | ./gaim-gettextize --copy --force --intl --no-changelog || abort - rm gaim-gettextize - - # Now restore the things that brain-dead gettext modified. - [ -e configure.in~ ] && mv -f configure.in~ configure.in - [ -e configure.ac~ ] && mv -f configure.ac~ configure.ac - [ -e Makefile.am~ ] && mv -f Makefile.am~ Makefile.am - rm -rf m4 - mv -f m4~ m4 - - mv -f po/Makevars.template po/Makevars - else - echo n | gettextize --copy --force || exit; - fi -fi +$SETUP_GETTEXT echo "Running libtoolize, please ignore non-fatal messages...." echo n | libtoolize --copy --force || exit; |
From: Christian H. <ch...@us...> - 2002-08-19 05:25:19
|
Update of /cvsroot/gaim/gaim In directory usw-pr-cvs1:/tmp/cvs-serv18201 Modified Files: autogen.sh Log Message: It'd be one thing if they used autopoint all throughout 0.11.x, but 0.11.0, 0.11.1, and 0.11.2 (maybe even .3!) don't include it! So, back go the hacks, except now it's all much bigger because of the existance of autopoint. Index: autogen.sh =================================================================== RCS file: /cvsroot/gaim/gaim/autogen.sh,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- autogen.sh 18 Aug 2002 18:21:08 -0000 1.20 +++ autogen.sh 19 Aug 2002 05:25:16 -0000 1.21 @@ -66,7 +66,30 @@ rm -rf m4 mv -f m4~ m4 else - echo n | gettextize --copy --force || exit; + # They could have at least done us a favor and used autopoint all + # throughout 0.11.x. + GETTEXT_VER=`gettextize --version | sed -n 's/^.*[0-9]\+\.\([0-9]\+\)\..*$/\1/p'` + if [ $GETTEXT_VER -eq 11 ]; then + mv -f m4 m4~ + + # Gettext is pure evil. It DEMANDS that we press Return no matter + # what. This gets rid of their happy "feature" of doom. + sed 's:read .*< /dev/tty::' `which gettextize` > gaim-gettextize + chmod +x gaim-gettextize + echo n | ./gaim-gettextize --copy --force --intl --no-changelog || abort + rm gaim-gettextize + + # Now restore the things that brain-dead gettext modified. + [ -e configure.in~ ] && mv -f configure.in~ configure.in + [ -e configure.ac~ ] && mv -f configure.ac~ configure.ac + [ -e Makefile.am~ ] && mv -f Makefile.am~ Makefile.am + rm -rf m4 + mv -f m4~ m4 + + mv -f po/Makevars.template po/Makevars + else + echo n | gettextize --copy --force || exit; + fi fi echo "Running libtoolize, please ignore non-fatal messages...." |
From: Christian H. <ch...@us...> - 2002-08-18 20:39:21
|
Update of /cvsroot/gaim/gaim In directory usw-pr-cvs1:/tmp/cvs-serv28690 Modified Files: acconfig.h Log Message: Let's see if this fixes the GAIM_PLUGINS define problem. Temporary solution. Index: acconfig.h =================================================================== RCS file: /cvsroot/gaim/gaim/acconfig.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- acconfig.h 4 May 2002 13:12:55 -0000 1.17 +++ acconfig.h 18 Aug 2002 20:39:19 -0000 1.18 @@ -10,7 +10,11 @@ #undef USE_SCREENSAVER #undef NO_MULTI #undef DEBUG -#undef GAIM_PLUGINS + +#ifndef GAIM_PLUGINS +# undef GAIM_PLUGINS +#endif + #undef USE_PERL #undef NAS_SOUND #undef ESD_SOUND |