mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-18 17:29:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

2000-06-20 Jacob Berkman <jacob@helixcode.com>

Browse Source 
* configure.in: check for gnome-libs with window icon support

	* acconfig.h: add icon define
This commit is contained in:
Jacob Berkman 2000-06-20 19:50:31 +00:00
parent cea7247da1
commit 30fba8c073
4 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2000-06-20 Jacob Berkman <jacob@helixcode.com>
* configure.in: check for gnome-libs with window icon support
* acconfig.h: add icon define
2000-06-08 Matthias Warkus <mawa@iname.com> 2000-06-08 Matthias Warkus <mawa@iname.com>
* new_icons/gnome-pack-*.png: Updated. * new_icons/gnome-pack-*.png: Updated.

2
acconfig.h
View File

@ -257,3 +257,5 @@
#endif #endif
#endif #endif
#undef HAVE_GNOME_WINDOW_ICON

11
configure.in
View File

@ -552,6 +552,17 @@ GNOME_INIT_HOOK([
xvers="Gnome+$xvers" xvers="Gnome+$xvers"
fi fi
gnomeicondir=`gnome-config --datadir`/pixmaps gnomeicondir=`gnome-config --datadir`/pixmaps
dnl Check for new enough gnome-libs
CFLAGS_save=$CFLAGS
LIBS_save=$LIBS
CFLAGS=`gnome-config --cflags gnomeui`
LIBS=`gnome-config --libs gnomeui`
AC_CHECK_LIB(gnomeui, gnome_window_icon_set_default_from_file, AC_DEFINE(HAVE_GNOME_WINDOW_ICON))
CFLAGS=$CFLAGS_save
LIBS=$LIBS_save
]) ])
AC_SUBST(gnomeicondir) AC_SUBST(gnomeicondir)
AC_SUBST(mx) AC_SUBST(mx)

8
src/main.c
View File

@ -142,6 +142,9 @@
#include "gcorba.h" #include "gcorba.h"
#include "gmain.h" #include "gmain.h"
#include "gsession.h" #include "gsession.h"
#ifdef HAVE_GNOME_WINDOW_ICON
# include <libgnomeui/gnome-window-icon.h>
#endif
#endif #endif
/* "$Id$" */ /* "$Id$" */
@ -2844,9 +2847,12 @@ handle_args (int argc, char *argv [])
init_corba_with_args (&argc, argv, &ctx); init_corba_with_args (&argc, argv, &ctx);
#else #else
gnome_init_with_popt_table ("gmc", VERSION, argc, argv, argument_table, 0, &ctx); gnome_init_with_popt_table ("gmc", VERSION, argc, argv, argument_table, 0, &ctx);
#endif
maybe_display_linksdir (); maybe_display_linksdir ();
#endif
#ifdef HAVE_GNOME_WINDOW_ICON
gnome_window_icon_set_default_from_file (ICONDIR"/i-directory.png");
#endif
gtk_widget_push_visual (gdk_imlib_get_visual ()); gtk_widget_push_visual (gdk_imlib_get_visual ());
gtk_widget_push_colormap (gdk_imlib_get_colormap ()); gtk_widget_push_colormap (gdk_imlib_get_colormap ());