2013-02-20 [colin] 3.9.0cvs86
authorColin Leroy <colin@colino.net>
Wed, 20 Feb 2013 12:43:32 +0000 (12:43 +0000)
committerColin Leroy <colin@colino.net>
Wed, 20 Feb 2013 12:43:32 +0000 (12:43 +0000)
* configure.ac
* src/plugins/fancy/fancy_viewer.h
Fix build for Fancy and vCalendar

ChangeLog
PATCHSETS
configure.ac
src/plugins/fancy/fancy_viewer.h

index ec70722..cadcf97 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-02-20 [colin]     3.9.0cvs86
+
+       * configure.ac
+       * src/plugins/fancy/fancy_viewer.h
+               Fix build for Fancy and vCalendar
+
 2013-02-20 [colin]     3.9.0cvs85
 
        * configure.ac
index d995ffb..6d867f1 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.654.2.4659 -r 1.654.2.4660 configure.ac;  cvs diff -u -r 1.8.2.14 -r 1.8.2.15 src/plugins/Makefile.am;  diff -u /dev/null src/plugins/spam_report/.cvsignore;  diff -u /dev/null src/plugins/spam_report/Makefile.am;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/spam_report/placeholder.txt;  diff -u /dev/null src/plugins/spam_report/spam_report.c;  diff -u /dev/null src/plugins/spam_report/spam_report_prefs.c;  diff -u /dev/null src/plugins/spam_report/spam_report_prefs.h;  diff -u /dev/null src/plugins/tnef_parse/.cvsignore;  diff -u /dev/null src/plugins/tnef_parse/Makefile.am;  diff -u /dev/null src/plugins/tnef_parse/claws.def;  diff -u /dev/null src/plugins/tnef_parse/mapi.h;  diff -u /dev/null src/plugins/tnef_parse/mapidefs.h;  diff -u /dev/null src/plugins/tnef_parse/mapitags.h;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/tnef_parse/placeholder.txt;  diff -u /dev/null src/plugins/tnef_parse/plugin.def;  diff -u /dev/null src/plugins/tnef_parse/tnef-errors.h;  diff -u /dev/null src/plugins/tnef_parse/tnef-types.h;  diff -u /dev/null src/plugins/tnef_parse/tnef_dump.c;  diff -u /dev/null src/plugins/tnef_parse/tnef_dump.h;  diff -u /dev/null src/plugins/tnef_parse/tnef_parse.c;  diff -u /dev/null src/plugins/tnef_parse/version.rc;  diff -u /dev/null src/plugins/tnef_parse/ytnef.c;  diff -u /dev/null src/plugins/tnef_parse/ytnef.h;  ) > 3.9.0cvs83.patchset
 ( cvs diff -u -r 1.654.2.4660 -r 1.654.2.4661 configure.ac;  cvs diff -u -r 1.53.2.46 -r 1.53.2.47 po/POTFILES.in;  cvs diff -u -r 1.8.2.15 -r 1.8.2.16 src/plugins/Makefile.am;  cvs diff -u -r -1.1 -r -1.2 src/plugins/dillo_viewer/.cvsignore;  cvs diff -u -r -1.4.2.10 -r -1.4.2.11 src/plugins/dillo_viewer/Makefile.am;  cvs diff -u -r -1.2.4.2 -r -1.2.4.3 src/plugins/dillo_viewer/README;  cvs diff -u -r -1.5.2.30 -r -1.5.2.31 src/plugins/dillo_viewer/dillo_prefs.c;  cvs diff -u -r -1.2.4.11 -r -1.2.4.12 src/plugins/dillo_viewer/dillo_prefs.h;  cvs diff -u -r -1.12.2.32 -r -1.12.2.33 src/plugins/dillo_viewer/dillo_viewer.c;  cvs diff -u -r -1.1 -r -1.2 src/plugins/trayicon/.cvsignore;  cvs diff -u -r -1.4.2.15 -r -1.4.2.16 src/plugins/trayicon/Makefile.am;  cvs diff -u -r -1.1.4.1 -r -1.1.4.2 src/plugins/trayicon/README;  cvs diff -u -r -1.14.2.83 -r -1.14.2.84 src/plugins/trayicon/trayicon.c;  cvs diff -u -r -1.1.2.12 -r -1.1.2.13 src/plugins/trayicon/trayicon_prefs.c;  cvs diff -u -r -1.1.2.7 -r -1.1.2.8 src/plugins/trayicon/trayicon_prefs.h;  cvs diff -u -r -1.1.4.2 -r -1.1.4.3 src/plugins/trayicon/libeggtrayicon/.cvsignore;  ) > 3.9.0cvs84.patchset
 ( cvs diff -u -r 1.654.2.4661 -r 1.654.2.4662 configure.ac;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/fancy/fancy_viewer.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/fancy/fancy_viewer.h;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/notification/Makefile.am;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/notification/notification_plugin.c;  diff -u /dev/null src/plugins/notification/gtkhotkey/.cvsignore;  diff -u /dev/null src/plugins/notification/gtkhotkey/Makefile.am;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-error.c;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-error.h;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-info.c;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-info.h;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.c;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.h;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-listener.c;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-listener.h;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-marshal.c;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-marshal.h;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-registry.c;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-registry.h;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-utils.c;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-utils.h;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.c;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.h;  diff -u /dev/null src/plugins/notification/gtkhotkey/gtkhotkey.h;  diff -u /dev/null src/plugins/notification/gtkhotkey/x11/eggaccelerators.c;  diff -u /dev/null src/plugins/notification/gtkhotkey/x11/eggaccelerators.h;  diff -u /dev/null src/plugins/notification/gtkhotkey/x11/tomboykeybinder.c;  diff -u /dev/null src/plugins/notification/gtkhotkey/x11/tomboykeybinder.h;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/spam_report/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/spam_report/spam_report.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/tnef_parse/Makefile.am;  ) > 3.9.0cvs85.patchset
+( cvs diff -u -r 1.654.2.4662 -r 1.654.2.4663 configure.ac;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/fancy/fancy_viewer.h;  ) > 3.9.0cvs86.patchset
index b40906e..eaef57a 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=85
+EXTRA_VERSION=86
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -1161,6 +1161,8 @@ if test x"$HAVE_PERL" = xyes; then
                PERL_LDFLAGS=`echo $PERL_LDFLAGS |sed 's/-lc//'`
                AC_MSG_RESULT(ok)
        fi
+       PERL="perl"
+       AC_SUBST(PERL)
        AC_SUBST(PERL_CFLAGS)
        AC_SUBST(PERL_LDFLAGS)
 fi
index 38858dd..954a8a0 100644 (file)
@@ -101,10 +101,9 @@ struct _FancyViewer
        gboolean          override_prefs_external;
        gboolean                  override_prefs_java;
 
-#ifdef HAVE_LIBCURL
        const gchar       *curlfile;
        FILE              *stream;
-#endif
+
        gchar             *cur_link;
        gchar             *filename;
        MimeInfo          *to_load;