Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/editors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21681
Modified Files:
bluefish.info bluefish.patch
Log Message:
New version 1.0.5
Index: bluefish.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/editors/bluefish.info,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- bluefish.info 16 Dec 2005 04:43:34 -0000 1.19
+++ bluefish.info 18 Feb 2006 01:17:26 -0000 1.20
@@ -1,11 +1,11 @@
Info2: <<
Package: bluefish%type_pkg[bluefish]
Type: bluefish (. -gnome2 -gnomevfs2)
-Version: 1.0.4
+Version: 1.0.5
Revision: 30
Source: http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-%v.tar.bz2
-Source-MD5: 8d5c1b7315cdc935aa024954093d2b32
-Depends: aspell-shlibs (>= 0.50.5-2), default-icon-theme, libgettext3-shlibs
(>= 0.14.5-1), glib2 (>= 2.8.4-1), glib2-shlibs (>= 2.8.4-1), gnome-icon-theme
(>= 2.12.0-1), libjpeg-shlibs (>= 6b-16), libtiff-shlibs (>= 3.7.2-1),
pango1-xft2 (>= 1.10.1-1), pango1-xft2-shlibs (>= 1.10.1-1), pcre-shlibs (>=
4.5-1), popt-shlibs (>= 1.7-6), libxml2-shlibs (>= 2.6.22-1), libxml2-bin (>=
2.6.22-1), shared-mime-info (>= 0.16-1), atk1-shlibs (>= 1.10.1-3),
libpng3-shlibs (>= 1:1.2.8-1), gtk+2 (>= 2.6.10-1), gtk+2-shlibs (>= 2.6.10-1),
libiconv (>= 1.10-6), x11, (%type_raw[bluefish] = -gnomevfs2) gnome-base,
(%type_raw[bluefish] = -gnome2) gnome-base, (%type_raw[bluefish] = -gnomevfs2)
gnome-mime-data (>= 2.4.2-2), (%type_raw[bluefish] = -gnome2) gnome-mime-data
(>= 2.4.2-2), (%type_raw[bluefish] = -gnomevfs2) libidl2-shlibs (>= 0.8.5-1),
(%type_raw[bluefish] = -gnome2) libidl2-shlibs (>= 0.8.5-1),
(%type_raw[bluefish] = -gnomevfs2) orbit2 (>= 2.12.4-1), (%type_raw[bluefish] =
-gnome2)
orbit2 (>= 2.12.4-1), (%type_raw[bluefish] = -gnomevfs2) orbit2-shlibs (>=
2.12.4-1), (%type_raw[bluefish] = -gnome2) orbit2-shlibs (>= 2.12.4-1),
(%type_raw[bluefish] = -gnomevfs2) gconf2 (>= 2.12.1-1), (%type_raw[bluefish] =
-gnome2) gconf2 (>= 2.12.1-1), (%type_raw[bluefish] = -gnomevfs2) gconf2-shlibs
(>= 2.12.1-1), (%type_raw[bluefish] = -gnome2) gconf2-shlibs (>= 2.12.1-1),
(%type_raw[bluefish] = -gnomevfs2) libbonobo2 (>= 2.10.1-1),
(%type_raw[bluefish] = -gnome2) libbonobo2 (>= 2.10.1-1), (%type_raw[bluefish]
= -gnomevfs2) libbonobo2-shlibs (>= 2.10.1-1), (%type_raw[bluefish] = -gnome2)
libbonobo2-shlibs (>= 2.10.1-1), (%type_raw[bluefish] = -gnomevfs2)
gnome-vfs2-ssl (>= 2.10.1-5) | (%type_raw[bluefish] = -gnomevfs2) gnome-vfs2
(>= 2.10.1-5), (%type_raw[bluefish] = -gnome2) gnome-vfs2-ssl (>= 2.10.1-5) |
(%type_raw[bluefish] = -gnome2) gnome-vfs2 (>= 2.10.1-5), (%type_raw[bluefish]
= -gnomevfs2) gnome-vfs2-ssl-shlibs (>= 2.10.1-5) | (%type_raw[bluefish] =
-gnomevfs2
) gnome-vfs2-shlibs (>= 2.10.1-5), (%type_raw[bluefish] = -gnome2)
gnome-vfs2-ssl-shlibs (>= 2.10.1-5) | (%type_raw[bluefish] = -gnome2)
gnome-vfs2-shlibs (>= 2.10.1-5), (%type_raw[bluefish] = -gnome2)
audiofile-shlibs, (%type_raw[bluefish] = -gnome2) audiofile-bin,
(%type_raw[bluefish] = -gnome2) esound (>= 0.2.36-1), (%type_raw[bluefish] =
-gnome2) esound-bin (>= 0.2.36-1), (%type_raw[bluefish] = -gnome2)
esound-common (>= 0.2.36-1), (%type_raw[bluefish] = -gnome2) esound-shlibs (>=
0.2.36-1), (%type_raw[bluefish] = -gnome2) libart2-shlibs (>= 2.3.17-1),
(%type_raw[bluefish] = -gnome2) libgnome2 (>= 2.10.0-2), (%type_raw[bluefish] =
-gnome2) libgnome2-shlibs (>= 2.10.0-2), (%type_raw[bluefish] = -gnome2)
libglade2-shlibs (>= 2.5.1-3), (%type_raw[bluefish] = -gnome2) libgnomecanvas2
(>= 2.10.2-1), (%type_raw[bluefish] = -gnome2) libgnomecanvas2-shlibs (>=
2.10.2-1), (%type_raw[bluefish] = -gnome2) gnome-keyring-shlibs (>= 0.4.3-4),
(%type_raw[bluefish] = -gnome2) gnome-ke
yring (>= 0.4.3-4), (%type_raw[bluefish] = -gnome2) libbonoboui2 (>=
2.10.1-1), (%type_raw[bluefish] = -gnome2) libbonoboui2-shlibs (>= 2.10.1-1),
(%type_raw[bluefish] = -gnome2) libgnomeui2 (>= 2.10.1-1), (%type_raw[bluefish]
= -gnome2) libgnomeui2-shlibs (>= 2.10.1-1)
+Source-MD5: 26701c09d41e5dea987155cdc9d0ac94
+Depends: aspell-shlibs (>= 0.50.5-2), default-icon-theme, libgettext3-shlibs
(>= 0.14.5-1), glib2 (>= 2.8.4-1), glib2-shlibs (>= 2.8.4-1), gnome-icon-theme
(>= 2.12.0-1), libjpeg-shlibs (>= 6b-16), libtiff-shlibs (>= 3.7.2-1),
pango1-xft2 (>= 1.10.1-1), pango1-xft2-shlibs (>= 1.10.1-1), pcre-shlibs (>=
4.5-1), popt-shlibs (>= 1.7-6), libxml2-shlibs (>= 2.6.22-1), libxml2-bin (>=
2.6.22-1), shared-mime-info (>= 0.16-1), atk1-shlibs (>= 1.10.1-3),
libpng3-shlibs (>= 1:1.2.8-1), gtk+2 (>= 2.6.10-1), gtk+2-shlibs (>= 2.6.10-1),
libiconv (>= 1.10-6), x11, (%type_raw[bluefish] = -gnomevfs2) gnome-base,
(%type_raw[bluefish] = -gnome2) gnome-base, (%type_raw[bluefish] = -gnomevfs2)
gnome-mime-data (>= 2.4.2-2), (%type_raw[bluefish] = -gnome2) gnome-mime-data
(>= 2.4.2-2), (%type_raw[bluefish] = -gnomevfs2) libidl2-shlibs (>= 0.8.5-1),
(%type_raw[bluefish] = -gnome2) libidl2-shlibs (>= 0.8.5-1),
(%type_raw[bluefish] = -gnomevfs2) orbit2 (>= 2.12.4-1), (%type_raw[bluefish] =
-gnome2)
orbit2 (>= 2.12.4-1), (%type_raw[bluefish] = -gnomevfs2) orbit2-shlibs (>=
2.12.4-1), (%type_raw[bluefish] = -gnome2) orbit2-shlibs (>= 2.12.4-1),
(%type_raw[bluefish] = -gnomevfs2) gconf2 (>= 2.12.1-1), (%type_raw[bluefish] =
-gnome2) gconf2 (>= 2.12.1-1), (%type_raw[bluefish] = -gnomevfs2) gconf2-shlibs
(>= 2.12.1-1), (%type_raw[bluefish] = -gnome2) gconf2-shlibs (>= 2.12.1-1),
(%type_raw[bluefish] = -gnomevfs2) libbonobo2 (>= 2.10.1-1),
(%type_raw[bluefish] = -gnome2) libbonobo2 (>= 2.10.1-1), (%type_raw[bluefish]
= -gnomevfs2) libbonobo2-shlibs (>= 2.10.1-1), (%type_raw[bluefish] = -gnome2)
libbonobo2-shlibs (>= 2.10.1-1), (%type_raw[bluefish] = -gnomevfs2)
gnome-vfs2-ssl (>= 2.10.1-5) | (%type_raw[bluefish] = -gnomevfs2) gnome-vfs2
(>= 2.10.1-5), (%type_raw[bluefish] = -gnome2) gnome-vfs2-ssl (>= 2.10.1-5) |
(%type_raw[bluefish] = -gnome2) gnome-vfs2 (>= 2.10.1-5), (%type_raw[bluefish]
= -gnomevfs2) gnome-vfs2-ssl-shlibs (>= 2.10.1-5) | (%type_raw[bluefish] =
-gnomevfs2
) gnome-vfs2-shlibs (>= 2.10.1-5), (%type_raw[bluefish] = -gnome2)
gnome-vfs2-ssl-shlibs (>= 2.10.1-5) | (%type_raw[bluefish] = -gnome2)
gnome-vfs2-shlibs (>= 2.10.1-5), (%type_raw[bluefish] = -gnome2)
audiofile-shlibs, (%type_raw[bluefish] = -gnome2) audiofile-bin,
(%type_raw[bluefish] = -gnome2) esound (>= 0.2.36-1), (%type_raw[bluefish] =
-gnome2) esound-bin (>= 0.2.36-1), (%type_raw[bluefish] = -gnome2)
esound-common (>= 0.2.36-1), (%type_raw[bluefish] = -gnome2) esound-shlibs (>=
0.2.36-1), (%type_raw[bluefish] = -gnome2) libart2-shlibs (>= 2.3.17-1),
(%type_raw[bluefish] = -gnome2) libgnome2 (>= 2.10.0-2), (%type_raw[bluefish] =
-gnome2) libgnome2-shlibs (>= 2.10.0-2), (%type_raw[bluefish] = -gnome2)
libglade2-shlibs (>= 2.5.1-3), (%type_raw[bluefish] = -gnome2) libgnomecanvas2
(>= 2.10.2-1), (%type_raw[bluefish] = -gnome2) libgnomecanvas2-shlibs (>=
2.10.2-1), (%type_raw[bluefish] = -gnome2) gnome-keyring-shlibs (>= 0.4.3-4),
(%type_raw[bluefish] = -gnome2) gnome-ke
yring (>= 0.4.3-4), (%type_raw[bluefish] = -gnome2) libbonoboui2 (>=
2.10.1-1), (%type_raw[bluefish] = -gnome2) libbonoboui2-shlibs (>= 2.10.1-1),
(%type_raw[bluefish] = -gnome2) libgnomeui2 (>= 2.10.1-1), (%type_raw[bluefish]
= -gnome2) libgnomeui2-shlibs (>= 2.10.1-1), (%type_raw[bluefish] = -gnome2)
desktop-file-utils, x11-shlibs
BuildDepends: aspell-dev (>= 0.50.5-2), libgettext3-dev (>= 0.14.5-1),
gettext-tools (>= 0.14.5-2), gettext-bin (>= 0.14.5-1), glib2-dev (>= 2.8.4-1),
libiconv-dev (>= 1.10-6), libjpeg (>= 6b-16), libtiff (>= 3.7.2-1),
pango1-xft2-dev (>= 1.10.1-1), pcre (>= 4.5-1), pcre-bin (>= 4.5-1), pkgconfig,
atk1 (>= 1.10.1-3), autoconf2.5, libpng3 (>= 1:1.2.8), gtk+2-dev (>=
2.6.10-1), x11-dev, libxml2 (>= 2.6.22-1), (%type_raw[bluefish] = -gnomevfs2)
orbit2-dev (>= 2.12.4-1), (%type_raw[bluefish] = -gnome2) orbit2-dev (>=
2.12.4-1), (%type_raw[bluefish] = -gnomevfs2) gconf2-dev (>= 2.12.1-1),
(%type_raw[bluefish] = -gnome2) gconf2-dev (>= 2.12.1-1), (%type_raw[bluefish]
= -gnomevfs2) libbonobo2-dev (>= 2.10.1-1), (%type_raw[bluefish] = -gnome2)
libbonobo2-dev (>= 2.10.1-1), (%type_raw[bluefish] = -gnomevfs2)
gnome-vfs2-ssl-dev (>= 2.10.1-5) | (%type_raw[bluefish] = -gnomevfs2)
gnome-vfs2-dev (>= 2.10.1-5), (%type_raw[bluefish] = -gnome2)
gnome-vfs2-ssl-dev (>= 2.10.1-5) | (%type_raw
[bluefish] = -gnome2) gnome-vfs2-dev (>= 2.10.1-5), (%type_raw[bluefish] =
-gnome2) audiofile, (%type_raw[bluefish] = -gnome2) esound (>= 0.2.36-1),
(%type_raw[bluefish] = -gnome2) libart2 (>= 2.3.17-1), (%type_raw[bluefish] =
-gnome2) libgnome2-dev (>= 2.10.0-2), (%type_raw[bluefish] = -gnome2) popt (>=
1.7-6), (%type_raw[bluefish] = -gnome2) libglade2 (>= 2.5.1-3),
(%type_raw[bluefish] = -gnome2) libgnomecanvas2-dev (>= 2.10.2-1),
(%type_raw[bluefish] = -gnome2) gnome-keyring-dev (>= 0.4.3-4),
(%type_raw[bluefish] = -gnome2) libbonoboui2-dev (>= 2.10.1-1),
(%type_raw[bluefish] = -gnome2) libgnomeui2-dev (>= 2.10.1-1)
Replaces: bluefish, bluefish-gnome2, bluefish-gnomevfs2
Conflicts: bluefish, bluefish-gnome2, bluefish-gnomevfs2
@@ -16,7 +16,6 @@
ConfigureParams: --mandir=%p/share/man --disable-splash-screen
--with-icon-path=%p/share/pixmaps
--with-freedesktop_org-menu=%p/share/applications
--with-freedesktop_org-mime=%p/share/mime
--with-gnome2_4-mime=%p/share/mime-info --disable-update-databases
CompileScript: <<
#!/bin/sh -ev
- autoconf
if [ "%type_raw[bluefish]" == "-gnome2" ]; then
./configure %c --with-gnome2_4-appreg=%p/share/application-registry
else
@@ -32,9 +31,11 @@
<<
PostInstScript: <<
[ -x %p/bin/update-mime-database ] && update-mime-database %p/share/mime >
/dev/null 2>&1 || :
+ [ -x %p/bin/update-desktop-database ] && update-desktop-database -q
%p/share/applications || :
<<
PostRmScript: <<
[ -x %p/bin/update-mime-database ] && update-mime-database %p/share/mime >
/dev/null 2>&1 || :
+ [ -x %p/bin/update-desktop-database ] && update-desktop-database -q
%p/share/applications || :
<<
DocFiles: AUTHORS COPYING INSTALL README TODO
Description: Web-oriented text editor
@@ -79,20 +80,17 @@
http://micmacfr.homeunix.org/bluefish/
<<
DescPackaging: <<
- Install man page manually.
Update share-mime-database in PostInstScript and PostRmScript.
+ Update desktop-database in PostInstScript and PostRmScript.
<<
DescPort: <<
Previous versions by Christoph Pfisterer and Matt Stephenson.
Use of pkgconfig
Use of variant to handle no gnome, gnomevfs2, and gnome2
installation
- Patch for #define POSIX_C_SOURCE in src/document.c which
- impedes the recognition of ctime_r() function.
- Patch for size of files in src/document.c which was not
- correct on Mac. (Dirty hack at the moment, will b improved
- for the next release.
Added bind-at-load flag for libiconv-libintl conflicts.
+ Added various fixes made after release (included critical
+ ones)
<<
License: GPL
Homepage: http://bluefish.openoffice.nl
Index: bluefish.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/editors/bluefish.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- bluefish.patch 16 Dec 2005 04:43:34 -0000 1.9
+++ bluefish.patch 18 Feb 2006 01:17:26 -0000 1.10
@@ -1,33 +1,166 @@
-diff -Naur bluefish-1.0.4/src/document.c bluefish-1.0.4-new/src/document.c
---- bluefish-1.0.4/src/document.c 2005-08-11 04:19:49.000000000 +0200
-+++ bluefish-1.0.4-new/src/document.c 2005-12-14 21:37:46.000000000 +0100
-@@ -23,7 +23,9 @@
- /* this is needed for Solaris to comply with the latest POSIX standard
- * regarding the ctime_r() function
- * the problem is that it generates a compiler warning on Linux, lstat()
undefined.. */
-+#ifdef PLATFORM_SOLARIS
- #define _POSIX_C_SOURCE 200312L
-+#endif
+diff -Nurd bluefish-1.0.5-orig/man/Makefile.in bluefish-1.0.5/man/Makefile.in
+--- bluefish-1.0.5-orig/man/Makefile.in 2005-10-11 19:05:17.000000000
+0200
++++ bluefish-1.0.5/man/Makefile.in 2006-02-10 00:15:36.000000000 +0100
+@@ -36,4 +36,5 @@
+ clean:
+
+ distclean: clean
++ rm -f Makefile
+
+diff -Nurd bluefish-1.0.5-orig/src/bluefish.c bluefish-1.0.5/src/bluefish.c
+--- bluefish-1.0.5-orig/src/bluefish.c 2006-01-18 15:13:55.000000000 +0100
++++ bluefish-1.0.5/src/bluefish.c 2006-02-10 10:40:15.000000000 +0100
+@@ -2,7 +2,7 @@
+ * bluefish.c - the main function
+ *
+ * Copyright (C) 1998 Olivier Sessink and Chris Mazuc
+- * Copyright (C) 1999-2004 Olivier Sessink
++ * Copyright (C) 1999-2006 Olivier Sessink
+ *
+ * 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
+@@ -22,9 +22,9 @@
+ /* #define DEBUG */
#include <gtk/gtk.h>
- #include <gdk/gdkkeysyms.h> /* for the keyboard event codes */
-@@ -687,14 +689,17 @@
- ctime_r(&doc->fileinfo->mtime,mtimestr);
- }
- if (doc->fileinfo->valid_fields &
GNOME_VFS_FILE_INFO_FIELDS_SIZE) {
-- sizestr = g_strdup_printf("%"GNOME_VFS_SIZE_FORMAT_STR,
doc->fileinfo->size);
-+ sizestr = g_strdup_printf("%s",
gnome_vfs_format_file_size_for_display(doc->fileinfo->size));
- }
- }
- #else
- if (doc->statbuf.st_mode != 0 || doc->statbuf.st_size != 0) {
- modestr = filemode_to_string(doc->statbuf.st_mode);
- ctime_r(&doc->statbuf.st_mtime,mtimestr);
-- sizestr = g_strdup_printf("%ld", doc->statbuf.st_size);
-+ if (sizeof (off_t) == 8)
-+ sizestr = g_strdup_printf("%llu", doc->statbuf.st_size);
-+ else
-+ sizestr = g_strdup_printf("%lu", doc->statbuf.st_size);
- }
+-#include <unistd.h> /* getopt() */
+-#include <stdlib.h> /* getopt() exit() and abort() on Solaris */
+-#include <time.h> /* nanosleep */
++#include <stdlib.h> /* getopt() exit() and abort() on Solaris */
++#include <time.h> /* nanosleep */
++#include <unistd.h> /* getopt() */
+
+ #include "bluefish.h"
+
+@@ -39,19 +39,20 @@
+ #include <locale.h>
#endif
- tmp = text = g_strconcat(_("Name:
"),gtk_label_get_text(GTK_LABEL(doc->tab_menu))
+
+-#include "document.h" /* */
+-#include "gui.h" /* gui_create_main() */
+-#include "fref.h" /* fref_init() */
+-#include "bookmark.h" /* bmark_init() */
+-#include "rcfile.h" /* rcfile_parse_main() */
+-#include "bf_lib.h" /* create_full_path() */
+-#include "highlight.h" /* hl_init() */
+-#include "msg_queue.h" /* msg_queue_start()*/
+-#include "stringlist.h" /* put_stringlist(), get_stringlist() */
+-#include "gtk_easy.h" /* flush_queue() */
+-#include "filebrowser.h" /* filters_rebuild() */
++#include "authen.h" /* set_authen_callbacks() */
++#include "bf_lib.h" /* create_full_path() */
++#include "bookmark.h" /* bmark_init() */
++#include "document.h"
++#include "filebrowser.h" /* filters_rebuild() */
++#include "fref.h" /* fref_init() */
++#include "gtk_easy.h" /* flush_queue() */
++#include "gui.h" /* gui_create_main() */
++#include "highlight.h" /* hl_init() */
++#include "msg_queue.h" /* msg_queue_start()*/
++#include "pixmap.h" /* default_icon_list() */
+ #include "project.h"
+-#include "authen.h" /* set_authen_callbacks() */
++#include "rcfile.h" /* rcfile_parse_main() */
++#include "stringlist.h" /* put_stringlist(), get_stringlist() */
+
+ /*********************************************/
+ /* this var is global for all bluefish files */
+@@ -161,6 +162,7 @@
+ #endif /* HAVE_ATLEAST_GNOMEVFS_2_6 */
+ #endif /* HAVE_ATLEAST_GNOME_2_6 */
+ #endif /* HAVE_GNOME_VFS */
++ gtk_window_set_default_icon_list (default_icon_list());
+ main_v = g_new0(Tmain, 1);
+ main_v->session = g_new0(Tsessionvars,1);
+ main_v->session->view_html_toolbar = main_v->session->view_main_toolbar
= main_v->session->view_custom_menu = main_v->session->view_left_panel = 1;
+diff -Nurd bluefish-1.0.5-orig/src/document.c bluefish-1.0.5/src/document.c
+--- bluefish-1.0.5-orig/src/document.c 2006-01-29 21:33:52.000000000 +0100
++++ bluefish-1.0.5/src/document.c 2006-02-10 00:15:37.000000000 +0100
+@@ -1795,14 +1795,17 @@
+
+ } else { /* (kevent->keyval == GDK_End) || (kevent->keyval ==
GDK_KP_End) */
+ if (!gtk_text_iter_ends_line (&iter))
+- gtk_text_iter_forward_to_line_end (&iter);
++ gtk_text_iter_forward_to_line_end (&iter);
+
+ linestart = iter;
+-
+- while ((g_unichar_isspace (gtk_text_iter_get_char
(&iter)) && !gtk_text_iter_starts_line (&iter)) || gtk_text_iter_is_end (&iter))
++
++ if (gtk_text_iter_is_end (&iter) &&
!gtk_text_iter_starts_line (&iter))
++ gtk_text_iter_backward_char (&iter);
++
++ while (g_unichar_isspace (gtk_text_iter_get_char
(&iter)) && !gtk_text_iter_starts_line (&iter))
+ gtk_text_iter_backward_char (&iter);
+
+- if (!gtk_text_iter_starts_line (&iter))
++ if ((!gtk_text_iter_starts_line (&iter) ||
!gtk_text_iter_ends_line (&iter)) && !g_unichar_isspace (gtk_text_iter_get_char
(&iter)))
+ gtk_text_iter_forward_char (&iter);
+ }
+
+diff -Nurd bluefish-1.0.5-orig/src/gui.c bluefish-1.0.5/src/gui.c
+--- bluefish-1.0.5-orig/src/gui.c 2006-01-29 08:36:31.000000000 +0100
++++ bluefish-1.0.5/src/gui.c 2006-02-10 00:15:37.000000000 +0100
+@@ -21,35 +21,35 @@
+ /* #define DEBUG */
+
+ #include <gtk/gtk.h>
+-#include <time.h> /* nanosleep() */
+-#include <string.h> /* strchr() */
+-#include <unistd.h> /* exit() */
+-#include <stdlib.h> /* exit() on Solaris */
++#include <stdlib.h> /* exit() on Solaris */
++#include <string.h> /* strchr() */
++#include <time.h> /* nanosleep() */
++#include <unistd.h> /* exit() */
+
+ #include "config.h"
+
+ #include "bluefish.h"
+ #include "gui.h"
+-#include "document.h" /* file_new_cb() */
++#include "bf_lib.h" /* get_int_from_string() */
++#include "bookmark.h"
++#include "document.h" /* file_new_cb() */
++#include "filebrowser.h"
++#include "fref.h"
+ #include "gtk_easy.h"
+-#include "menu.h" /* menu_create_main(), recent_menu_init() */
+-#include "bf_lib.h" /* get_int_from_string() */
+-#include "pixmap.h" /* new_pixmap(); */
+-#include "undo_redo.h" /* undo_cb() redo_cb() etc. */
+-#include "snr2.h" /* search_cb, replace_cb */
+-#include "html_table.h"
+ #include "html.h"
+ #include "html2.h"
+-#include "wizards.h"
+-#include "image.h"
+ #include "html_form.h"
+-#include "filebrowser.h"
+-#include "stringlist.h"
+-#include "preferences.h" /* open_preferences_cb */
+-#include "outputbox.h" /* init_outputbox() */
+-#include "fref.h"
+-#include "bookmark.h"
++#include "html_table.h"
++#include "image.h"
++#include "menu.h" /* menu_create_main(), recent_menu_init() */
++#include "outputbox.h" /* init_outputbox() */
++#include "pixmap.h" /* new_pixmap(); */
++#include "preferences.h" /* open_preferences_cb */
+ #include "project.h"
++#include "snr2.h" /* search_cb, replace_cb */
++#include "stringlist.h"
++#include "undo_redo.h" /* undo_cb() redo_cb() etc. */
++#include "wizards.h"
+
+ #ifdef HAVE_ATLEAST_GTK_2_4
+ #include "quickstart.h"
+@@ -1638,7 +1638,6 @@
+ GdkColor color;
+
+ splashscreen.window = window_with_title(CURRENT_VERSION_NAME,
GTK_WIN_POS_CENTER_ALWAYS, 0);
+- gtk_window_set_default_icon_list(default_icon_list());
+ gtk_window_set_decorated(GTK_WINDOW(splashscreen.window), FALSE);
+ gtk_window_set_role(GTK_WINDOW(splashscreen.window), "splash");
+ gtk_window_set_resizable(GTK_WINDOW(splashscreen.window),FALSE);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
