Commit 0c100069 authored by Jacob Berkman's avatar Jacob Berkman Committed by Jacob Berkman

check for using window icons

2000-05-10  Jacob Berkman  <jacob@helixcode.com>

	* configure.in (use_wm_icons): check for using window icons

	* src/main.c (gnumeric_main): use an icon if available in
	gnome-libs

	* src/Makefile.am (INCLUDES): add a -D for the icon dir
parent 50fadf44
2000-05-10 Jacob Berkman <jacob@helixcode.com>
* configure.in (use_wm_icons): check for using window icons
* src/main.c (gnumeric_main): use an icon if available in
gnome-libs
* src/Makefile.am (INCLUDES): add a -D for the icon dir
2000-05-10 Karl Eichwalder <ke@suse.de>
* src/dialogs/cell-format.glade: Typo.
......
2000-05-10 Jacob Berkman <jacob@helixcode.com>
* configure.in (use_wm_icons): check for using window icons
* src/main.c (gnumeric_main): use an icon if available in
gnome-libs
* src/Makefile.am (INCLUDES): add a -D for the icon dir
2000-05-10 Karl Eichwalder <ke@suse.de>
* src/dialogs/cell-format.glade: Typo.
......
2000-05-10 Jacob Berkman <jacob@helixcode.com>
* configure.in (use_wm_icons): check for using window icons
* src/main.c (gnumeric_main): use an icon if available in
gnome-libs
* src/Makefile.am (INCLUDES): add a -D for the icon dir
2000-05-10 Karl Eichwalder <ke@suse.de>
* src/dialogs/cell-format.glade: Typo.
......
2000-05-10 Jacob Berkman <jacob@helixcode.com>
* configure.in (use_wm_icons): check for using window icons
* src/main.c (gnumeric_main): use an icon if available in
gnome-libs
* src/Makefile.am (INCLUDES): add a -D for the icon dir
2000-05-10 Karl Eichwalder <ke@suse.de>
* src/dialogs/cell-format.glade: Typo.
......
2000-05-10 Jacob Berkman <jacob@helixcode.com>
* configure.in (use_wm_icons): check for using window icons
* src/main.c (gnumeric_main): use an icon if available in
gnome-libs
* src/Makefile.am (INCLUDES): add a -D for the icon dir
2000-05-10 Karl Eichwalder <ke@suse.de>
* src/dialogs/cell-format.glade: Typo.
......
2000-05-10 Jacob Berkman <jacob@helixcode.com>
* configure.in (use_wm_icons): check for using window icons
* src/main.c (gnumeric_main): use an icon if available in
gnome-libs
* src/Makefile.am (INCLUDES): add a -D for the icon dir
2000-05-10 Karl Eichwalder <ke@suse.de>
* src/dialogs/cell-format.glade: Typo.
......
2000-05-10 Jacob Berkman <jacob@helixcode.com>
* configure.in (use_wm_icons): check for using window icons
* src/main.c (gnumeric_main): use an icon if available in
gnome-libs
* src/Makefile.am (INCLUDES): add a -D for the icon dir
2000-05-10 Karl Eichwalder <ke@suse.de>
* src/dialogs/cell-format.glade: Typo.
......
......@@ -17,6 +17,8 @@
#undef GNUMERIC_VERSION
#undef USE_WM_ICONS
@BOTTOM@
/* This is from libglade */
......
......@@ -348,6 +348,22 @@ AC_ARG_WITH(applix_shelf,
try_applix_shelf=true
fi
)
dnl ***************************************
dnl Check for gnome-libs which supports wm icons
dnl ***************************************
CFLAGS_save=$CFLAGS
LIBS_save=$LIBS
CFLAGS=`gnome-config --cflags gnomeui`
LIBS=`gnome-config --libs gnomeui`
use_wm_icons=false
AC_CHECK_LIB(gnomeui, gnome_window_icon_set_default_from_file, use_wm_icons=true)
if test x$use_wm_icons = xtrue; then
AC_DEFINE(USE_WM_ICONS)
fi
CFLAGS=$CFLAGS_save
LIBS=$LIBS_save
dnl ***************************************
EXTRA_GNOME_LIBS=`gnome-config --libs gnomeui print libglade $bonobo`
......
......@@ -28,6 +28,7 @@ INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DGNUMERIC_DATADIR=\""$(gnumeric_datadir)"\" \
-DGNUMERIC_LIBDIR=\""$(gnumeric_libdir)"\" \
-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" \
-I$(includedir) \
-I$(top_srcdir)/ \
-I$(srcdir)/ \
......
......@@ -36,6 +36,10 @@
#include <libguile.h>
#endif
#ifdef USE_WM_ICONS
#include <libgnomeui/gnome-window-icon.h>
#endif
/* The debugging level */
int gnumeric_debugging = 0;
int style_debugging = 0;
......@@ -137,7 +141,9 @@ gnumeric_main (void *closure, int argc, char *argv [])
GNUMERIC_VERSION, GNUMERIC_DATADIR, GNUMERIC_LIBDIR);
return;
}
#ifdef USE_WM_ICONS
gnome_window_icon_set_default_from_file (GNOME_ICONDIR"gnome-gnumeric.png");
#endif
/* For reporting errors before we have an application window */
context = workbook_command_context_gui (NULL);
......
......@@ -36,6 +36,10 @@
#include <libguile.h>
#endif
#ifdef USE_WM_ICONS
#include <libgnomeui/gnome-window-icon.h>
#endif
/* The debugging level */
int gnumeric_debugging = 0;
int style_debugging = 0;
......@@ -137,7 +141,9 @@ gnumeric_main (void *closure, int argc, char *argv [])
GNUMERIC_VERSION, GNUMERIC_DATADIR, GNUMERIC_LIBDIR);
return;
}
#ifdef USE_WM_ICONS
gnome_window_icon_set_default_from_file (GNOME_ICONDIR"gnome-gnumeric.png");
#endif
/* For reporting errors before we have an application window */
context = workbook_command_context_gui (NULL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment