- s/dillo-fltk/dillo/ and switched the version to 2.0

7 files changed, 15 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 51d04c29..db291a66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@
 Dillo project
 =============================================================================
 
-dillo-fltk2
+dillo-2.0
 
 +- Ported Dillo from GTK1 to FLTK2.
  - Ported a susbstantial part of the code from C to C++ (FLTK2 is in C++).
@@ -45,7 +45,7 @@ dillo-fltk2
  - Added a workaround for a CCC reentrancy segfault.
  - Bound FltkMultiLineTextResource to the html parser (TEXTAREA).
  - Added code to ignore the first <P> after <LI>.
- - Added a http_referer preference. See details in dillo2rc.
+ - Added a http_referer preference. See details in dillorc.
  - Added a text placeholder: "[IMG]" for img_off mode.
  - Fixed a SEGFAULT bug in http.c (handling of web->url).
  - Fixed handling of #anchors with repush, and other operations.
@@ -71,8 +71,8 @@ dillo-fltk2
  - Added code for the image menu and hooked it to dw2 signals.
  - Hooked the page and link menus.
  - Added a image-loading toggle button to the UI.
- - Enabled hiding widgets of the control panel from dillo2rc.
- - Added a save-directory preference (save_dir in dillo2rc).
+ - Enabled hiding widgets of the control panel from dillorc.
+ - Added a save-directory preference (save_dir in dillorc).
  - Fixed page-popup-menu to use the stack's top URL instead of base_url.
  - Added the "static" qualifier where missing.
  - Bound "Copy link location".
diff --git a/Makefile.am b/Makefile.am
index d2177ae5..dc4ab453 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = lout dw dlib dpip src doc dpid dpi test
 
-EXTRA_DIST = ChangeLog.old Doxyfile dillo2rc install-dpi-local README-port
+EXTRA_DIST = ChangeLog.old Doxyfile dillorc install-dpi-local README-port
 
-sysconf_DATA = dillo2rc
+sysconf_DATA = dillorc
diff --git a/configure.in b/configure.in
index 64200891..2741ce33 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_INIT(src/dillo.cc)
 dnl Detect the canonical host and target build environment
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(dillo, f15)
+AM_INIT_AUTOMAKE(dillo, 2.0)
 AM_CONFIG_HEADER(config.h)
 
 dnl Options
diff --git a/dillo2rc b/dillorc
index ba86ff1c..f8c42d83 100644
--- a/dillo2rc
+++ b/dillorc
@@ -1,4 +1,4 @@
-# dillo2rc
+# dillorc
 # Sample dillo initialization file.
 #
 # Lines that start with a '#' are comments.
@@ -229,4 +229,4 @@
 
 
 # -----------------------------------------------------------------------
-# dillo2rc ends here.
+# dillorc ends here.
diff --git a/src/IO/about.c b/src/IO/about.c
index 24e48263..d1b9b447 100644
--- a/src/IO/about.c
+++ b/src/IO/about.c
@@ -291,7 +291,7 @@ const char *AboutSplash=
 "<li>Simplified http.c by reusing the new non-blocking writes in IO."
 "<li>Implemented Stop button to not only stop rendering but also networking."
 "<li>Bound Ctrl+Space to toggle fullscreen mode."
-"<li>Added a http_referer preference. See details in dillo2rc."
+"<li>Added a http_referer preference. See details in dillorc."
 "<li>CCC: added reentrancy control to the OpEnd and OpAbort operations."
 "<li>CCC: enhanced the debug function and implemented OpAbort for dpi."
 "<li>Hooked a decoder for text/plain with charset."
diff --git a/src/Makefile.am b/src/Makefile.am
index 2d06d143..d4d03eea 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,12 +1,12 @@
-AM_CPPFLAGS=-DDILLORC_SYS='"$(sysconfdir)/dillo2rc"' @LIBJPEG_CPPFLAGS@
+AM_CPPFLAGS=-DDILLORC_SYS='"$(sysconfdir)/dillorc"' @LIBJPEG_CPPFLAGS@
 AM_CFLAGS = @LIBPNG_CFLAGS@
 AM_CXXFLAGS = -I.. @LIBPNG_CFLAGS@ @LIBFLTK_CXXFLAGS@
 
 SUBDIRS = IO
 
-bin_PROGRAMS = dillo-fltk
+bin_PROGRAMS = dillo
 
-dillo_fltk_LDADD = \
+dillo_LDADD = \
 	../dlib/libDlib.a \
 	../dpip/libDpip.a \
 	IO/libDiof.a \
@@ -16,7 +16,7 @@ dillo_fltk_LDADD = \
 	../lout/liblout.a \
 	@LIBJPEG_LIBS@ @LIBPNG_LIBS@ @LIBFLTK_LIBS@ @LIBZ_LIBS@ @LIBICONV_LIBS@
 
-dillo_fltk_SOURCES = \
+dillo_SOURCES = \
 	dillo.cc \
 	dir.c \
 	dir.h \
diff --git a/src/prefs.c b/src/prefs.c
index d761842c..48fe2a86 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -31,7 +31,7 @@
 #include "misc.h"
 #include "msg.h"
 
-#define RCNAME "dillo2rc"
+#define RCNAME "dillorc"
 
 #define DILLO_START_PAGE "about:splash"
 #define DILLO_HOME "http://www.dillo.org/"