Hello community,
here is the log from the commit of package gwenhywfar for openSUSE:Factory
checked in at Mon Jan 17 18:23:31 CET 2011.
--------
--- gwenhywfar/gwenhywfar.changes 2010-12-10 11:31:26.000000000 +0100
+++ gwenhywfar/gwenhywfar.changes 2011-01-15 10:52:22.000000000 +0100
@@ -1,0 +2,7 @@
+Sat Jan 15 09:50:16 UTC 2011 - Nico.Laus.2001@gmx.de
+
+- Update to version 4.0.3:
+ + improved error messages
+ + several bug fixes
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
_service:recompress:download_url:gwenhywfar-4.0.2.tar.bz2
New:
----
_service:recompress:download_url:gwenhywfar-4.0.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gwenhywfar.spec ++++++
--- /var/tmp/diff_new_pack.BJuOZV/_old 2011-01-17 18:22:08.000000000 +0100
+++ /var/tmp/diff_new_pack.BJuOZV/_new 2011-01-17 18:22:08.000000000 +0100
@@ -19,8 +19,8 @@
Name: gwenhywfar
-Version: 4.0.2
-Release: 2
+Version: 4.0.3
+Release: 1
Url: http://gwenhywfar.sourceforge.net/
Group: System/Libraries
License: LGPLv2.1+
++++++ _service ++++++
--- /var/tmp/diff_new_pack.BJuOZV/_old 2011-01-17 18:22:08.000000000 +0100
+++ /var/tmp/diff_new_pack.BJuOZV/_new 2011-01-17 18:22:08.000000000 +0100
@@ -3,16 +3,16 @@
<service name="download_url">
<param name="protocol">http</param>
<param name="host">www.aquamaniac.de</param>
- <param name="path">/sites/download/download.php?package=01&release=55&file=01&dummy=gwenhywfar-4.0.2.tar.gz</param>
- <param name="filename">gwenhywfar-4.0.2.tar.gz</param>
+ <param name="path">/sites/download/download.php?package=01&release=56&file=01&dummy=gwenhywfar-4.0.3.tar.gz</param>
+ <param name="filename">gwenhywfar-4.0.3.tar.gz</param>
</service>
<service name="verify_file">
- <param name="file">_service:download_url:gwenhywfar-4.0.2.tar.gz</param>
+ <param name="file">_service:download_url:gwenhywfar-4.0.3.tar.gz</param>
<param name="verifier">sha256</param>
- <param name="checksum">453ef9fa2f7a23e0c99c1721bef9270f786039b638457410e0daf7c7afba3c72</param>
+ <param name="checksum">87976f8c21309b1ddba76a1454414b445fb72ff3582a2847b00b08eca34ad5c4</param>
</service>
<service name="recompress">
- <param name="file">_service:download_url:gwenhywfar-4.0.2.tar.gz</param>
+ <param name="file">_service:download_url:gwenhywfar-4.0.3.tar.gz</param>
<param name="compression">bz2</param>
</service>
</services>
++++++ _service:recompress:download_url:gwenhywfar-4.0.2.tar.bz2 -> _service:recompress:download_url:gwenhywfar-4.0.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.0.2/ChangeLog new/gwenhywfar-4.0.3/ChangeLog
--- old/gwenhywfar-4.0.2/ChangeLog 2010-09-02 07:34:59.000000000 +0200
+++ new/gwenhywfar-4.0.3/ChangeLog 2010-11-13 13:56:19.000000000 +0100
@@ -1,4 +1,39 @@
------------------------------------------------------------------
+2010-11-13 12:56:11 +0000 martin
+Prepared release 4.0.2.
+git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2018 70169cfe-8b10-0410-8925-dcb4b91034d8
+
+------------------------------------------------------------------
+2010-11-13 12:08:07 +0000 martin
+Fixed a bug as pointed out by Martin von Gagern (who also provided a fix).
+git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2017 70169cfe-8b10-0410-8925-dcb4b91034d8
+
+------------------------------------------------------------------
+2010-09-15 16:11:53 +0000 martin
+Added gource script.
+git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2016 70169cfe-8b10-0410-8925-dcb4b91034d8
+
+------------------------------------------------------------------
+2010-09-15 16:11:50 +0000 martin
+Gtk2: Use visibility property of GtkEntry to hide the password entry. Patch by Christian Stimming.
+git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2015 70169cfe-8b10-0410-8925-dcb4b91034d8
+
+------------------------------------------------------------------
+2010-09-02 21:27:43 +0000 martin
+Increased version numbers.
+git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2014 70169cfe-8b10-0410-8925-dcb4b91034d8
+
+------------------------------------------------------------------
+2010-09-02 21:25:33 +0000 martin
+Added log message for socket disconnect.
+git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2013 70169cfe-8b10-0410-8925-dcb4b91034d8
+
+------------------------------------------------------------------
+2010-09-02 05:36:27 +0000 martin
+Prepared maintenance release 4.0.1.
+git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2012 70169cfe-8b10-0410-8925-dcb4b91034d8
+
+------------------------------------------------------------------
2010-09-01 13:05:55 +0000 martin
Win32: Add more missing GWENHYWFAR_CB.
git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@2011 70169cfe-8b10-0410-8925-dcb4b91034d8
@@ -497,52 +532,3 @@
Now the topmost window is used as owner also for ExecDialog.
git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@1919 70169cfe-8b10-0410-8925-dcb4b91034d8
-
-------------------------------------------------------------------
-2010-08-02 12:24:42 +0000 martin
-Removed error message about not gnutls_record_recv().
-This message appears quite often but has in most cases no effect on the
-actual transaction. We keep it in the debug output but not in the progress
-log.
-
-git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@1918 70169cfe-8b10-0410-8925-dcb4b91034d8
-
-------------------------------------------------------------------
-2010-08-02 11:59:33 +0000 martin
-Detect "--with-guis" with missing argument.
-Without this change giving "--with-guis" without arguments leads to the
-word "yes" being inserted into the list of guis which of course isn't what
-we want.
-
-git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@1917 70169cfe-8b10-0410-8925-dcb4b91034d8
-
-------------------------------------------------------------------
-2010-08-02 11:59:31 +0000 martin
-Removed clearenv() again.
-Apparently clearing the environment is quite a problem on some systems,
-so for now I removed it again.
-
-git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@1916 70169cfe-8b10-0410-8925-dcb4b91034d8
-
-------------------------------------------------------------------
-2010-07-30 18:09:41 +0000 martin
-Added function GWEN_Widget_GetTopDialog(), use that in GTK2 implementation.
-git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@1915 70169cfe-8b10-0410-8925-dcb4b91034d8
-
-------------------------------------------------------------------
-2010-07-30 17:55:39 +0000 martin
-Fixed a bug.
-When using sub-dialogs we have to use the parent dialog pointer to access
-the toolkit-dependent extensions.
-
-git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@1914 70169cfe-8b10-0410-8925-dcb4b91034d8
-
-------------------------------------------------------------------
-2010-07-30 17:40:57 +0000 martin
-Prepared release 3.99.16beta.
-git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@1913 70169cfe-8b10-0410-8925-dcb4b91034d8
-
-------------------------------------------------------------------
-2010-07-30 16:35:56 +0000 martin
-GWEN-Dialog: Fixed sub-dialog handling.
-git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@1912 70169cfe-8b10-0410-8925-dcb4b91034d8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.0.2/configure new/gwenhywfar-4.0.3/configure
--- old/gwenhywfar-4.0.2/configure 2010-11-13 13:54:43.000000000 +0100
+++ new/gwenhywfar-4.0.3/configure 2011-01-14 19:46:47.000000000 +0100
@@ -2865,7 +2865,7 @@
#
GWENHYWFAR_VERSION_MAJOR=4
GWENHYWFAR_VERSION_MINOR=0
-GWENHYWFAR_VERSION_PATCHLEVEL=2
+GWENHYWFAR_VERSION_PATCHLEVEL=3
GWENHYWFAR_VERSION_BUILD=0
GWENHYWFAR_VERSION_TAG="stable"
@@ -2877,7 +2877,7 @@
#
GWENHYWFAR_SO_CURRENT="60"
GWENHYWFAR_SO_AGE="0"
-GWENHYWFAR_SO_REVISION="2"
+GWENHYWFAR_SO_REVISION="3"
GWENHYWFAR_SO_EFFECTIVE="`echo \$(($GWENHYWFAR_SO_CURRENT-$GWENHYWFAR_SO_AGE))`"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.0.2/configure.ac new/gwenhywfar-4.0.3/configure.ac
--- old/gwenhywfar-4.0.2/configure.ac 2010-11-13 13:54:28.000000000 +0100
+++ new/gwenhywfar-4.0.3/configure.ac 2011-01-14 19:46:28.000000000 +0100
@@ -29,7 +29,7 @@
#
GWENHYWFAR_VERSION_MAJOR=4
GWENHYWFAR_VERSION_MINOR=0
-GWENHYWFAR_VERSION_PATCHLEVEL=2
+GWENHYWFAR_VERSION_PATCHLEVEL=3
GWENHYWFAR_VERSION_BUILD=0
dnl "stable", "rcX", "betaX", "cvs"
GWENHYWFAR_VERSION_TAG="stable"
@@ -42,7 +42,7 @@
#
GWENHYWFAR_SO_CURRENT="60"
GWENHYWFAR_SO_AGE="0"
-GWENHYWFAR_SO_REVISION="2"
+GWENHYWFAR_SO_REVISION="3"
GWENHYWFAR_SO_EFFECTIVE="`echo \$(($GWENHYWFAR_SO_CURRENT-$GWENHYWFAR_SO_AGE))`"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.0.2/gwenhywfar.m4 new/gwenhywfar-4.0.3/gwenhywfar.m4
--- old/gwenhywfar-4.0.2/gwenhywfar.m4 2008-07-31 19:56:05.000000000 +0200
+++ new/gwenhywfar-4.0.3/gwenhywfar.m4 2011-01-11 21:00:35.000000000 +0100
@@ -60,8 +60,7 @@
AC_MSG_RESULT([not found ])
AC_MSG_ERROR([
*** The library Gwenhywfar was not found. Obtain it from
-*** http://gwenhywfar.sf.net, direct link for download is
-*** http://sf.net/project/showfiles.php?group_id=88769 .
+*** http://www.aquamaniac.de .
*** If it is already installed (including the -devel package),
*** you might need to specify the location with the
*** option --with-gwen-dir=DIR.])
@@ -95,20 +94,20 @@
AC_MSG_RESULT([found $gwen_versionstring])
if test "$vma" -gt "`$gwenhywfar_dir/bin/gwenhywfar-config --vmajor`"; then
AC_MSG_ERROR([Your Gwenhywfar version is way too old.
- Please update from http://sf.net/projects/gwenhywfar])
+ Please update from http://www.aquamaniac.de])
elif test "$vma" = "`$gwenhywfar_dir/bin/gwenhywfar-config --vmajor`"; then
if test "$vmi" -gt "`$gwenhywfar_dir/bin/gwenhywfar-config --vminor`"; then
AC_MSG_ERROR([Your Gwenhywfar version is too old.
- Please update from http://sf.net/projects/gwenhywfar])
+ Please update from http://www.aquamaniac.de])
elif test "$vmi" = "`$gwenhywfar_dir/bin/gwenhywfar-config --vminor`"; then
if test "$vpl" -gt "`$gwenhywfar_dir/bin/gwenhywfar-config --vpatchlevel`"; then
AC_MSG_ERROR([Your Gwenhywfar version is a little bit too old.
- Please update from http://sf.net/projects/gwenhywfar])
+ Please update from http://www.aquamaniac.de])
elif test "$vpl" = "`$gwenhywfar_dir/bin/gwenhywfar-config --vpatchlevel`"; then
if test "$vbld" -gt "`$gwenhywfar_dir/bin/gwenhywfar-config --vbuild`"; then
AC_MSG_ERROR([Your Gwenhywfar version is a little bit too old.
- Please update to the latest CVS version. Instructions for accessing
- CVS can be found on http://sf.net/projects/gwenhywfar])
+ Please update to the latest SVN version. Instructions for accessing
+ SVN can be found on http://www.aquamaniac.de])
fi
fi
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.0.2/gwenhywfar.spec new/gwenhywfar-4.0.3/gwenhywfar.spec
--- old/gwenhywfar-4.0.2/gwenhywfar.spec 2010-11-13 13:54:51.000000000 +0100
+++ new/gwenhywfar-4.0.3/gwenhywfar.spec 2011-01-14 19:46:55.000000000 +0100
@@ -3,12 +3,12 @@
%define name gwenhywfar
-%define version 4.0.2
+%define version 4.0.3
%define rpm_cxxflags \"-O2 -march=i486 -mcpu=i586\"
%define rpm_cflags \"-O2 -march=i486 -mcpu=i586\"
-%define dist
-%define disttag
+%define dist Ubuntu
+%define disttag ubuntu
%define distver
# Note: There is not yet a special symbol for the rpm release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.0.2/src/base/args.c new/gwenhywfar-4.0.3/src/base/args.c
--- old/gwenhywfar-4.0.2/src/base/args.c 2009-05-08 23:21:01.000000000 +0200
+++ new/gwenhywfar-4.0.3/src/base/args.c 2010-12-19 03:33:50.000000000 +0100
@@ -86,7 +86,7 @@
i++;
}
else {
- DBG_ERROR(GWEN_LOGDOMAIN, "Only options are allowed");
+ DBG_ERROR(GWEN_LOGDOMAIN, "Only options are allowed, but argument \"%s\" was not recognized as a known option.", p);
GWEN_DB_Group_free(counts);
return GWEN_ARGS_RESULT_ERROR;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.0.2/src/gui/cgui.c new/gwenhywfar-4.0.3/src/gui/cgui.c
--- old/gwenhywfar-4.0.2/src/gui/cgui.c 2010-08-28 15:02:52.000000000 +0200
+++ new/gwenhywfar-4.0.3/src/gui/cgui.c 2010-12-19 03:33:50.000000000 +0100
@@ -62,9 +62,6 @@
#ifdef HAVE_SIGNAL_H
# include
#endif
-#ifdef HAVE_ICONV_H
-# include
-#endif
@@ -110,7 +107,6 @@
cgui=(GWEN_GUI_CGUI*)p;
GWEN_Gui_CProgress_List_free(cgui->progressList);
- free(cgui->charSet);
GWEN_StringList_free(cgui->badPasswords);
GWEN_DB_Group_free(cgui->dbCerts);
GWEN_DB_Group_free(cgui->dbPasswords);
@@ -120,29 +116,13 @@
const char *GWEN_Gui_CGui_GetCharSet(const GWEN_GUI *gui) {
- GWEN_GUI_CGUI *cgui;
-
- assert(gui);
- cgui=GWEN_INHERIT_GETDATA(GWEN_GUI, GWEN_GUI_CGUI, gui);
- assert(cgui);
-
- return cgui->charSet;
+ return GWEN_Gui_GetCharSet(gui);
}
void GWEN_Gui_CGui_SetCharSet(GWEN_GUI *gui, const char *s) {
- GWEN_GUI_CGUI *cgui;
-
- assert(gui);
- cgui=GWEN_INHERIT_GETDATA(GWEN_GUI, GWEN_GUI_CGUI, gui);
- assert(cgui);
-
- free(cgui->charSet);
- if (s)
- cgui->charSet=strdup(s);
- else
- cgui->charSet=NULL;
+ GWEN_Gui_SetCharSet(gui, s);
}
@@ -177,125 +157,6 @@
-int GWEN_Gui_CGui__ConvertFromUtf8(GWEN_GUI *gui,
- const char *text,
- int len,
- GWEN_BUFFER *tbuf){
- GWEN_GUI_CGUI *cgui;
-
- assert(gui);
- cgui=GWEN_INHERIT_GETDATA(GWEN_GUI, GWEN_GUI_CGUI, gui);
- assert(cgui);
-
- assert(len);
-
- if (cgui->charSet) {
- if (strcasecmp(cgui->charSet, "utf-8")!=0) {
-#ifndef HAVE_ICONV
- DBG_INFO(GWEN_LOGDOMAIN,
- "iconv not available, can not convert to \"%s\"",
- cgui->charSet);
-#else
- iconv_t ic;
-
- ic=iconv_open(cgui->charSet, "UTF-8");
- if (ic==((iconv_t)-1)) {
- DBG_ERROR(GWEN_LOGDOMAIN, "Charset \"%s\" not available",
- cgui->charSet);
- }
- else {
- char *outbuf;
- char *pOutbuf;
- /* Some systems have iconv in libc, some have it in libiconv
- (OSF/1 and those with the standalone portable GNU libiconv
- installed). Check which one is available. The define
- ICONV_CONST will be "" or "const" accordingly. */
- ICONV_CONST char *pInbuf;
- size_t inLeft;
- size_t outLeft;
- size_t done;
- size_t space;
-
- /* convert */
- pInbuf=(char*)text;
-
- outLeft=len*2;
- space=outLeft;
- outbuf=(char*)malloc(outLeft);
- assert(outbuf);
-
- inLeft=len;
- pInbuf=(char*)text;
- pOutbuf=outbuf;
- done=iconv(ic, &pInbuf, &inLeft, &pOutbuf, &outLeft);
- if (done==(size_t)-1) {
- DBG_ERROR(GWEN_LOGDOMAIN, "Error in conversion: %s (%d)",
- strerror(errno), errno);
- free(outbuf);
- iconv_close(ic);
- return GWEN_ERROR_GENERIC;
- }
-
- GWEN_Buffer_AppendBytes(tbuf, outbuf, space-outLeft);
- free(outbuf);
- DBG_DEBUG(GWEN_LOGDOMAIN, "Conversion done.");
- iconv_close(ic);
- return 0;
- }
-#endif
- }
- }
-
- GWEN_Buffer_AppendBytes(tbuf, text, len);
- return 0;
-}
-
-
-
-void GWEN_Gui_CGui_GetRawText(GWEN_GUI *gui,
- const char *text,
- GWEN_BUFFER *tbuf) {
- const char *p;
- int rv;
-
- assert(text);
- p=text;
- while ((p=strchr(p, '<'))) {
- const char *t;
-
- t=p;
- t++;
- if (toupper(*t)=='H') {
- t++;
- if (toupper(*t)=='T') {
- t++;
- if (toupper(*t)=='M') {
- t++;
- if (toupper(*t)=='L') {
- break;
- }
- }
- }
- }
- p++;
- } /* while */
-
- if (p)
- rv=GWEN_Gui_CGui__ConvertFromUtf8(gui, text, (p-text), tbuf);
- else
- rv=GWEN_Gui_CGui__ConvertFromUtf8(gui, text, strlen(text), tbuf);
- if (rv) {
- DBG_ERROR(GWEN_LOGDOMAIN, "Error converting text");
- GWEN_Buffer_Reset(tbuf);
- if (p)
- GWEN_Buffer_AppendBytes(tbuf, text, (p-text));
- else
- GWEN_Buffer_AppendString(tbuf, text);
- }
-}
-
-
-
char GWEN_Gui_CGui__readCharFromStdin(int waitFor) {
int chr;
#ifdef HAVE_TERMIOS_H
@@ -501,7 +362,7 @@
assert(cgui);
tbuf=GWEN_Buffer_new(0, 256, 0, 1);
- GWEN_Gui_CGui_GetRawText(gui, text, tbuf);
+ GWEN_Gui_GetRawText(gui, text, tbuf);
if (GWEN_Gui_GetFlags(gui) & GWEN_GUI_FLAGS_NONINTERACTIVE) {
if (GWEN_GUI_MSG_FLAGS_SEVERITY_IS_DANGEROUS(flags)) {
@@ -579,7 +440,7 @@
assert(gui);
tbuf=GWEN_Buffer_new(0, 256, 0, 1);
- GWEN_Gui_CGui_GetRawText(gui, text, tbuf);
+ GWEN_Gui_GetRawText(gui, text, tbuf);
fprintf(stderr, "===== %s =====\n", title);
fprintf(stderr, "%s\n", GWEN_Buffer_GetStart(tbuf));
@@ -642,7 +503,7 @@
assert(cgui);
tbuf=GWEN_Buffer_new(0, 256, 0, 1);
- GWEN_Gui_CGui_GetRawText(gui, text, tbuf);
+ GWEN_Gui_GetRawText(gui, text, tbuf);
fprintf(stderr, "----- %s -----\n", title);
fprintf(stderr, "%s\n", GWEN_Buffer_GetStart(tbuf));
@@ -969,7 +830,7 @@
int i;
i=strlen(s);
- if (i>=minLen && i<=maxLen) {
+ if (i>=minLen && i < maxLen) {
memmove(buffer, s, i+1);
GWEN_Buffer_free(buf);
return 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.0.2/src/gui/cgui.h new/gwenhywfar-4.0.3/src/gui/cgui.h
--- old/gwenhywfar-4.0.2/src/gui/cgui.h 2009-06-20 00:57:34.000000000 +0200
+++ new/gwenhywfar-4.0.3/src/gui/cgui.h 2010-11-27 16:01:22.000000000 +0100
@@ -43,10 +43,10 @@
* character sets.
*/
/*@{*/
-GWENHYWFAR_API
+GWENHYWFAR_API DEPRECATED
const char *GWEN_Gui_CGui_GetCharSet(const GWEN_GUI *gui);
-GWENHYWFAR_API
+GWENHYWFAR_API DEPRECATED
void GWEN_Gui_CGui_SetCharSet(GWEN_GUI *gui, const char *s);
/*@}*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.0.2/src/gui/cgui_l.h new/gwenhywfar-4.0.3/src/gui/cgui_l.h
--- old/gwenhywfar-4.0.2/src/gui/cgui_l.h 2008-07-31 19:56:06.000000000 +0200
+++ new/gwenhywfar-4.0.3/src/gui/cgui_l.h 2010-11-27 15:58:37.000000000 +0100
@@ -20,12 +20,6 @@
#include
-void GWEN_Gui_CGui_GetRawText(GWEN_GUI *gui,
- const char *text,
- GWEN_BUFFER *tbuf);
-
-
-
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.0.2/src/gui/cgui_p.h new/gwenhywfar-4.0.3/src/gui/cgui_p.h
--- old/gwenhywfar-4.0.2/src/gui/cgui_p.h 2010-04-28 18:41:36.000000000 +0200
+++ new/gwenhywfar-4.0.3/src/gui/cgui_p.h 2010-11-27 15:48:18.000000000 +0100
@@ -35,7 +35,6 @@
uint32_t nextBoxId;
uint32_t nextProgressId;
- char *charSet;
GWEN_GUI_CHECKCERT_FN checkCertFn;
GWEN_DB_NODE *dbPasswords;
@@ -52,12 +51,6 @@
-int GWEN_Gui_CGui__ConvertFromUtf8(GWEN_GUI *gui,
- const char *text,
- int len,
- GWEN_BUFFER *tbuf);
-
-
char GWEN_Gui_CGui__readCharFromStdin(int waitFor);
int GWEN_Gui_CGui__input(GWEN_GUI *gui,
uint32_t flags,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.0.2/src/gui/cprogress.c new/gwenhywfar-4.0.3/src/gui/cprogress.c
--- old/gwenhywfar-4.0.2/src/gui/cprogress.c 2009-06-19 21:27:36.000000000 +0200
+++ new/gwenhywfar-4.0.3/src/gui/cprogress.c 2010-11-27 16:18:23.000000000 +0100
@@ -207,7 +207,7 @@
const char *t;
tbuf=GWEN_Buffer_new(0, 256, 0, 1);
- GWEN_Gui_CGui_GetRawText(cp->gui, text, tbuf);
+ GWEN_Gui_GetRawText(cp->gui, text, tbuf);
t=GWEN_Buffer_GetStart(tbuf);
if (t[strlen(t)-1]!='\n')
GWEN_Buffer_AppendByte(tbuf, '\n');
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.0.2/src/gui/gui.c new/gwenhywfar-4.0.3/src/gui/gui.c
--- old/gwenhywfar-4.0.2/src/gui/gui.c 2010-08-28 15:03:41.000000000 +0200
+++ new/gwenhywfar-4.0.3/src/gui/gui.c 2010-11-27 16:21:14.000000000 +0100
@@ -30,6 +30,11 @@
#define DISABLE_DEBUGLOG
+#ifndef ICONV_CONST
+# define ICONV_CONST
+#endif
+
+
#include "gui_p.h"
#include "dlg_input_l.h"
#include "dlg_message_l.h"
@@ -46,6 +51,14 @@
#include
#include
+#include
+#include
+#include
+
+#ifdef HAVE_ICONV_H
+# include
+#endif
+
static GWEN_GUI *gwenhywfar_gui=NULL;
@@ -82,6 +95,7 @@
GWEN_Dialog_List_free(gui->activeDialogs);
GWEN_ProgressData_Tree_free(gui->progressDataTree);
free(gui->name);
+ free(gui->charSet);
GWEN_FREE_OBJECT(gui);
}
@@ -129,6 +143,115 @@
+int GWEN_Gui_ConvertFromUtf8(const GWEN_GUI *gui, const char *text, int len, GWEN_BUFFER *tbuf) {
+ assert(gui);
+ assert(len);
+
+ if (gui->charSet) {
+ if (strcasecmp(gui->charSet, "utf-8")!=0) {
+#ifndef HAVE_ICONV
+ DBG_INFO(GWEN_LOGDOMAIN,
+ "iconv not available, can not convert to \"%s\"",
+ gui->charSet);
+#else
+ iconv_t ic;
+
+ ic=iconv_open(gui->charSet, "UTF-8");
+ if (ic==((iconv_t)-1)) {
+ DBG_ERROR(GWEN_LOGDOMAIN, "Charset \"%s\" not available",
+ gui->charSet);
+ }
+ else {
+ char *outbuf;
+ char *pOutbuf;
+ /* Some systems have iconv in libc, some have it in libiconv
+ (OSF/1 and those with the standalone portable GNU libiconv
+ installed). Check which one is available. The define
+ ICONV_CONST will be "" or "const" accordingly. */
+ ICONV_CONST char *pInbuf;
+ size_t inLeft;
+ size_t outLeft;
+ size_t done;
+ size_t space;
+
+ /* convert */
+ pInbuf=(char*)text;
+
+ outLeft=len*2;
+ space=outLeft;
+ outbuf=(char*)malloc(outLeft);
+ assert(outbuf);
+
+ inLeft=len;
+ pInbuf=(char*)text;
+ pOutbuf=outbuf;
+ done=iconv(ic, &pInbuf, &inLeft, &pOutbuf, &outLeft);
+ if (done==(size_t)-1) {
+ DBG_ERROR(GWEN_LOGDOMAIN, "Error in conversion: %s (%d)",
+ strerror(errno), errno);
+ free(outbuf);
+ iconv_close(ic);
+ return GWEN_ERROR_GENERIC;
+ }
+
+ GWEN_Buffer_AppendBytes(tbuf, outbuf, space-outLeft);
+ free(outbuf);
+ DBG_DEBUG(GWEN_LOGDOMAIN, "Conversion done.");
+ iconv_close(ic);
+ return 0;
+ }
+#endif
+ }
+ }
+
+ GWEN_Buffer_AppendBytes(tbuf, text, len);
+ return 0;
+}
+
+
+
+void GWEN_Gui_GetRawText(const GWEN_GUI *gui, const char *text, GWEN_BUFFER *tbuf) {
+ const char *p;
+ int rv;
+
+ assert(text);
+ p=text;
+ while ((p=strchr(p, '<'))) {
+ const char *t;
+
+ t=p;
+ t++;
+ if (toupper(*t)=='H') {
+ t++;
+ if (toupper(*t)=='T') {
+ t++;
+ if (toupper(*t)=='M') {
+ t++;
+ if (toupper(*t)=='L') {
+ break;
+ }
+ }
+ }
+ }
+ p++;
+ } /* while */
+
+ if (p)
+ rv=GWEN_Gui_ConvertFromUtf8(gui, text, (p-text), tbuf);
+ else
+ rv=GWEN_Gui_ConvertFromUtf8(gui, text, strlen(text), tbuf);
+ if (rv) {
+ DBG_ERROR(GWEN_LOGDOMAIN, "Error converting text");
+ GWEN_Buffer_Reset(tbuf);
+ if (p)
+ GWEN_Buffer_AppendBytes(tbuf, text, (p-text));
+ else
+ GWEN_Buffer_AppendString(tbuf, text);
+ }
+}
+
+
+
GWEN_GUI_MESSAGEBOX_FN GWEN_Gui_SetMessageBoxFn(GWEN_GUI *gui,
GWEN_GUI_MESSAGEBOX_FN f){
GWEN_GUI_MESSAGEBOX_FN of;
@@ -456,6 +579,26 @@
}
+
+const char *GWEN_Gui_GetCharSet(const GWEN_GUI *gui) {
+ if (gui)
+ return gui->charSet;
+ return NULL;
+}
+
+
+
+void GWEN_Gui_SetCharSet(GWEN_GUI *gui, const char *s) {
+ if (gui) {
+ free(gui->charSet);
+ if (s)
+ gui->charSet=strdup(s);
+ else
+ gui->charSet=NULL;
+ }
+}
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.0.2/src/gui/gui.h new/gwenhywfar-4.0.3/src/gui/gui.h
--- old/gwenhywfar-4.0.2/src/gui/gui.h 2010-08-11 13:15:47.000000000 +0200
+++ new/gwenhywfar-4.0.3/src/gui/gui.h 2010-11-27 16:17:38.000000000 +0100
@@ -348,6 +348,23 @@
+/** @name Character Set
+ *
+ * All messages and texts can be converted from UTF8 automatically.
+ * This needs the name of the destination character set.
+ * See output of <i>iconv --list</i> for a list of supported
+ * character sets.
+ */
+/*@{*/
+GWENHYWFAR_API
+const char *GWEN_Gui_GetCharSet(const GWEN_GUI *gui);
+
+GWENHYWFAR_API
+void GWEN_Gui_SetCharSet(GWEN_GUI *gui, const char *s);
+/*@}*/
+
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.0.2/src/gui/gui_be.h new/gwenhywfar-4.0.3/src/gui/gui_be.h
--- old/gwenhywfar-4.0.2/src/gui/gui_be.h 2010-09-01 12:52:21.000000000 +0200
+++ new/gwenhywfar-4.0.3/src/gui/gui_be.h 2010-11-27 16:21:32.000000000 +0100
@@ -39,6 +39,24 @@
void GWEN_Gui_SetName(GWEN_GUI *gui, const char *name);
+/**
+ * This function converts the given text from UTF-8 to the character set selected
+ * by @ref GWEN_Gui_SetCharSet.
+ */
+GWENHYWFAR_API
+int GWEN_Gui_ConvertFromUtf8(const GWEN_GUI *gui,
+ const char *text,
+ int len,
+ GWEN_BUFFER *tbuf);
+
+/**
+ * This function extracts the raw text (e.g. the part outside a HTML element) and converts it
+ * from UTF-8 to the character set selected by @ref GWEN_Gui_SetCharSet.
+ */
+GWENHYWFAR_API
+void GWEN_Gui_GetRawText(const GWEN_GUI *gui, const char *text, GWEN_BUFFER *tbuf);
+
+
/** @name Prototypes For Virtual User Interaction Functions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.0.2/src/gui/gui_p.h new/gwenhywfar-4.0.3/src/gui/gui_p.h
--- old/gwenhywfar-4.0.2/src/gui/gui_p.h 2010-07-07 17:02:00.000000000 +0200
+++ new/gwenhywfar-4.0.3/src/gui/gui_p.h 2010-11-27 15:39:04.000000000 +0100
@@ -82,6 +82,8 @@
uint32_t nextDialogId;
char *name;
+ char *charSet;
+
int inLogHook;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.0.2/src/ressource.rc new/gwenhywfar-4.0.3/src/ressource.rc
--- old/gwenhywfar-4.0.2/src/ressource.rc 2010-11-13 13:54:51.000000000 +0100
+++ new/gwenhywfar-4.0.3/src/ressource.rc 2011-01-14 19:46:55.000000000 +0100
@@ -43,8 +43,8 @@
// Version
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4, 0, 2, 0
- PRODUCTVERSION 4, 0, 2, 0
+ FILEVERSION 4, 0, 3, 0
+ PRODUCTVERSION 4, 0, 3, 0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x40004L // Windows NT
@@ -58,14 +58,14 @@
//VALUE "Comments", "\0"
VALUE "CompanyName", " Aquamaniac\0"
VALUE "FileDescription", "Multi purpose library\0"
- VALUE "FileVersion", "v4.0.2\0"
+ VALUE "FileVersion", "v4.0.3\0"
VALUE "InternalName", "Gwenhywfar\0"
VALUE "LegalCopyright", "Copyright � 2003 by Martin Preuss\0"
VALUE "LegalTrademarks", "Aquamaniac\0"
VALUE "OriginalFilename", "GWENHYWFAR32.DLL\0"
//VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Gwenhywfar\0"
- VALUE "ProductVersion", "v4.0.2stable-0\0"
+ VALUE "ProductVersion", "v4.0.3stable-0\0"
VALUE "Author", "Martin Preuss\0"
VALUE "Email", "martin@libchipcard.de\0"
VALUE "Homepage", "http://gwenhywfar.sf.net/\0"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.0.2/src/sio/syncio_tls.c new/gwenhywfar-4.0.3/src/sio/syncio_tls.c
--- old/gwenhywfar-4.0.2/src/sio/syncio_tls.c 2010-08-28 15:08:14.000000000 +0200
+++ new/gwenhywfar-4.0.3/src/sio/syncio_tls.c 2010-11-21 00:18:24.000000000 +0100
@@ -28,6 +28,8 @@
#define DISABLE_DEBUGLOG
+/*#define GWEN_TLS_DEBUG*/
+
#include "syncio_tls_p.h"
#include "i18n_l.h"
@@ -793,7 +795,7 @@
errno=0;
#endif
DBG_VERBOUS(GWEN_LOGDOMAIN, "TLS PULL: returning %d bytes", rv);
- /*GWEN_Text_DumpString(buf, rv, stderr, 2);*/
+ /*GWEN_Text_DumpString(buf, rv, 2);*/
return rv;
}
@@ -827,7 +829,7 @@
gnutls_transport_set_errno(xio->session, 0);
#endif
DBG_VERBOUS(GWEN_LOGDOMAIN, "TLS PUSH: returning %d bytes", rv);
- /*GWEN_Text_DumpString(buf, rv, stderr, 2);*/
+ /*GWEN_Text_DumpString(buf, rv, 2);*/
return rv;
}
@@ -1020,9 +1022,9 @@
return GWEN_ERROR_SSL;
}
-#if 0
+#ifdef GWEN_TLS_DEBUG
DBG_ERROR(0, "Received this:");
- GWEN_Text_DumpString((const char*) buffer, rv, stderr, 2);
+ GWEN_Text_DumpString((const char*) buffer, rv, 2);
#endif
return rv;
@@ -1041,9 +1043,9 @@
xio=GWEN_INHERIT_GETDATA(GWEN_SYNCIO, GWEN_SYNCIO_TLS, sio);
assert(xio);
-#if 0
+#ifdef GWEN_TLS_DEBUG
DBG_ERROR(0, "Sending this:");
- GWEN_Text_DumpString((const char*) buffer, size, stderr, 2);
+ GWEN_Text_DumpString((const char*) buffer, size, 2);
#endif
baseIo=GWEN_SyncIo_GetBaseIo(sio);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenhywfar-4.0.2/src/version.h new/gwenhywfar-4.0.3/src/version.h
--- old/gwenhywfar-4.0.2/src/version.h 2010-11-13 13:54:51.000000000 +0100
+++ new/gwenhywfar-4.0.3/src/version.h 2011-01-14 19:46:56.000000000 +0100
@@ -32,11 +32,11 @@
#define GWEN_VERSION_MAJOR 4
#define GWENHYWFAR_VERSION_MAJOR 4
#define GWENHYWFAR_VERSION_MINOR 0
-#define GWENHYWFAR_VERSION_PATCHLEVEL 2
+#define GWENHYWFAR_VERSION_PATCHLEVEL 3
#define GWENHYWFAR_VERSION_BUILD 0
#define GWENHYWFAR_VERSION_TAG "stable"
-#define GWENHYWFAR_VERSION_FULL_STRING "4.0.2stable-0"
-#define GWENHYWFAR_VERSION_STRING "4.0.2"
+#define GWENHYWFAR_VERSION_FULL_STRING "4.0.3stable-0"
+#define GWENHYWFAR_VERSION_STRING "4.0.3"
#define GWENHYWFAR_SO_EFFECTIVE 60
#define GWENHYWFAR_SO_EFFECTIVE_STR "60"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org