Re: [Dillo-dev] [PATCH] Version 15 of tab/frame/kbnav/etc patch, now with key words an more...
In src/prefs.h you specify DILLO_SPLASH as file:/usr/share/dillo/dillo.html We don't install into that prefix. I made 2 changes. Added a dep for prefs.h and a rule which fixes the splash path as well as changing DILLO_SPLASH to file%%PREFIX%%/share... It's an ugle Makefile hack, but I didn't want to wade through the morass of autoconf for the correct solution. --- src/Makefile.am Fri Nov 21 09:35:45 2003 +++ src/Makefile.am.orig Tue Nov 11 07:13:59 2003 @@ -1,9 +1,3 @@ -.fixed_splash_path: - cp prefs.h x && cat x | sed 's@%%PREFIX%%@$(prefix)@' > prefs.h && rm -f x - touch .fixed_splash_path - -prefs.h: .fixed_splash_path - AM_CPPFLAGS=-DDILLORC_SYS='"$(sysconfdir)/dillorc"' SUBDIRS = IO @@ -24,8 +18,6 @@ capi.c \ capi.h \ debug.h \ - doc.c \ - doc.h \ dw.h \ dw.c \ dw_aligned_page.c \ @@ -68,18 +60,12 @@ dw_tooltip.h \ dw_widget.c \ dw_widget.h \ - gtkframeset.c \ - gtkframeset.h \ findtext.c \ findtext.h \ selection.c \ selection.h \ - focus.c \ - focus.h \ web.c \ web.h \ - pagemark.c \ - pagemark.h \ progressbar.c \ progressbar.h \ dillo.c \ @@ -100,8 +86,6 @@ image.h \ misc.c \ misc.h \ - tab.c \ - tab.h \ interface.h \ interface.c \ history.c \ --- src/prefs.h Fri Nov 21 09:35:11 2003 +++ src/prefs.h.orig Sat Nov 15 14:13:03 2003 @@ -8,8 +8,6 @@ #endif /* __cplusplus */ #define DILLO_HOME "http://www.dillo.org/" -#define DILLO_SPLASH "file:%%PREFIX%%/share/dillo/dillo.html" - #define D_GEOMETRY_DEFAULT_WIDTH 640 #define D_GEOMETRY_DEFAULT_HEIGHT 550 @@ -19,15 +17,6 @@ #define DW_COLOR_DEFAULT_PURPLE 0x800080 #define DW_COLOR_DEFAULT_BGND 0xd6d6c0 -#define COMPRESS_COMMON_PREFIXES "index of ;re: ;fwd: ;www.;welcome to ;the " - -/* target enumeration */ -enum { - TARGET_SELF, - TARGET_TAB, - TARGET_WINDOW -}; - /* define enumeration values to be returned */ enum { PARSE_OK = 0, @@ -49,8 +38,6 @@ DRC_TOKEN_TEXT_COLOR, DRC_TOKEN_USE_OBLIQUE, DRC_TOKEN_HOME, - DRC_TOKEN_SPLASH, - DRC_TOKEN_KEY_BINDINGS, DRC_TOKEN_PANEL_SIZE, DRC_TOKEN_SMALL_ICONS, DRC_TOKEN_FONT_FACTOR, @@ -69,10 +56,8 @@ DRC_TOKEN_SHOW_URL, DRC_TOKEN_SHOW_SEARCH, DRC_TOKEN_SHOW_PROGRESS_BOX, - DRC_TOKEN_SHOW_POPUP_NAVIGATION, DRC_TOKEN_FULLWINDOW_START, DRC_TOKEN_TRANSIENT_DIALOGS, - DRC_TOKEN_POPUP_DIALOGS, DRC_TOKEN_FW_FONT, DRC_TOKEN_VW_FONT, DRC_TOKEN_GENERATE_SUBMIT, @@ -81,14 +66,6 @@ DRC_TOKEN_SHOW_HTML_WARNINGS, DRC_TOKEN_SHOW_MSG, DRC_TOKEN_USE_OLD_PARSER, - DRC_TOKEN_KEYWORDS, - DRC_TOKEN_TARGET_BLANK, - DRC_TOKEN_TAB_LOAD_IN_BACKGROUND, - DRC_TOKEN_TAB_BAR_SHOW_FULLSCREEN, - DRC_TOKEN_TAB_BAR_SHOW_SINGLE_TAB, - DRC_TOKEN_TAB_BAR_SCROLLER, - DRC_TOKEN_TAB_TITLE_COMPRESS, - DRC_TOKEN_COMPRESS_COMMON_PREFIXES, DRC_TOKEN_LAST } Dillo_Rc_TokenType; @@ -102,8 +79,6 @@ gchar *no_proxy; gchar **no_proxy_vec; DilloUrl *home; - gchar *splash; - gboolean show_splash; guint32 link_color; guint32 visited_color; guint32 bg_color; @@ -130,10 +105,8 @@ gboolean show_url; gboolean show_search; gboolean show_progress_box; - gboolean show_popup_navigation; gboolean fullwindow_start; gboolean transient_dialogs; - gboolean popup_dialogs; gchar *vw_fontname; gchar *fw_fontname; gboolean generate_submit; @@ -142,16 +115,6 @@ gboolean show_html_warnings; gboolean show_msg; gboolean use_old_parser; - gchar *keywords; - gchar **keywords_vec; - gint target_blank; - gboolean tab_load_in_background; - gboolean tab_bar_show_fullscreen; - gboolean tab_bar_show_single_tab; - gboolean tab_bar_scroller; - gboolean tab_title_compress; - gchar *compress_common_prefixes; - gchar **compress_common_prefixes_vec; }; -- billy "Who get's bigger evertime you void, It's Hank the Happy Hemorroid."
Billy wrote:
In src/prefs.h you specify DILLO_SPLASH as file:/usr/share/dillo/dillo.html We don't install into that prefix.
Oh, do you not? Then use the pref splash=file:/wherever/you/want/to/install/instead The next version of the patch will contain a more elegant solution to this 'problem'... Cheers//Frank -- WWWWW ________________________ ## o o\ / Frank de Lange \ }# \| / +46-734352015 \ \ `--| _/ <Hacker for Hire> \ `---' \ +31-640037120 / \ frank@unternet.org / `------------------------' [ "Omnis enim res, quae dando non deficit, dum habetur et non datur, nondum habetur, quomodo habenda est." ]
p.s... Your mail includes a weird 'reply-to' header, which points to my domain: Reply-To: 3FBE3357.3040003@unternet.org Please don't do that... I'd rather not get replies to mail I did not send myself on a non-existing address... Cheers//Frank -- WWWWW ________________________ ## o o\ / Frank de Lange \ }# \| / +46-734352015 \ \ `--| _/ <Hacker for Hire> \ `---' \ +31-640037120 / \ frank@unternet.org / `------------------------' [ "Omnis enim res, quae dando non deficit, dum habetur et non datur, nondum habetur, quomodo habenda est." ]
Frank de Lange Fri, Nov 21, 2003 at 07:33:03PM +0100:
Your mail includes a weird 'reply-to' header, which points to my domain:
Reply-To: 3FBE3357.3040003@unternet.org
Please don't do that... I'd rather not get replies to mail I did not send myself on a non-existing address...
Sorry, that should have gone in the In-Reply-To, not Reply-To header. I was cutting and pasting, and pasted wrong. -- -billy
participants (3)
-
Billy
-
billy@idiom.com
-
Frank de Lange